wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 730271 - Create sync folder for Sync-related content files. r=mak

Browse Source 
--HG--
rename : browser/base/content/aboutSyncTabs-bindings.xml => browser/base/content/sync/aboutSyncTabs-bindings.xml
rename : browser/base/content/aboutSyncTabs.css => browser/base/content/sync/aboutSyncTabs.css
rename : browser/base/content/aboutSyncTabs.js => browser/base/content/sync/aboutSyncTabs.js
rename : browser/base/content/aboutSyncTabs.xul => browser/base/content/sync/aboutSyncTabs.xul
rename : browser/base/content/syncAddDevice.js => browser/base/content/sync/addDevice.js
rename : browser/base/content/syncAddDevice.xul => browser/base/content/sync/addDevice.xul
rename : browser/base/content/syncGenericChange.js => browser/base/content/sync/genericChange.js
rename : browser/base/content/syncGenericChange.xul => browser/base/content/sync/genericChange.xul
rename : browser/base/content/syncKey.xhtml => browser/base/content/sync/key.xhtml
rename : browser/base/content/syncNotification.xml => browser/base/content/sync/notification.xml
rename : browser/base/content/syncProgress.js => browser/base/content/sync/progress.js
rename : browser/base/content/syncProgress.xhtml => browser/base/content/sync/progress.xhtml
rename : browser/base/content/syncQuota.js => browser/base/content/sync/quota.js
rename : browser/base/content/syncQuota.xul => browser/base/content/sync/quota.xul
rename : browser/base/content/syncSetup.js => browser/base/content/sync/setup.js
rename : browser/base/content/syncSetup.xul => browser/base/content/sync/setup.xul
rename : browser/base/content/syncUtils.js => browser/base/content/sync/utils.js
extra : rebase_source : ca9eb20410f5a5640819ce9d68f5c51277ae5f35
This commit is contained in:
Dão Gottwald 2012-02-28 17:03:35 +01:00
parent a055d5ecae
commit cc07c08e46
27 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/base/content/aboutSyncTabs.css
View File

