diff options
| -rw-r--r-- | application/palemoon/base/content/newtab/newTab.js | 1 | ||||
| -rw-r--r-- | application/palemoon/base/content/newtab/transformations.js | 26 | ||||
| -rw-r--r-- | application/palemoon/base/content/newtab/updater.js | 65 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/aboutdebugging.dtd | 6 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/connection-screen.dtd | 6 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/markers.properties | 12 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/performance.dtd | 16 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/performance.properties | 2 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/responsive.properties | 2 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/sourceeditor.properties | 2 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/toolbox.dtd | 4 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/webide.dtd | 8 | ||||
| -rw-r--r-- | devtools/client/locales/en-US/webide.properties | 6 |
13 files changed, 81 insertions, 75 deletions
diff --git a/application/palemoon/base/content/newtab/newTab.js b/application/palemoon/base/content/newtab/newTab.js index bba73fd7a..bea545ab5 100644 --- a/application/palemoon/base/content/newtab/newTab.js +++ b/application/palemoon/base/content/newtab/newTab.js @@ -11,7 +11,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/PageThumbs.jsm"); Cu.import("resource://gre/modules/NewTabUtils.jsm"); -Cu.import("resource:///modules/promise.js"); XPCOMUtils.defineLazyModuleGetter(this, "Rect", "resource://gre/modules/Geometry.jsm"); diff --git a/application/palemoon/base/content/newtab/transformations.js b/application/palemoon/base/content/newtab/transformations.js index 0711d7d0a..978116182 100644 --- a/application/palemoon/base/content/newtab/transformations.js +++ b/application/palemoon/base/content/newtab/transformations.js @@ -103,7 +103,7 @@ var gTransformation = { let style = aSite.node.style; let comp = getComputedStyle(aSite.node, null); - style.width = comp.getPropertyValue("width") + style.width = comp.getPropertyValue("width"); style.height = comp.getPropertyValue("height"); aSite.node.setAttribute("frozen", "true"); @@ -179,23 +179,23 @@ var gTransformation = { if (!aSite || aSite == gDrag.draggedSite) return; - let deferred = Promise.defer(); - batch.push(deferred.promise); - let cb = function () deferred.resolve(); - - if (!cells[aIndex]) + batch.push(new Promise(resolve => { + if (!cells[aIndex]) { // The site disappeared from the grid, hide it. - this.hideSite(aSite, cb); - else if (this._getNodeOpacity(aSite.node) != 1) + this.hideSite(aSite, resolve); + } else if (this._getNodeOpacity(aSite.node) != 1) { // The site disappeared before but is now back, show it. - this.showSite(aSite, cb); - else + this.showSite(aSite, resolve); + } else { // The site's position has changed, move it around. - this._moveSite(aSite, aIndex, {unfreeze: unfreeze, callback: cb}); + this._moveSite(aSite, aIndex, {unfreeze: unfreeze, callback: resolve}); + } + })); }, this); - let wait = Promise.promised(function () callback && callback()); - wait.apply(null, batch); + if (callback) { + Promise.all(batch).then(callback); + } }, /** diff --git a/application/palemoon/base/content/newtab/updater.js b/application/palemoon/base/content/newtab/updater.js index e6da37f87..2bab74d70 100644 --- a/application/palemoon/base/content/newtab/updater.js +++ b/application/palemoon/base/content/newtab/updater.js @@ -20,24 +20,22 @@ var gUpdater = { // Find all sites that remain in the grid. let sites = this._findRemainingSites(links); - let self = this; - // Remove sites that are no longer in the grid. - this._removeLegacySites(sites, function () { + this._removeLegacySites(sites, () => { // Freeze all site positions so that we can move their DOM nodes around // without any visual impact. - self._freezeSitePositions(sites); + this._freezeSitePositions(sites); // Move the sites' DOM nodes to their new position in the DOM. This will // have no visual effect as all the sites have been frozen and will // remain in their current position. - self._moveSiteNodes(sites); + this._moveSiteNodes(sites); // Now it's time to animate the sites actually moving to their new // positions. - self._rearrangeSites(sites, function () { + this._rearrangeSites(sites, () => { // Try to fill empty cells and finish. - self._fillEmptyCells(links, aCallback); + this._fillEmptyCells(links, aCallback); // Update other pages that might be open to keep them synced. gAllPages.update(gPage); @@ -134,21 +132,19 @@ var gUpdater = { if (!aSite || aSites.indexOf(aSite) != -1) return; - let deferred = Promise.defer(); - batch.push(deferred.promise); - - // Fade out the to-be-removed site. - gTransformation.hideSite(aSite, function () { - let node = aSite.node; + batch.push(new Promise(resolve => { + // Fade out the to-be-removed site. + gTransformation.hideSite(aSite, function () { + let node = aSite.node; - // Remove the site from the DOM. - node.parentNode.removeChild(node); - deferred.resolve(); - }); + // Remove the site from the DOM. + node.parentNode.removeChild(node); + resolve(); + }); + })); }); - let wait = Promise.promised(aCallback); - wait.apply(null, batch); + Promise.all(batch).then(aCallback); }, /** @@ -158,29 +154,24 @@ var gUpdater = { */ _fillEmptyCells: function Updater_fillEmptyCells(aLinks, aCallback) { let {cells, sites} = gGrid; - let batch = []; // Find empty cells and fill them. - sites.forEach(function (aSite, aIndex) { + Promise.all(sites.map((aSite, aIndex) => { if (aSite || !aLinks[aIndex]) - return; - - let deferred = Promise.defer(); - batch.push(deferred.promise); + return null; - // Create the new site and fade it in. - let site = gGrid.createSite(aLinks[aIndex], cells[aIndex]); + return new Promise(resolve => { + // Create the new site and fade it in. + let site = gGrid.createSite(aLinks[aIndex], cells[aIndex]); - // Set the site's initial opacity to zero. - site.node.style.opacity = 0; + // Set the site's initial opacity to zero. + site.node.style.opacity = 0; - // Flush all style changes for the dynamically inserted site to make - // the fade-in transition work. - window.getComputedStyle(site.node).opacity; - gTransformation.showSite(site, function () deferred.resolve()); - }); - - let wait = Promise.promised(aCallback); - wait.apply(null, batch); + // Flush all style changes for the dynamically inserted site to make + // the fade-in transition work. + window.getComputedStyle(site.node).opacity; + gTransformation.showSite(site, resolve); + }); + })).then(aCallback).catch(console.exception); } }; diff --git a/devtools/client/locales/en-US/aboutdebugging.dtd b/devtools/client/locales/en-US/aboutdebugging.dtd index 1f38a9443..2b2615c10 100644 --- a/devtools/client/locales/en-US/aboutdebugging.dtd +++ b/devtools/client/locales/en-US/aboutdebugging.dtd @@ -2,4 +2,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY aboutDebugging.fullTitle "Debugging with Firefox Developer Tools"> +<!ENTITY % brandDTD + SYSTEM "chrome://branding/locale/brand.dtd"> + %brandDTD; + +<!ENTITY aboutDebugging.fullTitle "Debugging with &brandShortName; Developer Tools"> diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd index 674a408d5..15d70f764 100644 --- a/devtools/client/locales/en-US/connection-screen.dtd +++ b/devtools/client/locales/en-US/connection-screen.dtd @@ -7,6 +7,10 @@ - in the Web Developer menu. - --> +<!ENTITY % brandDTD + SYSTEM "chrome://branding/locale/brand.dtd"> + %brandDTD; + <!ENTITY title "Connect"> <!ENTITY header "Connect to remote device"> <!ENTITY host "Host:"> @@ -24,7 +28,7 @@ <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix): these strings will be concatenated in a single label, remoteDocumentation will be used as text for a link to MDN. --> -<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the "> +<!ENTITY remoteHelp "&brandShortName; Developer Tools can debug remote devices (Firefox for Android, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the "> <!ENTITY remoteDocumentation "documentation"> <!ENTITY remoteHelpSuffix "."> diff --git a/devtools/client/locales/en-US/markers.properties b/devtools/client/locales/en-US/markers.properties index 11fe9bd7f..81e68fef0 100644 --- a/devtools/client/locales/en-US/markers.properties +++ b/devtools/client/locales/en-US/markers.properties @@ -141,7 +141,7 @@ marker.nurseryCollection=Nursery Collection # These strings are used to give an expanded description of why a GC occurred. marker.gcreason.description.API=There was an API call to force garbage collection. marker.gcreason.description.EAGER_ALLOC_TRIGGER=JavaScript returned to the event loop and there were enough bytes allocated since the last GC that a new GC cycle was triggered. -marker.gcreason.description.DESTROY_RUNTIME=Firefox destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down. +marker.gcreason.description.DESTROY_RUNTIME=The browser destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down. marker.gcreason.description.LAST_DITCH=JavaScript attempted to allocate, but there was no memory available. Doing a full compacting garbage collection as an attempt to free up memory for the allocation. marker.gcreason.description.TOO_MUCH_MALLOC=JavaScript allocated too many bytes, and forced a garbage collection. marker.gcreason.description.ALLOC_TRIGGER=JavaScript allocated too many times, and forced a garbage collection. @@ -152,7 +152,7 @@ marker.gcreason.description.OUT_OF_NURSERY=JavaScript allocated enough new objec marker.gcreason.description.EVICT_NURSERY=Work needed to be done on the tenured heap, requiring the nursery to be empty. marker.gcreason.description.FULL_STORE_BUFFER=There were too many properties on tenured objects whose value was an object in the nursery. marker.gcreason.description.SHARED_MEMORY_LIMIT=A large allocation was requested, but there was not enough memory. -marker.gcreason.description.PERIODIC_FULL_GC=JavaScript returned to the event loop, and it has been a relatively long time since Firefox performed a garbage collection. +marker.gcreason.description.PERIODIC_FULL_GC=JavaScript returned to the event loop, and it has been a relatively long time since the browser performed a garbage collection. marker.gcreason.description.INCREMENTAL_TOO_SLOW=A full, non-incremental garbage collection was triggered because there was a faster rate of allocations than the existing incremental garbage collection cycle could keep up with. marker.gcreason.description.COMPONENT_UTILS=Components.utils.forceGC() was called to force a garbage collection. marker.gcreason.description.MEM_PRESSURE=There was very low memory available. @@ -160,7 +160,7 @@ marker.gcreason.description.CC_WAITING=The cycle collector required a garbage co marker.gcreason.description.CC_FORCED=The cycle collector required a garbage collection. marker.gcreason.description.LOAD_END=The document finished loading. marker.gcreason.description.PAGE_HIDE=The tab or window was moved to the background. -marker.gcreason.description.NSJSCONTEXT_DESTROY=Firefox destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down. +marker.gcreason.description.NSJSCONTEXT_DESTROY=The browser destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down. marker.gcreason.description.SET_NEW_DOCUMENT=The page has been navigated to a new document. marker.gcreason.description.SET_DOC_SHELL=The page has been navigated to a new document. marker.gcreason.description.DOM_UTILS=There was an API call to force garbage collection. @@ -168,7 +168,7 @@ marker.gcreason.description.DOM_IPC=Received an inter-process message that reque marker.gcreason.description.DOM_WORKER=The worker was idle for a relatively long time. marker.gcreason.description.INTER_SLICE_GC=There has been a relatively long time since the last incremental GC slice. marker.gcreason.description.FULL_GC_TIMER=JavaScript returned to the event loop, and it has been a relatively long time since we performed a garbage collection. -marker.gcreason.description.SHUTDOWN_CC=Firefox destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down. -marker.gcreason.description.FINISH_LARGE_EVALUATE=Firefox finished evaluating a large script, and performed a GC because the script will never be run again. +marker.gcreason.description.SHUTDOWN_CC=The browser destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down. +marker.gcreason.description.FINISH_LARGE_EVALUATE=The browser finished evaluating a large script, and performed a GC because the script will never be run again. marker.gcreason.description.DOM_WINDOW_UTILS=The user was inactive for a long time. Took the opportunity to perform GC when it was unlikely to be noticed. -marker.gcreason.description.USER_INACTIVE=The user was inactive for a long time. Firefox took the opportunity to perform GC when it was unlikely to be noticed. +marker.gcreason.description.USER_INACTIVE=The user was inactive for a long time. The browser took the opportunity to perform GC when it was unlikely to be noticed. diff --git a/devtools/client/locales/en-US/performance.dtd b/devtools/client/locales/en-US/performance.dtd index 4009ae104..bbbe339c0 100644 --- a/devtools/client/locales/en-US/performance.dtd +++ b/devtools/client/locales/en-US/performance.dtd @@ -11,6 +11,10 @@ - A good criteria is the language in which you'd find the best - documentation on web development on the web. --> +<!ENTITY % brandDTD + SYSTEM "chrome://branding/locale/brand.dtd"> + %brandDTD; + <!-- LOCALIZATION NOTE (performanceUI.bufferStatusTooltip): This string - is displayed as the tooltip for the buffer capacity during a recording. --> <!ENTITY performanceUI.bufferStatusTooltip "The profiler stores samples in a circular buffer, and once the buffer reaches the limit for a recording, newer samples begin to overwrite samples at the beginning of the recording."> @@ -18,12 +22,12 @@ <!-- LOCALIZATION NOTE (performanceUI.disabledRealTime.nonE10SBuild): This string - is displayed as a message for why the real time overview graph is disabled - when running on a non-multiprocess build. --> -<!ENTITY performanceUI.disabledRealTime.nonE10SBuild "Realtime recording data disabled on non-multiprocess Firefox."> +<!ENTITY performanceUI.disabledRealTime.nonE10SBuild "Realtime recording data disabled on non-multiprocess &brandShortName;."> <!-- LOCALIZATION NOTE (performanceUI.disabledRealTime.disabledE10S): This string - is displayed as a message for why the real time overview graph is disabled - - when running on a build that can run multiprocess Firefox, but just is not enabled. --> -<!ENTITY performanceUI.disabledRealTime.disabledE10S "Enable multiprocess Firefox in preferences for rendering recording data in realtime."> + - when running on a build that can run multiprocess browser, but just is not enabled. --> +<!ENTITY performanceUI.disabledRealTime.disabledE10S "Enable multiprocess &brandShortName; in preferences for rendering recording data in realtime."> <!-- LOCALIZATION NOTE (performanceUI.bufferStatusFull): This string - is displayed when the profiler's circular buffer has started to overlap. --> @@ -88,10 +92,10 @@ <!ENTITY performanceUI.invertFlameGraph.tooltiptext "Inverting the flame chart displays the profiled call paths starting from the youngest frames and expanding out to the older frames."> <!-- LOCALIZATION NOTE (performanceUI.showPlatformData): This is the - - label for the checkbox that toggles whether or not Gecko platform data + - label for the checkbox that toggles whether or not Goanna platform data - is displayed in the profiler. --> -<!ENTITY performanceUI.showPlatformData "Show Gecko Platform Data"> -<!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Gecko platform symbols."> +<!ENTITY performanceUI.showPlatformData "Show Goanna Platform Data"> +<!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Goanna platform symbols."> <!-- LOCALIZATION NOTE (performanceUI.showJITOptimizations): This string - is displayed next to a checkbox determining whether or not JIT optimization data diff --git a/devtools/client/locales/en-US/performance.properties b/devtools/client/locales/en-US/performance.properties index 86ddc29b5..14f45186c 100644 --- a/devtools/client/locales/en-US/performance.properties +++ b/devtools/client/locales/en-US/performance.properties @@ -62,7 +62,7 @@ graphs.memory=MB # These strings are displayed in the categories graph of the Performance Tools, # as the legend for each block in every bar. These labels should be kept # AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph. -category.other=Gecko +category.other=Goanna category.css=Styles category.js=JIT category.gc=GC diff --git a/devtools/client/locales/en-US/responsive.properties b/devtools/client/locales/en-US/responsive.properties index 4347ea0b4..2edcde969 100644 --- a/devtools/client/locales/en-US/responsive.properties +++ b/devtools/client/locales/en-US/responsive.properties @@ -57,7 +57,7 @@ responsive.screenshotGeneratedFilename=Screen Shot %1$S at %2$S # LOCALIZATION NOTE (responsive.remoteOnly): Message displayed in the tab's # notification box if a user tries to open Responsive Design Mode in a # non-remote tab. -responsive.remoteOnly=Responsive Design Mode is only available for remote browser tabs, such as those used for web content in multi-process Firefox. +responsive.remoteOnly=Responsive Design Mode is only available for remote browser tabs, such as those used for web content in the multi-process browser. # LOCALIZATION NOTE (responsive.noContainerTabs): Message displayed in the tab's # notification box if a user tries to open Responsive Design Mode in a diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties index 842d549f0..42c5a0210 100644 --- a/devtools/client/locales/en-US/sourceeditor.properties +++ b/devtools/client/locales/en-US/sourceeditor.properties @@ -4,7 +4,7 @@ # LOCALIZATION NOTE These strings are used inside the Source Editor component. # This component is used whenever source code is displayed for the purpose of -# being edited, inside the Firefox developer tools - current examples are the +# being edited, inside the browser developer tools - current examples are the # Scratchpad and the Style Editor tools. # LOCALIZATION NOTE The correct localization of this file might be to keep it diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd index 6097fa82a..73c74567c 100644 --- a/devtools/client/locales/en-US/toolbox.dtd +++ b/devtools/client/locales/en-US/toolbox.dtd @@ -199,9 +199,9 @@ - label for the checkbox that toggles the display of the platform data in the, - Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference - in about:config, in the options panel. --> -<!ENTITY options.showPlatformData.label "Show Gecko platform data"> +<!ENTITY options.showPlatformData.label "Show Goanna platform data"> <!ENTITY options.showPlatformData.tooltip "If you enable this option the JavaScript Profiler reports will include -Gecko platform symbols"> +Goanna platform symbols"> <!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor - section. --> diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd index 5e1a80ccd..554488f6d 100644 --- a/devtools/client/locales/en-US/webide.dtd +++ b/devtools/client/locales/en-US/webide.dtd @@ -2,7 +2,11 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY windowTitle "Firefox WebIDE"> +<!ENTITY % brandDTD + SYSTEM "chrome://branding/locale/brand.dtd"> + %brandDTD; + +<!ENTITY windowTitle "&brandShortName; WebIDE"> <!ENTITY projectMenu_label "Project"> <!ENTITY projectMenu_accesskey "P"> @@ -59,7 +63,7 @@ <!ENTITY projectButton_label "Open App"> <!ENTITY runtimeButton_label "Select Runtime"> -<!-- We try to repicate Firefox' bindings: --> +<!-- We try to repicate browser' bindings: --> <!-- quit app --> <!ENTITY key_quit "W"> <!-- open menu --> diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties index 2368ad7f1..7218afd99 100644 --- a/devtools/client/locales/en-US/webide.properties +++ b/devtools/client/locales/en-US/webide.properties @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -title_noApp=Firefox WebIDE -title_app=Firefox WebIDE: %S +title_noApp=WebIDE +title_app=WebIDE: %S runtimeButton_label=Select Runtime projectButton_label=Open App @@ -49,7 +49,7 @@ error_appProjectsLoadFailed=Unable to load project list. This can occur if you†error_folderCreationFailed=Unable to create project folder in the selected directory. # Variable: runtime app build ID (looks like this %Y%M%D format) and firefox build ID (same format) -error_runtimeVersionTooRecent=The connected runtime has a more recent build date (%1$S) than your desktop Firefox (%2$S) does. This is an unsupported setup and may cause DevTools to fail. Please update Firefox. +error_runtimeVersionTooRecent=The connected runtime has a more recent build date (%1$S) than your desktop browser (%2$S) does. This is an unsupported setup and may cause DevTools to fail. Please update the browser. addons_stable=stable addons_unstable=unstable |