Merge f-t to m-c
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 03 Oct 2013 20:57:45 -0700
changeset 163688 8f08240128c8ad49cefc464d68c5a91d4d83813c
parent 163685 98a1e12a86861c7bd076536a8b1290d84cabd72e (current diff)
parent 163687 ecb3dbf54f5a51a66a8cbfe78399bf7b71f1473e (diff)
child 163704 a587ed24ade0f7df16c3c915bd463c2373bd2c3e
child 163732 faa22d372e8881078b5a41f61943b81d8ac1b61c
child 163752 8211a7ddd2f01aef69e02811cc762e0e3cbf8b58
child 170387 5b6cc96b11a028ec554ccc2819335b9cacaa3e02
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone27.0a1
first release with
nightly linux32
8f08240128c8 / 27.0a1 / 20131004030203 / files
nightly linux64
8f08240128c8 / 27.0a1 / 20131004030203 / files
nightly mac
8f08240128c8 / 27.0a1 / 20131004030203 / files
nightly win32
8f08240128c8 / 27.0a1 / 20131004030203 / files
nightly win64
8f08240128c8 / 27.0a1 / 20131004030203 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge f-t to m-c
--- a/browser/devtools/debugger/debugger-view.js
+++ b/browser/devtools/debugger/debugger-view.js
@@ -729,16 +729,17 @@ ResultsPanelContainer.prototype = Herita
     // If the anchor node is not null, create a panel to attach to the anchor
     // when showing the popup.
     if (aNode) {
       if (!this._panel) {
         this._panel = document.createElement("panel");
         this._panel.className = "results-panel";
         this._panel.setAttribute("level", "top");
         this._panel.setAttribute("noautofocus", "true");
+        this._panel.setAttribute("consumeoutsideclicks", "false");
         document.documentElement.appendChild(this._panel);
       }
       if (!this.widget) {
         this.widget = new ListWidget(this._panel);
         this.widget.itemType = "vbox";
         this.widget.itemFactory = this._createItemView;
       }
     }
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -353,18 +353,19 @@
         </vbox>
       </hbox>
     </vbox>
   </vbox>
 
   <panel id="searchbox-help-panel"
          level="top"
          type="arrow"
+         position="before_start"
          noautofocus="true"
-         position="before_start">
+         consumeoutsideclicks="false">
     <vbox>
       <hbox>
         <label id="filter-label"/>
       </hbox>
       <label id="searchbox-panel-operators"
              value="&debuggerUI.searchPanelOperators;"/>
       <hbox align="center">
         <button id="global-operator-button"
@@ -400,30 +401,31 @@
                 command="variableSearchCommand"/>
         <label id="variable-operator-label"
                class="plain searchbox-panel-operator-label"/>
       </hbox>
     </vbox>
   </panel>
 
   <panel id="conditional-breakpoint-panel"
-         hidden="true"
          level="top"
          type="arrow"
-         noautofocus="true">
+         noautofocus="true"
+         consumeoutsideclicks="false">
     <vbox>
       <label id="conditional-breakpoint-panel-description"
              value="&debuggerUI.condBreakPanelTitle;"/>
       <textbox id="conditional-breakpoint-panel-textbox"/>
     </vbox>
   </panel>
 
   <panel id="resumption-order-panel"
          type="arrow"
+         position="before_start"
          noautofocus="true"
-         position="before_start">
+         consumeoutsideclicks="false">
     <hbox align="start">
       <image class="alert-icon"/>
       <label id="resumption-panel-desc" class="description"/>
     </hbox>
   </panel>
 
 </window>
--- a/browser/devtools/webconsole/hudservice.js
+++ b/browser/devtools/webconsole/hudservice.js
@@ -478,17 +478,17 @@ WebConsole.prototype = {
     let toolbox = gDevTools.getToolbox(this.target);
     if (!toolbox) {
       this.viewSource(aSourceURL, aSourceLine);
       return;
     }
 
     let showSource = ({ DebuggerView }) => {
       if (DebuggerView.Sources.containsValue(aSourceURL)) {
-        DebuggerView.setEditorLocation(aSourceURL, aSourceLine);
+        DebuggerView.setEditorLocation(aSourceURL, aSourceLine, { noDebug: true });
         return;
       }
       toolbox.selectTool("webconsole");
       this.viewSource(aSourceURL, aSourceLine);
     }
 
     // If the Debugger was already open, switch to it and try to show the
     // source immediately. Otherwise, initialize it and wait for the sources