Merge f-t to m-c

This commit is contained in:
Phil Ringnalda 2013-10-03 20:57:45 -07:00
commit 87e9e3fea1
3 changed files with 8 additions and 5 deletions

View File

@ -734,6 +734,7 @@ ResultsPanelContainer.prototype = Heritage.extend(WidgetMethods, {
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) {

View File

@ -358,8 +358,9 @@
<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"/>
@ -405,10 +406,10 @@
</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;"/>
@ -418,8 +419,9 @@
<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"/>

View File

@ -483,7 +483,7 @@ WebConsole.prototype = {
let showSource = ({ DebuggerView }) => {
if (DebuggerView.Sources.containsValue(aSourceURL)) {
DebuggerView.setEditorLocation(aSourceURL, aSourceLine);
DebuggerView.setEditorLocation(aSourceURL, aSourceLine, { noDebug: true });
return;
}
toolbox.selectTool("webconsole");