Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 02:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1093368 - Customize mode theme picker shouldn't pass the default theme object to LightweightThemeManager.previewTheme. r=jaws

Browse Source
This commit is contained in:
Dão Gottwald 2014-11-08 20:30:00 +01:00
parent 9e29836c25
commit b605783cb3
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/base/content/browser-devedition.js
View File

@ -14,7 +14,6 @@ let DevEdition = {
styleSheetLocation: "chrome://browser/skin/devedition.css", styleSheetLocation: "chrome://browser/skin/devedition.css",
styleSheet: null, styleSheet: null,
defaultThemeID: "{972ce4c6-7e08-4474-a285-3208198ce6fd}",
init: function () { init: function () {
this._updateDevtoolsThemeAttribute(); this._updateDevtoolsThemeAttribute();
@ -32,7 +31,7 @@ let DevEdition = {
observe: function (subject, topic, data) { observe: function (subject, topic, data) {
if (topic == "lightweight-theme-styling-update") { if (topic == "lightweight-theme-styling-update") {
let newTheme = JSON.parse(data); let newTheme = JSON.parse(data);
if (!newTheme || newTheme.id === this.defaultThemeID) { if (!newTheme) {
// A lightweight theme has been unapplied, so just re-read prefs. // A lightweight theme has been unapplied, so just re-read prefs.
this._updateStyleSheetFromPrefs(); this._updateStyleSheetFromPrefs();
} else { } else {

2
browser/base/content/test/general/browser_devedition.js
View File

@ -105,7 +105,7 @@ function testLightweightThemePreview() {
info ("Turning the pref on, then previewing the default theme, turning it off and resetting the preview"); info ("Turning the pref on, then previewing the default theme, turning it off and resetting the preview");
Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true); Services.prefs.setBoolPref(PREF_DEVEDITION_THEME, true);
ok (DevEdition.styleSheet, "The devedition stylesheet is enabled."); ok (DevEdition.styleSheet, "The devedition stylesheet is enabled.");
LightweightThemeManager.previewTheme(dummyLightweightTheme("{972ce4c6-7e08-4474-a285-3208198ce6fd}")); LightweightThemeManager.previewTheme(null);
ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after the default theme is applied."); ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after the default theme is applied.");
LightweightThemeManager.resetPreview(); LightweightThemeManager.resetPreview();
ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after resetting the preview."); ok (DevEdition.styleSheet, "The devedition stylesheet is still enabled after resetting the preview.");

3
browser/components/customizableui/CustomizeMode.jsm
View File

@ -1293,7 +1293,8 @@ CustomizeMode.prototype = {
const RECENT_LWT_COUNT = 5; const RECENT_LWT_COUNT = 5;
function previewTheme(aEvent) { function previewTheme(aEvent) {
LightweightThemeManager.previewTheme(aEvent.target.theme); LightweightThemeManager.previewTheme(aEvent.target.theme.id != DEFAULT_THEME_ID ?
aEvent.target.theme : null);
} }
function resetPreview() { function resetPreview() {

3
toolkit/mozapps/extensions/LightweightThemeManager.jsm
View File

@ -142,9 +142,6 @@ this.LightweightThemeManager = {
}, },
previewTheme: function LightweightThemeManager_previewTheme(aData) { previewTheme: function LightweightThemeManager_previewTheme(aData) {
if (!aData)
return;
let cancel = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool); let cancel = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
cancel.data = false; cancel.data = false;
Services.obs.notifyObservers(cancel, "lightweight-theme-preview-requested", Services.obs.notifyObservers(cancel, "lightweight-theme-preview-requested",