@ -1,7 +0,0 @@
richlistitem[type="tab"] {
-moz-binding: url(chrome://browser/content/aboutSyncTabs-bindings.xml#tab-listing);
}
richlistitem[type="client"] {
-moz-binding: url(chrome://browser/content/aboutSyncTabs-bindings.xml#client-listing);
}

6
browser/base/content/browser-syncui.js
View File

@ -291,7 +291,7 @@ let gSyncUI = {
if (win)
win.focus();
else {
window.openDialog("chrome://browser/content/syncSetup.xul",
window.openDialog("chrome://browser/content/sync/setup.xul",
"weaveSetup", "centerscreen,chrome,resizable=no",
wizardType);
}
@ -305,7 +305,7 @@ let gSyncUI = {
if (win)
win.focus();
else
window.openDialog("chrome://browser/content/syncAddDevice.xul",
window.openDialog("chrome://browser/content/sync/addDevice.xul",
"syncAddDevice", "centerscreen,chrome,resizable=no");
},
@ -315,7 +315,7 @@ let gSyncUI = {
win.focus();
else
Services.ww.activeWindow.openDialog(
"chrome://browser/content/syncQuota.xul", "",
"chrome://browser/content/sync/quota.xul", "",
"centerscreen,chrome,dialog,modal");
},

4
browser/base/content/browser.css
View File

@ -329,12 +329,12 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
%ifdef MOZ_SERVICES_SYNC
/* Sync notification UI */
#sync-notifications {
-moz-binding: url("chrome://browser/content/syncNotification.xml#notificationbox");
-moz-binding: url("chrome://browser/content/sync/notification.xml#notificationbox");
overflow-y: visible !important;
}
#sync-notifications notification {
-moz-binding: url("chrome://browser/content/syncNotification.xml#notification");
-moz-binding: url("chrome://browser/content/sync/notification.xml#notification");
}
%endif

0
browser/base/content/aboutSyncTabs-bindings.xml → browser/base/content/sync/aboutSyncTabs-bindings.xml
View File

7
browser/base/content/sync/aboutSyncTabs.css Normal file
View File

@ -0,0 +1,7 @@
richlistitem[type="tab"] {
-moz-binding: url(chrome://browser/content/sync/aboutSyncTabs-bindings.xml#tab-listing);
}
richlistitem[type="client"] {
-moz-binding: url(chrome://browser/content/sync/aboutSyncTabs-bindings.xml#client-listing);
}

0
browser/base/content/aboutSyncTabs.js → browser/base/content/sync/aboutSyncTabs.js
View File

4
browser/base/content/aboutSyncTabs.xul → browser/base/content/sync/aboutSyncTabs.xul
View File

@ -40,7 +40,7 @@
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/aboutSyncTabs.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/aboutSyncTabs.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/sync/aboutSyncTabs.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % aboutSyncTabsDTD SYSTEM "chrome://browser/locale/aboutSyncTabs.dtd">
@ -53,7 +53,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
title="&tabs.otherComputers.label;">
<script type="application/javascript;version=1.8" src="chrome://browser/content/aboutSyncTabs.js"/>
<script type="application/javascript;version=1.8" src="chrome://browser/content/sync/aboutSyncTabs.js"/>
<script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
<html:head>
<html:link rel="icon" href="chrome://browser/skin/sync-16.png"/>

0
browser/base/content/syncAddDevice.js → browser/base/content/sync/addDevice.js
View File

4
browser/base/content/syncAddDevice.xul → browser/base/content/sync/addDevice.xul
View File

@ -61,9 +61,9 @@
onload="gSyncAddDevice.init();">
<script type="application/javascript"
src="chrome://browser/content/syncAddDevice.js"/>
src="chrome://browser/content/sync/addDevice.js"/>
<script type="application/javascript"
src="chrome://browser/content/syncUtils.js"/>
src="chrome://browser/content/sync/utils.js"/>
<script type="application/javascript"
src="chrome://browser/content/utilityOverlay.js"/>
<script type="application/javascript"

0
browser/base/content/syncGenericChange.js → browser/base/content/sync/genericChange.js
View File

4
browser/base/content/syncGenericChange.xul → browser/base/content/sync/genericChange.xul
View File

@ -60,9 +60,9 @@
onwizardfinish="return Change.onDialogAccept();">
<script type="application/javascript"
src="chrome://browser/content/syncGenericChange.js"/>
src="chrome://browser/content/sync/genericChange.js"/>
<script type="application/javascript"
src="chrome://browser/content/syncUtils.js"/>
src="chrome://browser/content/sync/utils.js"/>
<script type="application/javascript"
src="chrome://global/content/printUtils.js"/>

0
browser/base/content/syncKey.xhtml → browser/base/content/sync/key.xhtml
View File

0
browser/base/content/syncNotification.xml → browser/base/content/sync/notification.xml
View File

0
browser/base/content/syncProgress.js → browser/base/content/sync/progress.js
View File

2
browser/base/content/syncProgress.xhtml → browser/base/content/sync/progress.xhtml
View File

@ -61,7 +61,7 @@
href="chrome://browser/skin/sync-16.png"/>
<script type="text/javascript;version=1.8"
src="chrome://browser/content/syncProgress.js"/>
src="chrome://browser/content/sync/progress.js"/>
</head>
<body onload="onLoad(event)" onunload="onUnload(event)">
<title>&setup.successPage.title;</title>

0
browser/base/content/syncQuota.js → browser/base/content/sync/quota.js
View File

2
browser/base/content/syncQuota.xul → browser/base/content/sync/quota.xul
View File

@ -60,7 +60,7 @@
ondialogaccept="return gSyncQuota.onAccept();">
<script type="application/javascript"
src="chrome://browser/content/syncQuota.js"/>
src="chrome://browser/content/sync/quota.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="quotaStrings"

0
browser/base/content/syncSetup.js → browser/base/content/sync/setup.js
View File

4
browser/base/content/syncSetup.xul → browser/base/content/sync/setup.xul
View File

@ -65,9 +65,9 @@
onload="gSyncSetup.init()">
<script type="application/javascript"
src="chrome://browser/content/syncSetup.js"/>
src="chrome://browser/content/sync/setup.js"/>
<script type="application/javascript"
src="chrome://browser/content/syncUtils.js"/>
src="chrome://browser/content/sync/utils.js"/>
<script type="application/javascript"
src="chrome://browser/content/utilityOverlay.js"/>
<script type="application/javascript"

4
browser/base/content/syncUtils.js → browser/base/content/sync/utils.js
View File

@ -76,7 +76,7 @@ let gSyncUtils = {
}
// Open up the change dialog
let changeXUL = "chrome://browser/content/syncGenericChange.xul";
let changeXUL = "chrome://browser/content/sync/genericChange.xul";
let changeOpt = "centerscreen,chrome,resizable=no";
Services.ww.activeWindow.openDialog(changeXUL, "", changeOpt,
type, duringSetup);
@ -125,7 +125,7 @@ let gSyncUtils = {
// Create an invisible iframe whose contents we can print.
let iframe = document.createElement("iframe");
iframe.setAttribute("src", "chrome://browser/content/syncKey.xhtml");
iframe.setAttribute("src", "chrome://browser/content/sync/key.xhtml");
iframe.collapsed = true;
document.documentElement.appendChild(iframe);
iframe.contentWindow.addEventListener("load", function() {

38
browser/base/jar.mn
View File

@ -41,6 +41,25 @@ browser.jar:
* content/browser/pageinfo/feeds.xml (content/pageinfo/feeds.xml)
* content/browser/pageinfo/permissions.js (content/pageinfo/permissions.js)
* content/browser/pageinfo/security.js (content/pageinfo/security.js)
#ifdef MOZ_SERVICES_SYNC
* content/browser/sync/aboutSyncTabs.xul (content/sync/aboutSyncTabs.xul)
content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js)
content/browser/sync/aboutSyncTabs.css (content/sync/aboutSyncTabs.css)
* content/browser/sync/aboutSyncTabs-bindings.xml (content/sync/aboutSyncTabs-bindings.xml)
* content/browser/sync/setup.xul (content/sync/setup.xul)
content/browser/sync/addDevice.js (content/sync/addDevice.js)
* content/browser/sync/addDevice.xul (content/sync/addDevice.xul)
content/browser/sync/setup.js (content/sync/setup.js)
* content/browser/sync/genericChange.xul (content/sync/genericChange.xul)
content/browser/sync/genericChange.js (content/sync/genericChange.js)
* content/browser/sync/key.xhtml (content/sync/key.xhtml)
* content/browser/sync/notification.xml (content/sync/notification.xml)
* content/browser/sync/quota.xul (content/sync/quota.xul)
content/browser/sync/quota.js (content/sync/quota.js)
content/browser/sync/utils.js (content/sync/utils.js)
content/browser/sync/progress.js (content/sync/progress.js)
* content/browser/sync/progress.xhtml (content/sync/progress.xhtml)
#endif
* content/browser/openLocation.js (content/openLocation.js)
* content/browser/openLocation.xul (content/openLocation.xul)
* content/browser/safeMode.js (content/safeMode.js)
@ -57,25 +76,6 @@ browser.jar:
* content/browser/web-panels.xul (content/web-panels.xul)
* content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.xul)
* content/browser/nsContextMenu.js (content/nsContextMenu.js)
#ifdef MOZ_SERVICES_SYNC
* content/browser/aboutSyncTabs.xul (content/aboutSyncTabs.xul)
content/browser/aboutSyncTabs.js (content/aboutSyncTabs.js)
content/browser/aboutSyncTabs.css (content/aboutSyncTabs.css)
* content/browser/aboutSyncTabs-bindings.xml (content/aboutSyncTabs-bindings.xml)
* content/browser/syncSetup.xul (content/syncSetup.xul)
content/browser/syncAddDevice.js (content/syncAddDevice.js)
* content/browser/syncAddDevice.xul (content/syncAddDevice.xul)
content/browser/syncSetup.js (content/syncSetup.js)
* content/browser/syncGenericChange.xul (content/syncGenericChange.xul)
content/browser/syncGenericChange.js (content/syncGenericChange.js)
* content/browser/syncKey.xhtml (content/syncKey.xhtml)
* content/browser/syncNotification.xml (content/syncNotification.xml)
* content/browser/syncQuota.xul (content/syncQuota.xul)
content/browser/syncQuota.js (content/syncQuota.js)
content/browser/syncUtils.js (content/syncUtils.js)
content/browser/syncProgress.js (content/syncProgress.js)
* content/browser/syncProgress.xhtml (content/syncProgress.xhtml)
#endif
# XXX: We should exclude this one as well (bug 71895)
* content/browser/hiddenWindow.xul (content/hiddenWindow.xul)
#ifdef XP_MACOSX

4
browser/components/about/AboutRedirector.cpp
View File

@ -97,9 +97,9 @@ static RedirEntry kRedirMap[] = {
{ "sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
nsIAboutModule::ALLOW_SCRIPT },
#ifdef MOZ_SERVICES_SYNC
{ "sync-progress", "chrome://browser/content/syncProgress.xhtml",
{ "sync-progress", "chrome://browser/content/sync/progress.xhtml",
nsIAboutModule::ALLOW_SCRIPT },
{ "sync-tabs", "chrome://browser/content/aboutSyncTabs.xul",
{ "sync-tabs", "chrome://browser/content/sync/aboutSyncTabs.xul",
nsIAboutModule::ALLOW_SCRIPT },
#endif
{ "home", "chrome://browser/content/aboutHome.xhtml",

6
browser/components/preferences/sync.js
View File

@ -157,7 +157,7 @@ let gSyncPane = {
if (win)
win.focus();
else {
window.openDialog("chrome://browser/content/syncSetup.xul",
window.openDialog("chrome://browser/content/sync/setup.xul",
"weaveSetup", "centerscreen,chrome,resizable=no",
wizardType);
}
@ -168,7 +168,7 @@ let gSyncPane = {
if (win)
win.focus();
else
window.openDialog("chrome://browser/content/syncQuota.xul", "",
window.openDialog("chrome://browser/content/sync/quota.xul", "",
"centerscreen,chrome,dialog,modal");
},
@ -180,7 +180,7 @@ let gSyncPane = {
if (win)
win.focus();
else
window.openDialog("chrome://browser/content/syncAddDevice.xul",
window.openDialog("chrome://browser/content/sync/addDevice.xul",
"syncAddDevice", "centerscreen,chrome,resizable=no");
},

2
browser/components/preferences/sync.xul
View File

@ -69,7 +69,7 @@
<script type="application/javascript"
src="chrome://browser/content/preferences/sync.js"/>
<script type="application/javascript"
src="chrome://browser/content/syncUtils.js"/>
src="chrome://browser/content/sync/utils.js"/>
<deck id="weavePrefsDeck">

4
browser/themes/gnomestripe/syncCommon.css
View File

@ -1,4 +1,4 @@
/* The following are used by both syncSetup.xul and syncGenericChange.xul */
/* The following are used by both sync/setup.xul and sync/genericChange.xul */
.status {
color: -moz-dialogtext;
}
@ -21,7 +21,7 @@
list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu");
}
/* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have
a separate stylesheet for it. */
.data {
font-size: 90%;

4
browser/themes/pinstripe/syncCommon.css
View File

@ -1,4 +1,4 @@
/* The following are used by both syncSetup.xul and syncGenericChange.xul */
/* The following are used by both sync/setup.xul and sync/genericChange.xul */
.status {
color: -moz-dialogtext;
}
@ -21,7 +21,7 @@
list-style-image: url("chrome://global/skin/icons/information-16.png");
}
/* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have
a separate stylesheet for it. */
.data {
font-size: 90%;

4
browser/themes/winstripe/syncCommon.css
View File

@ -1,4 +1,4 @@
/* The following are used by both syncSetup.xul and syncGenericChange.xul */
/* The following are used by both sync/setup.xul and sync/genericChange.xul */
.status {
color: -moz-dialogtext;
}
@ -21,7 +21,7 @@
list-style-image: url("chrome://global/skin/icons/information-16.png");
}
/* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have
a separate stylesheet for it. */
.data {
font-size: 90%;