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 897830 - Part 1 - Rename "flyout" to "flyoutpanel" for clarity. r=timA

Browse Source 
--HG--
rename : browser/metro/base/content/flyouts/aboutFlyout.js => browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
rename : browser/metro/base/content/flyouts/flyoutUI.js => browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js
rename : browser/metro/base/content/flyouts/prefsFlyout.js => browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js
rename : browser/metro/base/content/flyouts/syncFlyout.js => browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js
extra : rebase_source : b97f23e84ad37814d9d8476c9e41fc57c0537e06
This commit is contained in:
Jonathan Wilde 2013-07-29 14:35:17 -07:00
parent 1919ebe32b
commit 5178374158
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/metro/base/content/browser-scripts.js
View File

@ -136,7 +136,7 @@ let ScriptContexts = {};
["ItemPinHelper", "chrome://browser/content/helperui/ItemPinHelper.js"],
["NavButtonSlider", "chrome://browser/content/NavButtonSlider.js"],
["ContextUI", "chrome://browser/content/ContextUI.js"],
["FlyoutPanelsUI", "chrome://browser/content/flyouts/flyoutUI.js"],
["FlyoutPanelsUI", "chrome://browser/content/flyoutpanels/FlyoutPanelsUI.js"],
#ifdef MOZ_SERVICES_SYNC
["RemoteTabsView", "chrome://browser/content/RemoteTabs.js"],
["RemoteTabsStartView", "chrome://browser/content/RemoteTabs.js"],

8
browser/metro/base/content/browser-ui.js
View File

