зеркало из https://github.com/mozilla/gecko-dev.git
Merge f-t to m-c, a=merge
This commit is contained in:
Коммит
95b0ecf4b5
|
@ -54,10 +54,6 @@
|
|||
- tooltip for the button that toggles the promise debugger. -->
|
||||
<!ENTITY debuggerUI.sources.togglePromiseDebugger "Toggle Promise Debugger">
|
||||
|
||||
<!-- LOCALIZATION NOTE (debuggerUI.startTracing): This is the text displayed in
|
||||
- the button to start execution tracing. -->
|
||||
<!ENTITY debuggerUI.startTracing "Start Tracing">
|
||||
|
||||
<!-- LOCALIZATION NOTE (debuggerUI.clearButton): This is the label for
|
||||
- the button that clears the collected tracing data in the tracing tab. -->
|
||||
<!ENTITY debuggerUI.clearButton "Clear">
|
||||
|
|
|
@ -30,14 +30,6 @@ pausePendingButtonTooltip=Waiting for next execution
|
|||
# button when the debugger is in a paused state.
|
||||
resumeButtonTooltip=Click to resume (%S)
|
||||
|
||||
# LOCALIZATION NOTE (startTracingTooltip): The label that is displayed on the trace
|
||||
# button when execution tracing is stopped.
|
||||
startTracingTooltip=Click to start tracing
|
||||
|
||||
# LOCALIZATION NOTE (stopTracingTooltip): The label that is displayed on the trace
|
||||
# button when execution tracing is started.
|
||||
stopTracingTooltip=Click to stop tracing
|
||||
|
||||
# LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
|
||||
# button that steps over a function call.
|
||||
stepOverTooltip=Step Over (%S)
|
||||
|
@ -50,10 +42,6 @@ stepInTooltip=Step In (%S)
|
|||
# button that steps out of a function call.
|
||||
stepOutTooltip=Step Out (%S)
|
||||
|
||||
# LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
|
||||
# when there are no chrome globals available.
|
||||
noGlobalsText=No globals
|
||||
|
||||
# LOCALIZATION NOTE (noWorkersText): The text to display in the workers list
|
||||
# when there are no workers.
|
||||
noWorkersText=This page has no workers.
|
||||
|
@ -62,10 +50,6 @@ noWorkersText=This page has no workers.
|
|||
# when there are no sources.
|
||||
noSourcesText=This page has no sources.
|
||||
|
||||
# LOCALIZATION NOTE (loadingSourcesText): The text to display in the sources menu
|
||||
# when waiting for scripts to load.
|
||||
loadingSourcesText=Waiting for sources…
|
||||
|
||||
# LOCALIZATION NOTE (noEventListenersText): The text to display in the events tab
|
||||
# when there are no events.
|
||||
noEventListenersText=No event listeners to display
|
||||
|
@ -74,14 +58,6 @@ noEventListenersText=No event listeners to display
|
|||
# when there are no stack frames.
|
||||
noStackFramesText=No stack frames to display
|
||||
|
||||
# LOCALIZATION NOTE (noStackFramesText): The text to display in the traces tab
|
||||
# when there are no function calls.
|
||||
noFunctionCallsText=No function calls to display
|
||||
|
||||
# LOCALIZATION NOTE (tracingNotStartedText): The text to display in the traces tab
|
||||
# when when tracing hasn't started yet.
|
||||
tracingNotStartedText=Tracing has not started
|
||||
|
||||
# LOCALIZATION NOTE (eventCheckboxTooltip): The tooltip text to display when
|
||||
# the user hovers over the checkbox used to toggle an event breakpoint.
|
||||
eventCheckboxTooltip=Toggle breaking on this event
|
||||
|
@ -140,11 +116,6 @@ noMatchingStringsText=No matches found
|
|||
# filter text box when it is empty and the scripts container is selected.
|
||||
emptySearchText=Search scripts (%S)
|
||||
|
||||
# LOCALIZATION NOTE (emptyChromeGlobalsFilterText): This is the text that
|
||||
# appears in the filter text box when it is empty and the chrome globals
|
||||
# container is selected.
|
||||
emptyChromeGlobalsFilterText=Filter chrome globals (%S)
|
||||
|
||||
# LOCALIZATION NOTE (emptyVariablesFilterText): This is the text that
|
||||
# appears in the filter text box for the variables view container.
|
||||
emptyVariablesFilterText=Filter variables
|
||||
|
|
|
@ -9,12 +9,6 @@
|
|||
# A good criteria is the language in which you'd find the best documentation
|
||||
# on web development on the web.
|
||||
|
||||
# LOCALIZATION NOTE (storage.tooltip3):
|
||||
# This string is displayed in the tooltip of the tab when the storage editor is
|
||||
# displayed inside the developer tools window.
|
||||
# A keyboard shortcut for Storage Inspector will be shown inside the brackets.
|
||||
storage.tooltip3=Storage Inspector (Cookies, Local Storage, …) (%S)
|
||||
|
||||
# LOCALIZATION NOTE (storage.filter.key):
|
||||
# Key shortcut used to focus the filter box on top of the data view
|
||||
storage.filter.key=CmdOrCtrl+F
|
||||
|
|
|
@ -3356,10 +3356,7 @@ public class BrowserApp extends GeckoApp
|
|||
|
||||
String url = tab.getURL();
|
||||
if (AboutPages.isAboutReader(url)) {
|
||||
String urlFromReader = ReaderModeUtils.getUrlFromAboutReader(url);
|
||||
if (urlFromReader != null) {
|
||||
url = urlFromReader;
|
||||
}
|
||||
url = ReaderModeUtils.stripAboutReaderUrl(url);
|
||||
}
|
||||
|
||||
// Disable share menuitem for about:, chrome:, file:, and resource: URIs
|
||||
|
@ -3538,9 +3535,7 @@ public class BrowserApp extends GeckoApp
|
|||
if (tab != null) {
|
||||
String url = tab.getURL();
|
||||
if (url != null) {
|
||||
if (AboutPages.isAboutReader(url)) {
|
||||
url = ReaderModeUtils.getUrlFromAboutReader(url);
|
||||
}
|
||||
url = ReaderModeUtils.stripAboutReaderUrl(url);
|
||||
|
||||
// Context: Sharing via chrome list (no explicit session is active)
|
||||
Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST, "menu");
|
||||
|
|
|
@ -745,16 +745,15 @@ public class Tabs implements GeckoEventListener {
|
|||
return null;
|
||||
}
|
||||
|
||||
if (AboutPages.isAboutReader(url)) {
|
||||
url = ReaderModeUtils.getUrlFromAboutReader(url);
|
||||
}
|
||||
url = ReaderModeUtils.stripAboutReaderUrl(url);
|
||||
|
||||
for (Tab tab : mOrder) {
|
||||
if (isPrivate != tab.isPrivate()) {
|
||||
continue;
|
||||
}
|
||||
String tabUrl = tab.getURL();
|
||||
if (AboutPages.isAboutReader(tabUrl)) {
|
||||
tabUrl = ReaderModeUtils.getUrlFromAboutReader(tabUrl);
|
||||
tabUrl = ReaderModeUtils.stripAboutReaderUrl(tabUrl);
|
||||
if (url.equals(tabUrl)) {
|
||||
return tab;
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ public class ReaderModeUtils {
|
|||
* URLs.
|
||||
* @return <code>null</code> if the URL is malformed or doesn't contain a URL parameter.
|
||||
*/
|
||||
public static String getUrlFromAboutReader(String aboutReaderUrl) {
|
||||
private static String getUrlFromAboutReader(String aboutReaderUrl) {
|
||||
return StringUtils.getQueryParameter(aboutReaderUrl, "url");
|
||||
}
|
||||
|
||||
|
@ -45,6 +45,12 @@ public class ReaderModeUtils {
|
|||
return getAboutReaderForUrl(url, -1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtain the underlying URL from an about:reader URL.
|
||||
* This will return the input URL if either of the following is true:
|
||||
* 1. the input URL is a non about:reader URL
|
||||
* 2. the input URL is an invalid/unparseable about:reader URL
|
||||
*/
|
||||
public static String stripAboutReaderUrl(String url) {
|
||||
if (!AboutPages.isAboutReader(url)) {
|
||||
return url;
|
||||
|
|
Загрузка…
Ссылка в новой задаче