From d7e1bf838d3a4177d2b7c2d6943252c8f64c6734 Mon Sep 17 00:00:00 2001 From: "Antonio M. Amaya" Date: Thu, 27 Nov 2014 01:54:00 +0100 Subject: [PATCH 01/32] Bug 1105560 - PACKAGE_UNCHANGED is not thrown inside an Error anymore. r=myk --- mobile/android/modules/WebappManager.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/modules/WebappManager.jsm b/mobile/android/modules/WebappManager.jsm index 3e4ecac1a988..84b08dcb6258 100644 --- a/mobile/android/modules/WebappManager.jsm +++ b/mobile/android/modules/WebappManager.jsm @@ -358,7 +358,7 @@ this.WebappManager = { try { yield DOMApplicationRegistry.startDownload(aData.manifestURL); - } catch (ex if ex.message == "PACKAGE_UNCHANGED") { + } catch (ex if ex == "PACKAGE_UNCHANGED") { debug("package unchanged"); // If the package is unchanged, then there's nothing more to do. return; From d1d9d271617ed1bca8b3be99cc3092989f1fc088 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Thu, 27 Nov 2014 19:06:14 +0000 Subject: [PATCH 02/32] Bug 639134 - change document color pref to tristate, r=dbaron --- layout/base/nsPresContext.cpp | 26 ++++++++++++++++--- layout/base/nsPresContext.h | 9 +++---- .../test/test_dont_use_document_colors.html | 4 +-- modules/libpref/init/all.js | 5 +++- 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index a84146192c3e..6fc9cd00cb8a 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -614,6 +614,14 @@ nsPresContext::GetDocumentColorPreferences() int32_t useAccessibilityTheme = 0; bool usePrefColors = true; bool isChromeDocShell = false; + static int32_t sDocumentColorsSetting; + static bool sDocumentColorsSettingPrefCached = false; + if (!sDocumentColorsSettingPrefCached) { + sDocumentColorsSettingPrefCached = true; + Preferences::AddIntVarCache(&sDocumentColorsSetting, + "browser.display.document_color_use", + 0); + } nsIDocument* doc = mDocument->GetDisplayDocument(); if (doc && doc->GetDocShell()) { @@ -669,9 +677,21 @@ nsPresContext::GetDocumentColorPreferences() mBackgroundColor = NS_ComposeColors(NS_RGB(0xFF, 0xFF, 0xFF), mBackgroundColor); - mUseDocumentColors = !useAccessibilityTheme && - Preferences::GetBool("browser.display.use_document_colors", - mUseDocumentColors); + + // Now deal with the pref: + // 0 = default: always, except in high contrast mode + // 1 = always + // 2 = never + if (sDocumentColorsSetting == 1) { + mUseDocumentColors = true; + } else if (sDocumentColorsSetting == 2) { + mUseDocumentColors = isChromeDocShell || mIsChromeOriginImage; + } else { + MOZ_ASSERT(!useAccessibilityTheme || + !(isChromeDocShell || mIsChromeOriginImage), + "The accessibility theme should only be on for non-chrome"); + mUseDocumentColors = !useAccessibilityTheme; + } } void diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h index ba273372fa28..eb3e29925b74 100644 --- a/layout/base/nsPresContext.h +++ b/layout/base/nsPresContext.h @@ -80,8 +80,7 @@ class ContainerLayer; // supported values for cached bool types enum nsPresContext_CachedBoolPrefType { - kPresContext_UseDocumentColors = 1, - kPresContext_UseDocumentFonts, + kPresContext_UseDocumentFonts = 1, kPresContext_UnderlineLinks }; @@ -378,8 +377,6 @@ public: switch (aPrefType) { case kPresContext_UseDocumentFonts: return mUseDocumentFonts; - case kPresContext_UseDocumentColors: - return mUseDocumentColors; case kPresContext_UnderlineLinks: return mUnderlineLinks; default: @@ -846,7 +843,9 @@ public: // Is it OK to let the page specify colors and backgrounds? bool UseDocumentColors() const { - return GetCachedBoolPref(kPresContext_UseDocumentColors) || IsChrome() || IsChromeOriginImage(); + MOZ_ASSERT(mUseDocumentColors || !(IsChrome() || IsChromeOriginImage()), + "We should never have a chrome doc or image that can't use its colors."); + return mUseDocumentColors; } // Explicitly enable and disable paint flashing. diff --git a/layout/style/test/test_dont_use_document_colors.html b/layout/style/test/test_dont_use_document_colors.html index 99fc9d6e8aaa..ea637a631db1 100644 --- a/layout/style/test/test_dont_use_document_colors.html +++ b/layout/style/test/test_dont_use_document_colors.html @@ -50,7 +50,7 @@ var cs5 = getComputedStyle(document.getElementById("five"), ""); var cs6 = getComputedStyle(document.getElementById("six"), ""); var cs7 = getComputedStyle(document.getElementById("seven"), ""); -SpecialPowers.pushPrefEnv({'set': [['browser.display.use_document_colors', true]]}, part1); +SpecialPowers.pushPrefEnv({'set': [['browser.display.document_color_use', 1]]}, part1); var transparentBackgroundColor; var inputBackgroundColor, inputColor, inputBorderTopColor; @@ -121,7 +121,7 @@ function part1() inputBorderRightColor = cs4.borderRightColor; inputBorderLeftColor = cs4.borderLeftColor; inputBorderBottomColor = cs4.borderBottomColor; - SpecialPowers.pushPrefEnv({'set': [['browser.display.use_document_colors', false]]}, part2); + SpecialPowers.pushPrefEnv({'set': [['browser.display.document_color_use', 2]]}, part2); } function part2() diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index e31d32399abc..bd13ce09b288 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -177,7 +177,10 @@ pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); pref("ui.click_hold_context_menus", false); pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always -pref("browser.display.use_document_colors", true); +// 0 = default: always, except in high contrast mode +// 1 = always +// 2 = never +pref("browser.display.document_color_use", 0); pref("browser.display.use_system_colors", false); pref("browser.display.foreground_color", "#000000"); pref("browser.display.background_color", "#FFFFFF"); From 8a9e5f2c367fc3f095c061c78d55a6135146e7fb Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Thu, 27 Nov 2014 19:12:03 +0000 Subject: [PATCH 03/32] Bug 639134 - update pref UI and internet explorer profile migration code for new tristate pref, r=jaws --- .../components/migration/IEProfileMigrator.js | 4 ++-- browser/components/preferences/colors.xul | 18 ++++++++++++------ .../chrome/browser/preferences/colors.dtd | 8 ++++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/browser/components/migration/IEProfileMigrator.js b/browser/components/migration/IEProfileMigrator.js index dcfe1b8ed393..a16cf5a6366e 100644 --- a/browser/components/migration/IEProfileMigrator.js +++ b/browser/components/migration/IEProfileMigrator.js @@ -531,8 +531,8 @@ Settings.prototype = { yesNoToBoolean); this._set("Software\\Microsoft\\Internet Explorer\\Settings", "Always Use My Colors", - "browser.display.use_document_colors", - function (v) !Boolean(v)); + "browser.display.document_color_use", + function (v) !Boolean(v) ? 0 : 2); this._set("Software\\Microsoft\\Internet Explorer\\Settings", "Always Use My Font Face", "browser.display.use_document_fonts", diff --git a/browser/components/preferences/colors.xul b/browser/components/preferences/colors.xul index 6d09f86e257b..50d8c2e50c08 100644 --- a/browser/components/preferences/colors.xul +++ b/browser/components/preferences/colors.xul @@ -28,7 +28,7 @@ helpTopic="prefs-fonts-and-colors"> - + @@ -80,10 +80,16 @@ - - - + + + + + + + + + + diff --git a/browser/locales/en-US/chrome/browser/preferences/colors.dtd b/browser/locales/en-US/chrome/browser/preferences/colors.dtd index 4063ce7c6ea8..81698ae33326 100644 --- a/browser/locales/en-US/chrome/browser/preferences/colors.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/colors.dtd @@ -6,8 +6,12 @@ - - + + + + + + From 1aa7ad563dc0e2ab8be19179117cab16b0f16f55 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Wed, 26 Nov 2014 23:13:57 +0000 Subject: [PATCH 04/32] Bug 639134 - migrate users of the old pref, r=jaws --- browser/components/nsBrowserGlue.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index d2926c8ff74a..047bcf22d827 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -1459,7 +1459,7 @@ BrowserGlue.prototype = { }, _migrateUI: function BG__migrateUI() { - const UI_VERSION = 26; + const UI_VERSION = 27; const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; let currentUIVersion = 0; try { @@ -1769,6 +1769,15 @@ BrowserGlue.prototype = { } } + if (currentUIVersion < 27) { + // Fix up document color use: + const kOldColorPref = "browser.display.use_document_colors"; + if (Services.prefs.prefHasUserValue(kOldColorPref) && + !Services.prefs.getBoolPref(kOldColorPref)) { + Services.prefs.setIntPref("browser.display.document_color_use", 2); + } + } + // Update the migration version. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, From fb99f0077097fc37c7f09ed43fa260144c0d4a0f Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Thu, 4 Dec 2014 07:42:28 -0800 Subject: [PATCH 05/32] Bug 1106538 - When deleting a room, the room is not removed from the conversation list - add a notification of the delete completing for the views to be informed. r=nperriault --- browser/components/loop/LoopRooms.jsm | 2 +- .../loop/test/xpcshell/test_looprooms.js | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/browser/components/loop/LoopRooms.jsm b/browser/components/loop/LoopRooms.jsm index 705baaa2be0c..33375ab55119 100644 --- a/browser/components/loop/LoopRooms.jsm +++ b/browser/components/loop/LoopRooms.jsm @@ -345,8 +345,8 @@ let LoopRoomsInternal = { MozLoopService.hawkRequest(this.sessionType, url, "DELETE") .then(response => { this.rooms.delete(roomToken); + eventEmitter.emit("delete", room); callback(null, room); - // We'll emit an update when the push notification is received. }, error => callback(error)).catch(error => callback(error)); }, diff --git a/browser/components/loop/test/xpcshell/test_looprooms.js b/browser/components/loop/test/xpcshell/test_looprooms.js index 627fc58017c1..14b0e24f556d 100644 --- a/browser/components/loop/test/xpcshell/test_looprooms.js +++ b/browser/components/loop/test/xpcshell/test_looprooms.js @@ -290,15 +290,6 @@ add_task(function* test_createRoom() { compareRooms(room, kCreateRoomProps); }); -// Test if deleting a room works as expected. -add_task(function* test_deleteRoom() { - let roomToken = "QzBbvGmIZWU"; - let deletedRoom = yield LoopRooms.promise("delete", roomToken); - Assert.equal(deletedRoom.roomToken, roomToken); - let rooms = yield LoopRooms.promise("getAll"); - Assert.ok(!rooms.some((room) => room.roomToken == roomToken)); -}); - // Test if opening a new room window works correctly. add_task(function* test_openRoom() { let openedUrl; @@ -403,6 +394,16 @@ add_task(function* test_roomDeleteNotifications() { yield waitForCondition(() => gExpectedDeletes.length === 0); }); +// Test if deleting a room works as expected. +add_task(function* test_deleteRoom() { + let roomToken = "QzBbvGmIZWU"; + gExpectedDeletes.push(roomToken); + let deletedRoom = yield LoopRooms.promise("delete", roomToken); + Assert.equal(deletedRoom.roomToken, roomToken); + let rooms = yield LoopRooms.promise("getAll"); + Assert.ok(!rooms.some((room) => room.roomToken == roomToken)); +}); + // Test if the event emitter implementation doesn't leak and is working as expected. add_task(function* () { Assert.strictEqual(gExpectedAdds.length, 0, "No room additions should be expected anymore"); From 3f781e6ac60886b63b66c7c0e72a12e4e8d530c7 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Tue, 25 Nov 2014 07:28:00 -0800 Subject: [PATCH 06/32] Bug 1104730 - ship bad-content-16@2x on Linux/Windows, r=jaws --HG-- rename : browser/themes/windows/bad-content-blocked-16.png => browser/themes/shared/bad-content-blocked-16.png rename : browser/themes/osx/bad-content-blocked-16@2x.png => browser/themes/shared/bad-content-blocked-16@2x.png rename : browser/themes/windows/bad-content-blocked-64.png => browser/themes/shared/bad-content-blocked-64.png rename : browser/themes/osx/bad-content-blocked-64@2x.png => browser/themes/shared/bad-content-blocked-64@2x.png rename : browser/themes/windows/bad-content-unblocked-16.png => browser/themes/shared/bad-content-unblocked-16.png rename : browser/themes/osx/bad-content-unblocked-16@2x.png => browser/themes/shared/bad-content-unblocked-16@2x.png rename : browser/themes/windows/bad-content-unblocked-64.png => browser/themes/shared/bad-content-unblocked-64.png rename : browser/themes/osx/bad-content-unblocked-64@2x.png => browser/themes/shared/bad-content-unblocked-64@2x.png --- .../themes/linux/bad-content-blocked-64.png | Bin 2063 -> 0 bytes .../themes/linux/bad-content-unblocked-16.png | Bin 520 -> 0 bytes browser/themes/linux/jar.mn | 9 +++++---- browser/themes/osx/bad-content-blocked-16.png | Bin 346 -> 0 bytes browser/themes/osx/bad-content-blocked-64.png | Bin 2063 -> 0 bytes .../themes/osx/bad-content-unblocked-16.png | Bin 520 -> 0 bytes .../themes/osx/bad-content-unblocked-64.png | Bin 3209 -> 0 bytes browser/themes/osx/jar.mn | 16 ++++++++-------- .../bad-content-blocked-16.png | Bin .../bad-content-blocked-16@2x.png | Bin .../bad-content-blocked-64.png | Bin .../bad-content-blocked-64@2x.png | Bin .../bad-content-unblocked-16.png | Bin .../bad-content-unblocked-16@2x.png | Bin .../bad-content-unblocked-64.png | Bin .../bad-content-unblocked-64@2x.png | Bin .../themes/windows/bad-content-blocked-16.png | Bin 346 -> 0 bytes .../windows/bad-content-unblocked-64.png | Bin 3209 -> 0 bytes browser/themes/windows/jar.mn | 18 ++++++++++-------- 19 files changed, 23 insertions(+), 20 deletions(-) delete mode 100644 browser/themes/linux/bad-content-blocked-64.png delete mode 100644 browser/themes/linux/bad-content-unblocked-16.png delete mode 100644 browser/themes/osx/bad-content-blocked-16.png delete mode 100644 browser/themes/osx/bad-content-blocked-64.png delete mode 100644 browser/themes/osx/bad-content-unblocked-16.png delete mode 100644 browser/themes/osx/bad-content-unblocked-64.png rename browser/themes/{linux => shared}/bad-content-blocked-16.png (100%) rename browser/themes/{osx => shared}/bad-content-blocked-16@2x.png (100%) rename browser/themes/{windows => shared}/bad-content-blocked-64.png (100%) rename browser/themes/{osx => shared}/bad-content-blocked-64@2x.png (100%) rename browser/themes/{windows => shared}/bad-content-unblocked-16.png (100%) rename browser/themes/{osx => shared}/bad-content-unblocked-16@2x.png (100%) rename browser/themes/{linux => shared}/bad-content-unblocked-64.png (100%) rename browser/themes/{osx => shared}/bad-content-unblocked-64@2x.png (100%) delete mode 100644 browser/themes/windows/bad-content-blocked-16.png delete mode 100644 browser/themes/windows/bad-content-unblocked-64.png diff --git a/browser/themes/linux/bad-content-blocked-64.png b/browser/themes/linux/bad-content-blocked-64.png deleted file mode 100644 index cac4415140767c17f9132e79e68805a959f14591..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2063 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 KMNUMnLSTaJVCyab diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 5c2ebccc2f84..cd4c54fcc895 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -49,10 +49,11 @@ browser.jar: skin/classic/browser/menuPanel-exit.png skin/classic/browser/menuPanel-help.png skin/classic/browser/menuPanel-small.png - skin/classic/browser/bad-content-blocked-16.png - skin/classic/browser/bad-content-blocked-64.png - skin/classic/browser/bad-content-unblocked-16.png - skin/classic/browser/bad-content-unblocked-64.png + skin/classic/browser/bad-content-blocked-16.png (../shared/bad-content-blocked-16.png) + skin/classic/browser/bad-content-blocked-16@2x.png (../shared/bad-content-blocked-16@2x.png) + skin/classic/browser/bad-content-blocked-64.png (../shared/bad-content-blocked-64.png) + skin/classic/browser/bad-content-unblocked-16.png (../shared/bad-content-unblocked-16.png) + skin/classic/browser/bad-content-unblocked-64.png (../shared/bad-content-unblocked-64.png) skin/classic/browser/monitor.png skin/classic/browser/monitor_16-10.png skin/classic/browser/notification-16.png diff --git a/browser/themes/osx/bad-content-blocked-16.png b/browser/themes/osx/bad-content-blocked-16.png deleted file mode 100644 index 7cf33ec4c5acc81330208f5f5ac45fa5435c3d1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmV-g0j2(lP)zIq#MmWRs+HRz~>d!yXb=?8p@Piv1z|#3!cZ2SLavaCP sJp_#sJ+n4nCS}|96c1|p-)-E=FZ@fcYF)+4`v3p{07*qoM6N<$f4smlQJe^)d>@PtV(Rv6cB+31E_$}gvY|(-FxrpKfCwNF39d)aPmj{`)ltX z_ny!FobS2k%x@`zueNCXuLH2SN0lN-@hG6a&MyP&IjL0PBwX;TpXmk&UL2M(Pa9Tn z5iDp>kW-`|c%0$~(qSBf2VvGdLs)_l%Z81{?+OVV7*NoPK!ykIo}stN0W_=kk2Ao0 zcAIe}&#?Cljsgj8W$38%8a^IxfPAjRxL8o%JD>twxG{9vT~bm#UH}iWubEZ{4jvrB zStV^QY0(FurPzq=mX{0$c7(wR6c7LuXiy_U47r`JlUGUy^aDI$IAD5!8#d<(WOxA4 z+$r<}qScuIBa7kLAn;(YYv@O%@9P1Gr1x5%6Tkq&(vH5#^_g`uTj@^p1F(?9#s@EF zbZ3xAZdgiWh!}WR{&DG@umE-~Gyd6>zy&Nd32sGk3R+0#G^iTAL+c{^Z`p@6G-z&e|YFB9I{Npl}Y*-bQquuEhQKU*^8oTTEi zeUL{t0QQc@MtdW}IOxh9G5k?WHmALNCQIk0X%U8hIV<32IP3!Ye0sfEvSL07DY86#{ibk#%e&0)eM+hf*Qza`a~v- zSDp#hw5y+DEC@ek%~67yf%Jx;2BLepUd=&NYI-;A91DOUiKf-BKz~~BRRF@>mM2hN z0Aa>YF2&qc%(U(dSkql<0@yo{f*Jt0Tbco+0_<%C`iq&SC4lP&f*SzWp{)bSM!?>5 zJw$XHkW-*0fV%;NV8GC-8NgJ)&^{IeijDI9f}u4e1CjL|ssXo+z|^EbzX8ccs|GAr zLjp+t_Z3yF98WOeO7mC%rU+^XW3GfW1zGJ}zs~>>Fy)~-$k16YN63+s7nKqV8$&Vx zH`gOu885=bSuy_Jq(Oq5t&4dApbcALNWjd9omLOWxuQ#+w{he&!g1{3O7S; zP#By03K=h-GKav_*f)>Sl>sH2(l(-&kb6YYmlRcyoB>2$)Efelp&5v}60!lCL)(Bn z4-z5oqdG}psjv-fW30&r)j)zHWCL@X_+H}604wAswpew2jQCkFs^{UsMWGwOkfB42 z^rb*pvGvp}M_V!-wgF*w zN7qxtOGr}5!g$A~U;bs&Kq?O^WCO)H5m~-9AYnpnSe?@B6GZmOr5sp$fB9eYQybcNXs|Hspqjfo4&JC|0M&bFj$5)eRt#L63CxwyfN%KL$ ztliIaZl8|9Fbu#Gdsb2}7#IxJx3~SFxOQIIOFw_$tV@2qGN6tAIcDFpm zG5e?pMN2d|m{KgKw*Gd@zfyN^Em{31bF(Y3H5@_hH=j4p(547bAY$gptm?44WSdbw z_sEXg6+A-+HmdFn?!q6-C!^p}LG}Fh4AtcerZRpa8_?Vl$(*B4?SVrF08l>bd{NcY zw3!Kbs0ZS8@fEyP9*YH=D*!N9BkUBW2X+)C$U{pi7VXDH9eu(V0Ra1wIyM|yH(>KV z+8?4-+=GK4SR-r~rUed8;D)Jv%^};H_zchu0PM5MPrkdh;ZcrZfMF0)4-_^o5D$>y zR;JfH^A1;mUO+E^4}n77<#ivd661#tL;z4DH0`;bCn~cK;S3Z&CqR+k)&6+*s*08M zkFY!gDoCGPlG1CwQz`rdH^%W#tD;-{@7I=Y+#6LVj&eekAtIu2{k~^Qgx_hykKKUg zArg;$vi$h+!9)(su)#er-g@-Jf@3&Q^aZdV;|ricBw|_hBaQ;67eX66uja9jspCa$ z0C0Z*G>9}Tswq6Z$eF|fkYKtozh-d_YS2_ffcp!eL8PGI+`==tGPB_P!ZWBTYJyt# t8$g4Yid-CkJ{i71S=uA`{r)2a(1ceAl?>-%Q-&k^?fs_Ib0-UYKHnM+F$5v)5h%dE4Daj= zj413c>I%GG?=0@n34yKMwmuV~a~TdJhy7E`=?Xj^j}-z9@EN&gBSW6C$TO|F0+-8Gg4vV8Y72o!HGGy+F`<2VxIPA$te4o#4w)*r<#;ozAA@HRcXHA(r;qCJPAl;tijt`Q~AV!(l-M6h~rx;sMRN0z&z? zM?7jQ@3-6SJ@`Ug64-#E`*1XOP>0l?W3$=1aUgXY{#yV2oWB9%;K(Lh{jW9v0000< KMNUMnLSTaJVCyab diff --git a/browser/themes/osx/bad-content-unblocked-64.png b/browser/themes/osx/bad-content-unblocked-64.png deleted file mode 100644 index 54eb9f365f75d3870858cd7d7ac3544c176a642e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3209 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 Date: Wed, 3 Dec 2014 14:59:38 -0800 Subject: [PATCH 07/32] Bug 1104921 - UITour: Add Loop panel targets. r=Unfocused --HG-- extra : rebase_source : 5463747fefe6b31f2d861065956cce1d4d138afa --- browser/components/loop/content/js/panel.js | 2 +- browser/components/loop/content/js/panel.jsx | 2 +- browser/modules/UITour.jsm | 102 ++++++++++++++----- browser/modules/test/browser_UITour_loop.js | 44 ++++++++ 4 files changed, 121 insertions(+), 29 deletions(-) diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js index 760ec4db8ce6..d34fbdacd63c 100644 --- a/browser/components/loop/content/js/panel.js +++ b/browser/components/loop/content/js/panel.js @@ -752,7 +752,7 @@ loop.panel = (function(_, mozL10n) { }, this) ), React.DOM.p(null, - React.DOM.button({className: "btn btn-info", + React.DOM.button({className: "btn btn-info new-room-button", onClick: this.handleCreateButtonClick, disabled: this._hasPendingOperation()}, mozL10n.get("rooms_new_room_button_label") diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx index 76c084b71f87..aea56f241da2 100644 --- a/browser/components/loop/content/js/panel.jsx +++ b/browser/components/loop/content/js/panel.jsx @@ -752,7 +752,7 @@ loop.panel = (function(_, mozL10n) { }, this) }

-