rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2267 from mozilla/remove-delete-warning

Browse source 
Remove delete container warning
This commit is contained in:
Lesley Norton 2022-01-19 08:52:36 -08:00 • committed by GitHub
commit 83b7f5819b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/css/popup.css
View file

@ -1544,6 +1544,7 @@ manage things like container crud */
font-size: 13px; font-size: 13px;
inline-size: 100%; inline-size: 100%;
justify-content: space-between; justify-content: space-between;
box-shadow: 0 0 0 1px var(--hr-grey);
} }
#container-info-panel { #container-info-panel {

9
src/js/popup.js
View file

@ -2243,15 +2243,6 @@ Logic.registerPanel(P_CONTAINER_DELETE, {
// Populating the panel: name, icon, and warning message // Populating the panel: name, icon, and warning message
document.getElementById("container-delete-title").textContent = identity.name; document.getElementById("container-delete-title").textContent = identity.name;
const totalNumberOfTabs = identity.numberOfHiddenTabs + identity.numberOfOpenTabs;
let warningMessage = "";
if (totalNumberOfTabs > 0) {
const grammaticalNumTabs = totalNumberOfTabs > 1 ? "tabs" : "tab";
warningMessage = `If you remove this container now, ${totalNumberOfTabs} container ${grammaticalNumTabs} will be closed.`;
}
document.getElementById("delete-container-tab-warning").textContent = warningMessage;
return Promise.resolve(null); return Promise.resolve(null);
}, },
}); });

3
src/popup.html
View file

@ -394,7 +394,6 @@
<hr> <hr>
<div class="panel-content delete-container-confirm"> <div class="panel-content delete-container-confirm">
<h4 class="delete-container-confirm-title" data-i18n-message-id="removeThisContainer"></h4> <h4 class="delete-container-confirm-title" data-i18n-message-id="removeThisContainer"></h4>
<p class="delete-warning" id="delete-container-tab-warning"></p>
<p class="delete-warning" data-i18n-message-id="removeThisContainerConfirmation"></p> <p class="delete-warning" data-i18n-message-id="removeThisContainerConfirmation"></p>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
@ -450,7 +449,7 @@
</form> </form>
<div id="permissions-overlay" class="permissions-overlay" data-tab-group="proxy-disabled"> <div id="permissions-overlay" class="permissions-overlay" data-tab-group="proxy-disabled">
<p data-tab-group="proxy-disabled" data-i18n-message-id="additionalPermissionNeeded"></p> <p data-tab-group="proxy-disabled" data-i18n-message-id="additionalPermissionNeeded"></p>
<button id="enable-proxy-permissions" class="primary-cta" data-tab-group="proxy-disabled">Enable</button> <button id="enable-proxy-permissions" class="primary-cta" data-tab-group="proxy-disabled" data-i18n-message-id="enable"></button>
</div> </div>
</div> </div>
<script src="js/utils.js"></script> <script src="js/utils.js"></script>