From 58d9b348ea6247711c32c3630ad9b704b8e17164 Mon Sep 17 00:00:00 2001 From: Anton Kovalyov Date: Tue, 7 Jan 2014 11:24:57 -0800 Subject: [PATCH 1/4] Bug 951975 - Expose Editor.setOption and Editor.getOption. r=msucan --- browser/devtools/sourceeditor/editor.js | 13 ++++++------- .../sourceeditor/test/browser_editor_basic.js | 5 +++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/browser/devtools/sourceeditor/editor.js b/browser/devtools/sourceeditor/editor.js index d7f4c4d3d20a..20f72e1d5624 100644 --- a/browser/devtools/sourceeditor/editor.js +++ b/browser/devtools/sourceeditor/editor.js @@ -77,7 +77,9 @@ const CM_MAPPING = [ "redo", "clearHistory", "openDialog", - "refresh" + "refresh", + "getOption", + "setOption" ]; const { cssProperties, cssValues, cssColors } = getCSSKeywords(); @@ -288,8 +290,7 @@ Editor.prototype = { * See Editor.modes for the list of all suppoert modes. */ getMode: function () { - let cm = editors.get(this); - return cm.getOption("mode"); + return this.getOption("mode"); }, /** @@ -297,8 +298,7 @@ Editor.prototype = { * See Editor.modes for the list of all suppoert modes. */ setMode: function (value) { - let cm = editors.get(this); - cm.setOption("mode", value); + this.setOption("mode", value); }, /** @@ -649,8 +649,7 @@ Editor.prototype = { * True if the editor is in the read-only mode, false otherwise. */ isReadOnly: function () { - let cm = editors.get(this); - return cm.getOption("readOnly"); + return this.getOption("readOnly"); }, /** diff --git a/browser/devtools/sourceeditor/test/browser_editor_basic.js b/browser/devtools/sourceeditor/test/browser_editor_basic.js index 83c8c8e7fc05..79edb4a1db02 100644 --- a/browser/devtools/sourceeditor/test/browser_editor_basic.js +++ b/browser/devtools/sourceeditor/test/browser_editor_basic.js @@ -11,6 +11,11 @@ function test() { let src = win.document.querySelector("iframe").getAttribute("src"); ok(~src.indexOf(".CodeMirror"), "correct iframe is there"); + // getOption/setOption + ok(ed.getOption("styleActiveLine"), "getOption works"); + ed.setOption("styleActiveLine", false); + ok(!ed.getOption("styleActiveLine"), "setOption works"); + // Language modes is(ed.getMode(), Editor.modes.text, "getMode"); ed.setMode(Editor.modes.js); From 6bd00c43dd8bf81373bdbbd819bb300cfd2ea846 Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Tue, 7 Jan 2014 13:38:12 -0600 Subject: [PATCH 2/4] Bug 957160 - DevTools Themes: Use 2x icon for split console on tab bar - part 2;r=pbrosset --- .../devtools/images/command-console@2x.png | Bin 1372 -> 1369 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/themes/shared/devtools/images/command-console@2x.png b/browser/themes/shared/devtools/images/command-console@2x.png index 42ddd55ea7c5e8ca2e50792c46a2875393683753..5730a5c1748b80d832d5545848d5e9683d7e23f8 100644 GIT binary patch delta 1309 zcmV+&1>*YL3fT&fBmp3iB`ts8pCBSA)K)MQ@=&QXA}Us-6f34dBWe>x$cqn6Q(I^) zf>9q@wYeU_nsUkQ?(OdFj^Btam%G_xE;n0UoPo*hee=!l_s#cxJ3F(PLr50s0qFth z0qFth0qKGNqX%&Ppev?*00bNAWumXKqRi?kbvFyQVmZe^em|>CpzMEKMoVmG;hC0m zf*`b!)h1AOGOZ<;96jU36Tri46Ujf*xAr=RQV$$<@F^GZ{Z?MSB+XL)pabqvSpCLS8&(f0`6 zl+)E|9$j7?({u|26E4j8sbhn`jgAy~v3c}v-~Qs-HCqPWYt(;b&Hyy{@W1(8hG|b2 zRd<{Qud!ph-?Lf%grdPWtM1ES!_RO=;XDmqyL^rM=|tjOqb%q<4Zdl)`whz>Pz@Tq zAYER$uB#_`b!qVLJvh1b!6RpmLmi{R$sYffOn^t_k7st>( z%d+-pnszaWK(v2cOU6gcs*@!c??68KV9~Y*a>?XRqIrVwv{d}ns_o`|f(D5~zOGc9 z&6!N%e2~6KxrdeMvrl(V7CtKhJsDiH<;mA?>)pBe^yBMR&Y!-7)BQhBn%nl|7zmPVMNdbAt)R3@ezN^B6o(t#locgsigV>jQwM< zArCjfRJmHco24sUwm7$dvR&)Hdv4=5o@IOv$7u2}{;7w?FRh%v{QFgwoq-8JmB9)A zd@24ed@d3~@&v0du|UF-_4oICX-$0%f^Zd1>)hlM=Z&zqShz55PfMxKLfaLnx5kNb zl%*GntWtlP^(^<|5Bml_f&}=J^2d;P{=i279TWr|TXyYv;*%UWql`)I%}@p#01Ety zVY$Nyqt%cE3kps!&k_c7?^sOvt*ZMz0Nn!h4-fmhItFbA;L(vE?|JNjA-EN923xM! z#S1hUg_f2H0Be9j1(S#2?lWEN53SO4=0ZZKMRk8*um%`{X=oe9XvufUQ|T=JwXQkz zOIQQE17qI_30NjI^hhp~`XzMII)cIzo8E>sKp!MPx%kDQS4zhZ=jxh;Tn0V@=q><) z--{H*R$&piDwVn*gpm`3?g9vc1t1|+2;$q#lH*Iqi!v3pF;Bs z1{VNBsqo1h@HZD`0?-#W@D89^yAug#@F{-W0nS$nh73th^C> T$#V;A00000NkvXXu0mjfdii@| delta 1312 zcmV+*1>gGF3fu~iBmpClB`tqoHHZibwG|A7JX9);h>8^{#foXrh}uLE^5R3&)D~Jx z!Ke?d+FXxdO}XTD_jdPo$8W@zOK$d<%gsg?XJB%B-+c4?ee-?a&dzM+5RyfDKzcxW zKziVR>H%Co?uuz21i^-Sndob*DARgM-NVAISk7^fKgenmC_A6g65D@Sc&6o?BnWL} zwF#7+N^1!wN7rcaB=9iXMDkDdti8#h)B}ede9A?9zgdEX9eip+C;h`JD-e82TVQej zBfA-xCOYjlE#hC40PP~n{?YS*On~UcOsK^&0ff3UdSEgEq8Brv7Rv+>>dxqa$pnaA z%!FDj6F{gtqX#AvAbNi>6Kb(c0HN-T9+*sk=*3K^#WDeex-)uUG6A9&GocpC1Q6=Z z=z+yqCdXrFPcoUDX0wy>eArfe`tK`!$;4afI32h$J;kZ@5;#A%!Fdj02CyhQjb+kH?8=7H;$qGmSyeL zH0^Q_foQpwj1PaARVPa@-hq7d;k<44<&w#tMDqmUX{q>YRol(`1oabzd{e17n=_fj zg&=*Aat|w$=br5xFMM7CdeXmU%hPY%(YpJ+S9J(wh1@1mQZI*15$e&YNLzv2bDBo|aOdgSKl>Z;un@7)vh{ zS*0}XS?+)3i~IXNh6MPN^2d;P{=i279TWr|TXyXQ;*%UWql`)ItxyIV01EtyVY!0{ zqt%cEa|%u{&k_c7Z(B_Ht*ZM00Nn=l4-fmh+6HX};PIg!?|b5*0k{=!1zWD!#Y;39 zg_foX0BeAL1(QeN?lWEN53JI3=0ZZKMRj1X1{i;UX=oe9Xu)^MGwCe;wXQkzOIQQE z3uE6230NjI^jI#F`XzMII)cJeo8EynKo2B9x%lPbS4$_3<)-;ET- zR$&piDwVn>@ZRnyS%V09^orlIi()D=YwiXxc$=W7p`_ z19X1@Ncm?chWD1nkId9`k9#M>YYuY;pxZt;I{guV&?={dpPo<;fikT^ zO2u&=;N_>=K3!Ay0WqyY3Sf3YK)JBGJ}VZcdOG%@^t$1g;@<=7QMVSiPovp6gA0J6 zRQPlT_!|o|0q6@Gcn8p^-HwDa_>_Xauz`OWs2#S(zOC@X3me$~H)6CQ;SK)Z6c|my zZv@(4YwXGjKGjW>Y!$%bEsUe!*0bD)GECL2aVs z#H*dH$AZPREdLb`#IhaRR>Br<;p*58o<%dj4Waz}cRWD1x?wY~1V`9okoW>U@D~(K WOuTz(lNaCs0000 Date: Tue, 7 Jan 2014 12:25:22 -0800 Subject: [PATCH 3/4] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8b606885dc7e Author: punamdahiya Desc: Merge pull request #14781 from punamdahiya/Bug924170_Video_Tests Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike ======== https://hg.mozilla.org/integration/gaia-central/rev/342f8156903a Author: Punam Dahiya Desc: Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e26bfcab85e9..ce8ceea31b7e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d5d2b5614c32e17c5c3c736181a66bfa3fc5c3ef", + "revision": "8b606885dc7ebac65bb97c4128397e31e6fb5a95", "repo_path": "/integration/gaia-central" } From 3893d8d59e809042574651e8a62cc9d3310ee50f Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 7 Jan 2014 13:25:30 -0800 Subject: [PATCH 4/4] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9960daf91c38 Author: Gareth Aye Desc: Merge pull request #15077 from gaye/bug-952762 Bug 952762 - Reenable email reply tests ======== https://hg.mozilla.org/integration/gaia-central/rev/6eaeb5d63c86 Author: Gareth Aye Desc: Bug 952762 - Reenable email reply tests --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ce8ceea31b7e..1d95fbdd34f9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8b606885dc7ebac65bb97c4128397e31e6fb5a95", + "revision": "9960daf91c384990c4bbe7c1221905db7536596b", "repo_path": "/integration/gaia-central" }