@ -1036,7 +1036,7 @@ var BrowserUI = {
case "cmd_remoteTabs":
#ifdef MOZ_SERVICES_SYNC
if (Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED) {
FlyoutPanelsUI.show('SyncFlyout');
FlyoutPanelsUI.show('SyncFlyoutPanel');
} else {
PanelUI.show("remotetabs-container");
}
@ -1506,17 +1506,17 @@ var SettingsCharm = {
// Options
this.addEntry({
label: Strings.browser.GetStringFromName("optionsCharm"),
onselected: function() FlyoutPanelsUI.show('PrefsFlyout')
onselected: function() FlyoutPanelsUI.show('PrefsFlyoutPanel')
});
// Sync
this.addEntry({
label: Strings.browser.GetStringFromName("syncCharm"),
onselected: function() FlyoutPanelsUI.show('SyncFlyout')
onselected: function() FlyoutPanelsUI.show('SyncFlyoutPanel')
});
// About
this.addEntry({
label: Strings.browser.GetStringFromName("aboutCharm1"),
onselected: function() FlyoutPanelsUI.show('AboutFlyout')
onselected: function() FlyoutPanelsUI.show('AboutFlyoutPanel')
});
// Help
this.addEntry({

44
browser/metro/base/content/browser.xul
View File

@ -146,11 +146,11 @@
<key id="key_quit" key="q" modifiers="accel" command="cmd_quit"/>
<key id="key_addBoomkark" key="d" modifiers="accel" command="cmd_addBookmark"/>
<key id="key_console" key="j" modifiers="accel,shift" oncommand="PanelUI.show('console-container')"/>
<key id="key_options" key="o" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('PrefsFlyout')" />
<key id="key_options" key="o" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" />
#ifdef MOZ_SERVICES_SYNC
<key id="key_options" key="s" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('SyncFlyout')" />
<key id="key_options" key="s" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" />
#endif
<key id="key_options" key="a" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyout')" />
<key id="key_options" key="a" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
<!-- manage tabs -->
<key id="key_newTab" key="t" modifiers="accel" command="cmd_newTab"/>
@ -456,7 +456,7 @@
<vbox id="sync-presetup-container" collapsed="true">
<description>&sync.flyout.presetup.description1;</description>
<separator />
<hbox onclick="FlyoutPanelsUI.SyncFlyout.startEasySetup();"
<hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.startEasySetup();"
align="center"
class="text-link">
<image src="chrome://browser/skin/images/plus-34.png" />
@ -497,8 +497,8 @@
<separator />
<description class="text-link"
flex="1"
onclick="FlyoutPanelsUI.SyncFlyout.abortEasySetup();
FlyoutPanelsUI.SyncFlyout.showManualSetup()">
onclick="FlyoutPanelsUI.SyncFlyoutPanel.abortEasySetup();
FlyoutPanelsUI.SyncFlyoutPanel.showManualSetup()">
&sync.flyout.setup.manual.label;
</description>
<separator />
@ -517,14 +517,14 @@
<separator/>
<textbox id="sync-manualsetup-account"
placeholder="&sync.flyout.manualsetup.account.placeholder;"
oninput="FlyoutPanelsUI.SyncFlyout.updateManualSetupConnectButtonState();"/>
oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
<textbox id="sync-manualsetup-password"
placeholder="&sync.flyout.manualsetup.password.placeholder;"
type="password"
oninput="FlyoutPanelsUI.SyncFlyout.updateManualSetupConnectButtonState();"/>
oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
<textbox id="sync-manualsetup-syncKey"
placeholder="&sync.flyout.manualsetup.recoveryKey.placeholder;"
oninput="FlyoutPanelsUI.SyncFlyout.updateManualSetupConnectButtonState();"/>
oninput="FlyoutPanelsUI.SyncFlyoutPanel.updateManualSetupConnectButtonState();"/>
<description id="sync-manualsetup-failure"
class="syncErrorText"
collapsed="true" />
@ -532,7 +532,7 @@
<hbox>
<button id="sync-manualsetup-connect"
class="syncButton"
oncommand="FlyoutPanelsUI.SyncFlyout.manualSetupConnect();"
oncommand="FlyoutPanelsUI.SyncFlyoutPanel.manualSetupConnect();"
label="&sync.flyout.manualsetup.connect.label;"
disabled="true" />
<spacer flex="1" />
@ -548,10 +548,10 @@
<description>&sync.flyout.setupfailure.description;</description>
<hbox>
<button class="syncButton"
oncommand="FlyoutPanelsUI.SyncFlyout.onCancelButton();"
oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onCancelButton();"
label="&sync.flyout.setupfailure.cancelButton;" />
<button class="syncButton"
oncommand="FlyoutPanelsUI.SyncFlyout.onTryAgainButton();"
oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onTryAgainButton();"
label="&sync.flyout.setupfailure.tryAgainButton;" />
</hbox>
</vbox>
@ -574,7 +574,7 @@
</hbox>
<label id="sync-disconnect-label"
class="text-link"
onclick="FlyoutPanelsUI.SyncFlyout.onDisconnectLink();">
onclick="FlyoutPanelsUI.SyncFlyoutPanel.onDisconnectLink();">
&sync.flyout.connected.disconnect;
</label>
<separator />
@ -588,14 +588,14 @@
<hbox>
<separator />
<button label="&sync.flyout.connected.cancel;"
oncommand="FlyoutPanelsUI.SyncFlyout.onDisconnectCancel();" />
oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onDisconnectCancel();" />
<button label="&sync.flyout.connected.disconnect;"
oncommand="FlyoutPanelsUI.SyncFlyout.onDisconnectButton();" />
oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onDisconnectButton();" />
</hbox>
<separator />
</vbox>
<hbox onclick="FlyoutPanelsUI.SyncFlyout.onPairDeviceLink();"
<hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.onPairDeviceLink();"
class="text-link">
<image src="chrome://browser/skin/images/plus-24.png" />
<separator />
@ -611,15 +611,15 @@
<textbox id="sync-pair-entry1"
class="syncJPAKECode"
maxlength="4"
oninput="FlyoutPanelsUI.SyncFlyout.updatePairButtonState();" />
oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
<textbox id="sync-pair-entry2"
class="syncJPAKECode"
maxlength="4"
oninput="FlyoutPanelsUI.SyncFlyout.updatePairButtonState();" />
oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
<textbox id="sync-pair-entry3"
class="syncJPAKECode"
maxlength="4"
oninput="FlyoutPanelsUI.SyncFlyout.updatePairButtonState();" />
oninput="FlyoutPanelsUI.SyncFlyoutPanel.updatePairButtonState();" />
</vbox>
<spacer flex="1" />
</hbox>
@ -631,7 +631,7 @@
<hbox>
<button id="sync-pair-button"
label="&sync.flyout.pairNewDevice.pair;"
oncommand="FlyoutPanelsUI.SyncFlyout.onPairButton();"
oncommand="FlyoutPanelsUI.SyncFlyoutPanel.onPairButton();"
disabled="true" />
<spacer flex="1" />
</hbox>
@ -700,11 +700,11 @@
<setting pref="app.crashreporter.autosubmit" type="bool" title="&optionsHeader.reporting.crashes.label;" oncommand="BrowserUI.crashReportingPrefChanged(this.value);"/>
</settings>
<settings id="prefs-telemetry" label="&optionsHeader.telemetry.title;">
<setting pref="toolkit.telemetry.enabled" type="bool" title="&optionsHeader.telemetry.label;" oncommand="FlyoutPanelsUI.PrefsFlyout.onTelemetryPreferenceChanged(this.value);"/>
<setting pref="toolkit.telemetry.enabled" type="bool" title="&optionsHeader.telemetry.label;" oncommand="FlyoutPanelsUI.PrefsFlyoutPanel.onTelemetryPreferenceChanged(this.value);"/>
</settings>
<settings id="prefs-dnt" label="&doNotTrack.title;">
<description>&doNotTrack.desc;</description>
<setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" onpreferencechanged="FlyoutPanelsUI.PrefsFlyout.onDNTPreferenceChanged();" type="radio" >
<setting id="prefs-dnt-value" pref="privacy.donottrackheader.value" onpreferencechanged="FlyoutPanelsUI.PrefsFlyoutPanel.onDNTPreferenceChanged();" type="radio" >
<radiogroup id="prefs-dnt-options">
<radio id="prefs-dnt-notrack" label="&doNotTrack.options.trackingNotOkay;" value="1"/>
<radio id="prefs-dnt-nopref" label="&doNotTrack.options.noPreference;" value="-1"/>

8
browser/metro/base/content/flyouts/aboutFlyout.js → browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
View File

@ -7,10 +7,10 @@
Cu.import("resource://gre/modules/Services.jsm");
let gAppUpdater;
let AboutFlyout = {
let AboutFlyoutPanel = {
init: function() {
if (this._isInitialized) {
Cu.reportError("Attempted to initialize AboutFlyout more than once");
Cu.reportError("Attempted to initialize AboutFlyoutPanel more than once");
}
this._isInitialized = true;
@ -19,7 +19,7 @@ let AboutFlyout = {
this._elements = {};
[
['versionLabel', 'about-version-label'],
['aboutFlyout', 'about-flyoutpanel'],
['AboutFlyoutPanel', 'about-flyoutpanel'],
].forEach(function(aElement) {
let [name, id] = aElement;
XPCOMUtils.defineLazyGetter(self._elements, name, function() {
@ -27,7 +27,7 @@ let AboutFlyout = {
});
});
this._topmostElement = this._elements.aboutFlyout;
this._topmostElement = this._elements.AboutFlyoutPanel;
// Include the build ID if this is an "a#" (nightly or aurora) build
let version = Services.appinfo.version;

6
browser/metro/base/content/flyouts/flyoutUI.js → browser/metro/base/content/flyoutpanels/FlyoutPanelsUI.js
View File

@ -20,10 +20,10 @@ let FlyoutPanelsUI = {
let scriptContexts = {};
let scripts =
[
['AboutFlyout', 'chrome://browser/content/flyouts/aboutFlyout.js'],
['PrefsFlyout', 'chrome://browser/content/flyouts/prefsFlyout.js'],
['AboutFlyoutPanel', 'chrome://browser/content/flyoutpanels/AboutFlyoutPanel.js'],
['PrefsFlyoutPanel', 'chrome://browser/content/flyoutpanels/PrefsFlyoutPanel.js'],
#ifdef MOZ_SERVICES_SYNC
['SyncFlyout', 'chrome://browser/content/flyouts/syncFlyout.js'],
['SyncFlyoutPanel', 'chrome://browser/content/flyoutpanels/SyncFlyoutPanel.js'],
#endif
];

8
browser/metro/base/content/flyouts/prefsFlyout.js → browser/metro/base/content/flyoutpanels/PrefsFlyoutPanel.js
View File

@ -6,7 +6,7 @@
Components.utils.import("resource://gre/modules/Services.jsm");
let PrefsFlyout = {
let PrefsFlyoutPanel = {
_isInitialized: false,
_hasShown: false,
init: function pv_init() {
@ -21,7 +21,7 @@ let PrefsFlyout = {
this._elements = {};
[
['prefsFlyout', 'prefs-flyoutpanel'],
['PrefsFlyoutPanel', 'prefs-flyoutpanel'],
['dntNoPref', 'prefs-dnt-nopref'],
['telemetryPref','prefs-telemetry'],
].forEach(function(aElement) {
@ -31,7 +31,7 @@ let PrefsFlyout = {
});
});
this._topmostElement = this._elements.prefsFlyout;
this._topmostElement = this._elements.PrefsFlyoutPanel;
},
_show: function() {
@ -40,7 +40,7 @@ let PrefsFlyout = {
this._hasShown = true;
}
this._elements.prefsFlyout.show();
this._elements.PrefsFlyoutPanel.show();
},
onDNTPreferenceChanged: function onDNTPreferenceChanged() {

4
browser/metro/base/content/flyouts/syncFlyout.js → browser/metro/base/content/flyoutpanels/SyncFlyoutPanel.js
View File

@ -6,10 +6,10 @@
Components.utils.import("resource://gre/modules/Services.jsm");
let SyncFlyout = {
let SyncFlyoutPanel = {
init: function() {
if (this._isInitialized) {
Cu.reportError("Attempted to initialize SyncFlyout more than once");
Cu.reportError("Attempted to initialize SyncFlyoutPanel more than once");
return;
}

8
browser/metro/base/jar.mn
View File

@ -27,9 +27,9 @@ chrome.jar:
content/bindings/cssthrobber.xml (content/bindings/cssthrobber.xml)
content/bindings/popup.xml (content/bindings/popup.xml)
* content/flyouts/flyoutUI.js (content/flyouts/flyoutUI.js)
* content/flyouts/aboutFlyout.js (content/flyouts/aboutFlyout.js)
content/flyouts/prefsFlyout.js (content/flyouts/prefsFlyout.js)
* content/flyoutpanels/FlyoutPanelsUI.js (content/flyoutpanels/FlyoutPanelsUI.js)
* content/flyoutpanels/AboutFlyoutPanel.js (content/flyoutpanels/AboutFlyoutPanel.js)
content/flyoutpanels/PrefsFlyoutPanel.js (content/flyoutpanels/PrefsFlyoutPanel.js)
content/prompt/alert.xul (content/prompt/alert.xul)
content/prompt/confirm.xul (content/prompt/confirm.xul)
@ -91,7 +91,7 @@ chrome.jar:
content/AnimatedZoom.js (content/AnimatedZoom.js)
content/dbg-metro-actors.js (content/dbg-metro-actors.js)
#ifdef MOZ_SERVICES_SYNC
content/flyouts/syncFlyout.js (content/flyouts/syncFlyout.js)
content/flyoutpanels/SyncFlyoutPanel.js (content/flyoutpanels/SyncFlyoutPanel.js)
content/RemoteTabs.js (content/RemoteTabs.js)
#endif
content/NavButtonSlider.js (content/NavButtonSlider.js)

14
browser/metro/base/tests/mochitest/browser_prefs_ui.js
View File

@ -37,12 +37,12 @@ gTests.push({
desc: "Test sanitizer UI",
run: function testSanitizeUI() {
// Show options flyout
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyout._topmostElement, "PopupChanged", 2000);
FlyoutPanelsUI.show('PrefsFlyout');
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
FlyoutPanelsUI.show('PrefsFlyoutPanel');
yield promise;
// Make sure it's opened
yield waitForEvent(FlyoutPanelsUI.PrefsFlyout._topmostElement, "transitionend", 1000);
yield waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "transitionend", 1000);
SanitizeHelper.setUp();
@ -90,7 +90,7 @@ gTests.push({
});
// hide options flyout
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyout._topmostElement, "PopupChanged", 2000);
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
FlyoutPanelsUI.hide();
yield promise;
}
@ -119,8 +119,8 @@ gTests.push({
let okTrack = document.getElementById("prefs-dnt-oktrack");
// Show options flyout
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyout._topmostElement, "PopupChanged", 2000);
FlyoutPanelsUI.show('PrefsFlyout');
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
FlyoutPanelsUI.show('PrefsFlyoutPanel');
yield promise;
noPref.click();
@ -140,7 +140,7 @@ gTests.push({
checkDNTPrefs(true, 0);
// hide options flyout
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyout._topmostElement, "PopupChanged", 2000);
let promise = waitForEvent(FlyoutPanelsUI.PrefsFlyoutPanel._topmostElement, "PopupChanged", 2000);
FlyoutPanelsUI.hide();
yield promise;
}