mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1067325 - Fix line endings in several browser / toolkit files. r=mconley
This commit is contained in:
J. Ryan Stinnett
parent
16b5714c43
commit
b4e49ea508
@ -198,7 +198,7 @@ pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%B
|
||||
pref("app.update.idletime", 60);
|
||||
|
||||
// Whether or not we show a dialog box informing the user that the update was
|
||||
// successfully applied. This is off in Firefox by default since we show a
|
||||
// successfully applied. This is off in Firefox by default since we show a
|
||||
// upgrade start page instead! Other apps may wish to show this UI, and supply
|
||||
// a whatsNewURL field in their brand.properties that contains a link to a page
|
||||
// which tells users what's new in this new update.
|
||||
@ -225,10 +225,10 @@ pref("app.update.service.enabled", true);
|
||||
pref("extensions.update.enabled", true);
|
||||
pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
|
||||
pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%");
|
||||
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
|
||||
pref("extensions.update.interval", 86400); // Check for updates to Extensions and
|
||||
// Themes every day
|
||||
// Non-symmetric (not shared by extensions) extension-specific [update] preferences
|
||||
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
|
||||
pref("extensions.dss.enabled", false); // Dynamic Skin Switching
|
||||
pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
|
||||
// restart.
|
||||
|
||||
@ -359,7 +359,7 @@ pref("browser.altClickSave", false);
|
||||
pref("browser.download.debug", false);
|
||||
|
||||
// Number of milliseconds to wait for the http headers (and thus
|
||||
// the Content-Disposition filename) before giving up and falling back to
|
||||
// the Content-Disposition filename) before giving up and falling back to
|
||||
// picking a filename without that info in hand so that the user sees some
|
||||
// feedback from their action.
|
||||
pref("browser.download.saveLinkAsFilenameTimeout", 4000);
|
||||
@ -390,7 +390,7 @@ pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
|
||||
// pointer to the default engine name
|
||||
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
|
||||
|
||||
// Ordering of Search Engines in the Engine list.
|
||||
// Ordering of Search Engines in the Engine list.
|
||||
pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
|
||||
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
|
||||
pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
|
||||
@ -462,7 +462,7 @@ pref("browser.tabs.drawInTitlebar", false);
|
||||
pref("browser.tabs.drawInTitlebar", true);
|
||||
#endif
|
||||
|
||||
// When tabs opened by links in other tabs via a combination of
|
||||
// When tabs opened by links in other tabs via a combination of
|
||||
// browser.link.open_newwindow being set to 3 and target="_blank" etc are
|
||||
// closed:
|
||||
// true return to the tab that opened this tab (its owner)
|
||||
@ -476,7 +476,7 @@ pref("browser.ctrlTab.previews", false);
|
||||
// be exported as HTML to the bookmarks.html file.
|
||||
pref("browser.bookmarks.autoExportHTML", false);
|
||||
|
||||
// The maximum number of daily bookmark backups to
|
||||
// The maximum number of daily bookmark backups to
|
||||
// keep in {PROFILEDIR}/bookmarkbackups. Special values:
|
||||
// -1: unlimited
|
||||
// 0: no backups created (and deletes all existing backups)
|
||||
@ -489,7 +489,7 @@ pref("javascript.options.showInConsole", true);
|
||||
pref("general.warnOnAboutConfig", false);
|
||||
#endif
|
||||
|
||||
// This is the pref to control the location bar, change this to true to
|
||||
// This is the pref to control the location bar, change this to true to
|
||||
// force this - this makes the origin of popup windows more obvious to avoid
|
||||
// spoofing. We would rather not do it by default because it affects UE for web
|
||||
// applications, but without it there isn't a really good way to prevent chrome
|
||||
@ -917,7 +917,7 @@ pref("browser.audioFeeds.handler", "ask");
|
||||
// At startup, if the handler service notices that the version number in the
|
||||
// region.properties file is newer than the version number in the handler
|
||||
// service datastore, it will add any new handlers it finds in the prefs (as
|
||||
// seeded by this file) to its datastore.
|
||||
// seeded by this file) to its datastore.
|
||||
pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties");
|
||||
|
||||
// The default set of web-based protocol handlers shown in the application
|
||||
|
||||
@ -5560,7 +5560,7 @@ function middleMousePaste(event) {
|
||||
|
||||
clipboard = stripUnsafeProtocolOnPaste(clipboard);
|
||||
|
||||
// if it's not the current tab, we don't need to do anything because the
|
||||
// if it's not the current tab, we don't need to do anything because the
|
||||
// browser doesn't exist.
|
||||
let where = whereToOpenLink(event, true, false);
|
||||
let lastLocationChange;
|
||||
@ -6278,10 +6278,10 @@ function warnAboutClosingWindow() {
|
||||
otherPBWindowExists = true;
|
||||
if (win.toolbar.visible)
|
||||
nonPopupPresent = true;
|
||||
// If the current window is not in private browsing mode we don't need to
|
||||
// look for other pb windows, we can leave the loop when finding the
|
||||
// first non-popup window. If however the current window is in private
|
||||
// browsing mode then we need at least one other pb and one non-popup
|
||||
// If the current window is not in private browsing mode we don't need to
|
||||
// look for other pb windows, we can leave the loop when finding the
|
||||
// first non-popup window. If however the current window is in private
|
||||
// browsing mode then we need at least one other pb and one non-popup
|
||||
// window to break out early.
|
||||
if ((!isPBWindow || otherPBWindowExists) && nonPopupPresent)
|
||||
break;
|
||||
@ -7099,7 +7099,7 @@ var gIdentityHandler = {
|
||||
dt.setData("text/html", htmlString);
|
||||
dt.setDragImage(gProxyFavIcon, 16, 16);
|
||||
},
|
||||
|
||||
|
||||
handleEvent: function (event) {
|
||||
switch (event.type) {
|
||||
case "blur":
|
||||
|
||||
@ -1153,7 +1153,7 @@ nsContextMenu.prototype = {
|
||||
urlSecurityCheck(this.target.currentURI.spec, this.principal);
|
||||
|
||||
// Confirm since it's annoying if you hit this accidentally.
|
||||
const kDesktopBackgroundURL =
|
||||
const kDesktopBackgroundURL =
|
||||
"chrome://browser/content/setDesktopBackground.xul";
|
||||
#ifdef XP_MACOSX
|
||||
// On Mac, the Set Desktop Background window is not modal.
|
||||
@ -1196,7 +1196,7 @@ nsContextMenu.prototype = {
|
||||
// file picker
|
||||
function saveAsListener() {}
|
||||
saveAsListener.prototype = {
|
||||
extListener: null,
|
||||
extListener: null,
|
||||
|
||||
onStartRequest: function saveLinkAs_onStartRequest(aRequest, aContext) {
|
||||
|
||||
@ -1229,17 +1229,17 @@ nsContextMenu.prototype = {
|
||||
return;
|
||||
}
|
||||
|
||||
let extHelperAppSvc =
|
||||
let extHelperAppSvc =
|
||||
Cc["@mozilla.org/uriloader/external-helper-app-service;1"].
|
||||
getService(Ci.nsIExternalHelperAppService);
|
||||
let channel = aRequest.QueryInterface(Ci.nsIChannel);
|
||||
this.extListener =
|
||||
extHelperAppSvc.doContent(channel.contentType, aRequest,
|
||||
extHelperAppSvc.doContent(channel.contentType, aRequest,
|
||||
null, true, window);
|
||||
this.extListener.onStartRequest(aRequest, aContext);
|
||||
},
|
||||
},
|
||||
|
||||
onStopRequest: function saveLinkAs_onStopRequest(aRequest, aContext,
|
||||
onStopRequest: function saveLinkAs_onStopRequest(aRequest, aContext,
|
||||
aStatusCode) {
|
||||
if (aStatusCode == NS_ERROR_SAVE_LINK_AS_TIMEOUT) {
|
||||
// do it the old fashioned way, which will pick the best filename
|
||||
@ -1272,12 +1272,12 @@ nsContextMenu.prototype = {
|
||||
channel.cancel(NS_ERROR_SAVE_LINK_AS_TIMEOUT);
|
||||
}
|
||||
throw Cr.NS_ERROR_NO_INTERFACE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// if it we don't have the headers after a short time, the user
|
||||
// if it we don't have the headers after a short time, the user
|
||||
// won't have received any feedback from their click. that's bad. so
|
||||
// we give up waiting for the filename.
|
||||
// we give up waiting for the filename.
|
||||
function timerCallback() {}
|
||||
timerCallback.prototype = {
|
||||
notify: function sLA_timer_notify(aTimer) {
|
||||
@ -1319,8 +1319,8 @@ nsContextMenu.prototype = {
|
||||
channel.forceAllowThirdPartyCookie = true;
|
||||
}
|
||||
|
||||
// fallback to the old way if we don't see the headers quickly
|
||||
var timeToWait =
|
||||
// fallback to the old way if we don't see the headers quickly
|
||||
var timeToWait =
|
||||
gPrefService.getIntPref("browser.download.saveLinkAsFilenameTimeout");
|
||||
var timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
|
||||
timer.initWithCallback(new timerCallback(), timeToWait,
|
||||
@ -1499,7 +1499,7 @@ nsContextMenu.prototype = {
|
||||
|
||||
// Generate fully qualified URL for clicked-on link.
|
||||
getLinkURL: function() {
|
||||
var href = this.link.href;
|
||||
var href = this.link.href;
|
||||
if (href)
|
||||
return href;
|
||||
|
||||
|
||||
@ -86,7 +86,7 @@ function viewPartialSourceForSelection(selection)
|
||||
// is _very_ important.
|
||||
// XXXbz wish there were a less hacky way to create an untrusted document here
|
||||
var isHTML = (doc.createElement("div").tagName == "DIV");
|
||||
var dataDoc = isHTML ?
|
||||
var dataDoc = isHTML ?
|
||||
ancestorContainer.ownerDocument.implementation.createHTMLDocument("") :
|
||||
ancestorContainer.ownerDocument.implementation.createDocument("", "", null);
|
||||
ancestorContainer = dataDoc.importNode(ancestorContainer, true);
|
||||
|
||||
@ -4,8 +4,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/.
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://mozapps/skin/viewsource/viewsource.css" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
||||
|
||||
@ -20,10 +20,10 @@
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="onLoadViewPartialSource();"
|
||||
contenttitlesetting="true"
|
||||
title="&mainWindow.title;"
|
||||
titlemodifier="&mainWindow.titlemodifier;"
|
||||
title="&mainWindow.title;"
|
||||
titlemodifier="&mainWindow.titlemodifier;"
|
||||
titlepreface=""
|
||||
titlemenuseparator ="&mainWindow.titlemodifierseparator;"
|
||||
titlemenuseparator ="&mainWindow.titlemodifierseparator;"
|
||||
windowtype="navigator:view-source"
|
||||
width="500" height="300"
|
||||
screenX="10" screenY="10"
|
||||
@ -89,7 +89,7 @@
|
||||
<menuitem id="cMenu_selectAll"/>
|
||||
</menupopup>
|
||||
|
||||
<!-- Menu -->
|
||||
<!-- Menu -->
|
||||
<toolbox id="viewSource-toolbox">
|
||||
<menubar id="viewSource-main-menubar">
|
||||
|
||||
@ -131,11 +131,11 @@
|
||||
<menu id="menu_view" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
|
||||
<menupopup id="viewmenu-popup">
|
||||
<menu id="viewTextZoomMenu" label="&menu_textSize.label;" accesskey="&menu_textSize.accesskey;">
|
||||
<menupopup>
|
||||
<menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge"
|
||||
<menupopup>
|
||||
<menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge"
|
||||
label="&menu_textEnlarge.label;" accesskey="&menu_textEnlarge.accesskey;"
|
||||
key="key_textZoomEnlarge"/>
|
||||
<menuitem id="menu_textReduce" command="cmd_textZoomReduce"
|
||||
<menuitem id="menu_textReduce" command="cmd_textZoomReduce"
|
||||
label="&menu_textReduce.label;" accesskey="&menu_textReduce.accesskey;"
|
||||
key="key_textZoomReduce"/>
|
||||
<menuseparator/>
|
||||
@ -151,7 +151,7 @@
|
||||
label="&menu_highlightSyntax.label;" accesskey="&menu_highlightSyntax.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
</menubar>
|
||||
</menubar>
|
||||
</toolbox>
|
||||
|
||||
<vbox id="appcontent" flex="1">
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# 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/.
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://mozapps/skin/viewsource/viewsource.css" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
|
||||
@ -21,10 +21,10 @@
|
||||
<window id="viewSource"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
contenttitlesetting="true"
|
||||
title="&mainWindow.title;"
|
||||
titlemodifier="&mainWindow.titlemodifier;"
|
||||
title="&mainWindow.title;"
|
||||
titlemodifier="&mainWindow.titlemodifier;"
|
||||
titlepreface="&mainWindow.preface;"
|
||||
titlemenuseparator ="&mainWindow.titlemodifierseparator;"
|
||||
titlemenuseparator ="&mainWindow.titlemodifierseparator;"
|
||||
windowtype="navigator:view-source"
|
||||
width="640" height="480"
|
||||
screenX="10" screenY="10"
|
||||
@ -35,7 +35,7 @@
|
||||
<script type="application/javascript" src="chrome://global/content/viewSource.js"/>
|
||||
<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
|
||||
<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
|
||||
|
||||
|
||||
<stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>
|
||||
|
||||
<command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
|
||||
@ -110,7 +110,7 @@
|
||||
#endif
|
||||
|
||||
</keyset>
|
||||
|
||||
|
||||
<tooltip id="aHTMLTooltip" page="true"/>
|
||||
|
||||
<menupopup id="viewSourceContextMenu">
|
||||
@ -140,7 +140,7 @@
|
||||
<menuitem id="cMenu_selectAll"/>
|
||||
</menupopup>
|
||||
|
||||
<!-- Menu -->
|
||||
<!-- Menu -->
|
||||
<toolbox id="viewSource-toolbox">
|
||||
<menubar id="viewSource-main-menubar">
|
||||
|
||||
@ -188,11 +188,11 @@
|
||||
label="&reloadCmd.label;" key="key_reload"/>
|
||||
<menuseparator />
|
||||
<menu id="viewTextZoomMenu" label="&menu_textSize.label;" accesskey="&menu_textSize.accesskey;">
|
||||
<menupopup>
|
||||
<menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge"
|
||||
<menupopup>
|
||||
<menuitem id="menu_textEnlarge" command="cmd_textZoomEnlarge"
|
||||
label="&menu_textEnlarge.label;" accesskey="&menu_textEnlarge.accesskey;"
|
||||
key="key_textZoomEnlarge"/>
|
||||
<menuitem id="menu_textReduce" command="cmd_textZoomReduce"
|
||||
<menuitem id="menu_textReduce" command="cmd_textZoomReduce"
|
||||
label="&menu_textReduce.label;" accesskey="&menu_textReduce.accesskey;"
|
||||
key="key_textZoomReduce"/>
|
||||
<menuseparator/>
|
||||
@ -218,7 +218,7 @@
|
||||
label="&menu_highlightSyntax.label;" accesskey="&menu_highlightSyntax.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
</menubar>
|
||||
</menubar>
|
||||
</toolbox>
|
||||
|
||||
<vbox id="appcontent" flex="1">
|
||||
@ -226,7 +226,7 @@
|
||||
<browser id="content" type="content-primary" name="content" src="about:blank" flex="1"
|
||||
context="viewSourceContextMenu" showcaret="true" tooltip="aHTMLTooltip" />
|
||||
<findbar id="FindToolbar" browserid="content"/>
|
||||
</vbox>
|
||||
</vbox>
|
||||
|
||||
<statusbar id="status-bar" class="chromeclass-status">
|
||||
<statusbarpanel id="statusbar-line-col" label="" flex="1"/>
|
||||
|
||||
@ -114,7 +114,7 @@ var gViewSourceUtils = {
|
||||
lineNumber: aLineNumber};
|
||||
|
||||
try {
|
||||
var editor = this.getExternalViewSourceEditor();
|
||||
var editor = this.getExternalViewSourceEditor();
|
||||
if (!editor) {
|
||||
this.handleCallBack(aCallBack, false, data);
|
||||
return;
|
||||
@ -129,7 +129,7 @@ var gViewSourceUtils = {
|
||||
|
||||
var path;
|
||||
var contentType = aDocument ? aDocument.contentType : null;
|
||||
if (uri.scheme == "file") {
|
||||
if (uri.scheme == "file") {
|
||||
// it's a local file; we can open it directly
|
||||
path = uri.QueryInterface(Components.interfaces.nsIFileURL).file.path;
|
||||
|
||||
@ -140,7 +140,7 @@ var gViewSourceUtils = {
|
||||
// set up the progress listener with what we know so far
|
||||
this.viewSourceProgressListener.editor = editor;
|
||||
this.viewSourceProgressListener.callBack = aCallBack;
|
||||
this.viewSourceProgressListener.data = data;
|
||||
this.viewSourceProgressListener.data = data;
|
||||
if (!aPageDescriptor) {
|
||||
// without a page descriptor, loadPage has no chance of working. download the file.
|
||||
var file = this.getTemporaryFile(uri, aDocument, contentType);
|
||||
@ -189,7 +189,7 @@ var gViewSourceUtils = {
|
||||
var progress = webShell.QueryInterface(this.mnsIWebProgress);
|
||||
progress.addProgressListener(this.viewSourceProgressListener,
|
||||
this.mnsIWebProgress.NOTIFY_STATE_DOCUMENT);
|
||||
var pageLoader = webShell.QueryInterface(this.mnsIWebPageDescriptor);
|
||||
var pageLoader = webShell.QueryInterface(this.mnsIWebPageDescriptor);
|
||||
pageLoader.loadPage(aPageDescriptor, this.mnsIWebPageDescriptor.DISPLAY_AS_SOURCE);
|
||||
}
|
||||
}
|
||||
@ -296,7 +296,7 @@ var gViewSourceUtils = {
|
||||
|
||||
// get a temporary filename using the attributes from the data object that
|
||||
// openInExternalEditor gave us
|
||||
this.file = gViewSourceUtils.getTemporaryFile(this.data.uri, this.data.doc,
|
||||
this.file = gViewSourceUtils.getTemporaryFile(this.data.uri, this.data.doc,
|
||||
this.data.doc.contentType);
|
||||
|
||||
// we have to convert from the source charset.
|
||||
@ -310,7 +310,7 @@ var gViewSourceUtils = {
|
||||
|
||||
// write the source to the file
|
||||
coStream.writeString(webNavigation.document.body.textContent);
|
||||
|
||||
|
||||
// clean up
|
||||
coStream.close();
|
||||
foStream.close();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user