diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-05-11 23:46:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-05-11 23:46:35 +0000 |
| commit | 84c814f55c091d5ede9d25a2ab4b2752f04ed3b7 (patch) | |
| tree | ffdfb9169d0cdfa580495f12247c13aee0034fa6 | |
| parent | 6252d3c9242ca16d9f3a066bb51713d447185e14 (diff) | |
| parent | af3db4dd4763e88f32d73eb65af15bf0f37bad8c (diff) | |
| download | palemoon-84c814f55c091d5ede9d25a2ab4b2752f04ed3b7.tar.gz | |
Merge pull request 'Various front-end fixes' (#1923) from FranklinDM/Pale-Moon-contrib:work_frontend-various-fixes-1 into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/Pale-Moon/pulls/1923
| -rw-r--r-- | palemoon/base/content/browser-appmenu.inc | 3 | ||||
| -rw-r--r-- | palemoon/base/content/browser-places.js | 2 | ||||
| -rw-r--r-- | palemoon/base/content/tabbrowser.xml | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/palemoon/base/content/browser-appmenu.inc b/palemoon/base/content/browser-appmenu.inc index 17d103049..07115b7bf 100644 --- a/palemoon/base/content/browser-appmenu.inc +++ b/palemoon/base/content/browser-appmenu.inc @@ -306,8 +306,7 @@ <menuitem id="appmenu_permissions" class="menuitem-iconic" label="&permissions.label;" - command="Tools:Permissions" - key="key_openPermissions"/> + command="Tools:Permissions"/> #ifdef MOZ_SERVICES_SYNC <!-- only one of sync-setup or sync-syncnow will be showing at once --> <menuitem id="sync-setup-appmenu" diff --git a/palemoon/base/content/browser-places.js b/palemoon/base/content/browser-places.js index 8e9799601..a34b16061 100644 --- a/palemoon/base/content/browser-places.js +++ b/palemoon/base/content/browser-places.js @@ -428,7 +428,7 @@ var PlacesCommandHook = { */ updateBookmarkAllTabsCommand: function() { // There's nothing to do in non-browser windows. - if (window.location.href != getBrowserURL()) { + if (!window.location || window.location.href != getBrowserURL()) { return; } diff --git a/palemoon/base/content/tabbrowser.xml b/palemoon/base/content/tabbrowser.xml index b5084b3ba..ee73946c0 100644 --- a/palemoon/base/content/tabbrowser.xml +++ b/palemoon/base/content/tabbrowser.xml @@ -1954,7 +1954,9 @@ setTimeout(function (tab, tabbrowser) { if (tab.parentNode && window.getComputedStyle(tab).maxWidth == "0.1px") { - NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)"); + if (this.visible) { + NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)"); + } tabbrowser._endRemoveTab(tab); } }, 3000, aTab, this); |