Bug 947143 - Replaced debugger resumption order panel with an easier to maintain Tooltip.js instance; r=vporof

This commit is contained in:
Alexey Novak 2014-01-09 10:11:54 +02:00
parent b63f8189b5
commit 81ef53dfec
4 changed files with 6 additions and 25 deletions

View File

@ -31,11 +31,12 @@ ToolbarView.prototype = {
dumpn("Initializing the ToolbarView"); dumpn("Initializing the ToolbarView");
this._instrumentsPaneToggleButton = document.getElementById("instruments-pane-toggle"); this._instrumentsPaneToggleButton = document.getElementById("instruments-pane-toggle");
this._resumeOrderPanel = document.getElementById("resumption-order-panel");
this._resumeButton = document.getElementById("resume"); this._resumeButton = document.getElementById("resume");
this._stepOverButton = document.getElementById("step-over"); this._stepOverButton = document.getElementById("step-over");
this._stepInButton = document.getElementById("step-in"); this._stepInButton = document.getElementById("step-in");
this._stepOutButton = document.getElementById("step-out"); this._stepOutButton = document.getElementById("step-out");
this._resumeOrderTooltip = new Tooltip(document);
this._resumeOrderTooltip.defaultPosition = TOOLBAR_ORDER_POPUP_POSITION;
let resumeKey = ShortcutUtils.prettifyShortcut(document.getElementById("resumeKey")); let resumeKey = ShortcutUtils.prettifyShortcut(document.getElementById("resumeKey"));
let stepOverKey = ShortcutUtils.prettifyShortcut(document.getElementById("stepOverKey")); let stepOverKey = ShortcutUtils.prettifyShortcut(document.getElementById("stepOverKey"));
@ -80,10 +81,8 @@ ToolbarView.prototype = {
*/ */
showResumeWarning: function(aPausedUrl) { showResumeWarning: function(aPausedUrl) {
let label = L10N.getFormatStr("resumptionOrderPanelTitle", aPausedUrl); let label = L10N.getFormatStr("resumptionOrderPanelTitle", aPausedUrl);
let descriptionNode = document.getElementById("resumption-panel-desc"); this._resumeOrderTooltip.setTextContent([label]);
descriptionNode.setAttribute("value", label); this._resumeOrderTooltip.show(this._resumeButton);
this._resumeOrderPanel.openPopup(this._resumeButton);
}, },
/** /**
@ -163,11 +162,11 @@ ToolbarView.prototype = {
}, },
_instrumentsPaneToggleButton: null, _instrumentsPaneToggleButton: null,
_resumeOrderPanel: null,
_resumeButton: null, _resumeButton: null,
_stepOverButton: null, _stepOverButton: null,
_stepInButton: null, _stepInButton: null,
_stepOutButton: null, _stepOutButton: null,
_resumeOrderTooltip: null,
_resumeTooltip: "", _resumeTooltip: "",
_pauseTooltip: "", _pauseTooltip: "",
_stepOverTooltip: "", _stepOverTooltip: "",

View File

@ -28,6 +28,7 @@ const SEARCH_LINE_FLAG = ":";
const SEARCH_VARIABLE_FLAG = "*"; const SEARCH_VARIABLE_FLAG = "*";
const EDITOR_VARIABLE_HOVER_DELAY = 350; // ms const EDITOR_VARIABLE_HOVER_DELAY = 350; // ms
const EDITOR_VARIABLE_POPUP_POSITION = "topcenter bottomleft"; const EDITOR_VARIABLE_POPUP_POSITION = "topcenter bottomleft";
const TOOLBAR_ORDER_POPUP_POSITION = "topcenter bottomleft";
/** /**
* Object defining the debugger view components. * Object defining the debugger view components.

View File

@ -513,15 +513,4 @@
</vbox> </vbox>
</panel> </panel>
<panel id="resumption-order-panel"
type="arrow"
position="before_start"
noautofocus="true"
consumeoutsideclicks="false">
<hbox align="start">
<image class="alert-icon"/>
<label id="resumption-panel-desc" class="description"/>
</hbox>
</panel>
</window> </window>

View File

@ -511,14 +511,6 @@
padding: 0 !important; padding: 0 !important;
} }
#resumption-panel-desc {
width: 200px;
}
#resumption-order-panel {
-moz-margin-start: -8px;
}
#resume { #resume {
list-style-image: url(debugger-pause.png); list-style-image: url(debugger-pause.png);
-moz-image-region: rect(0px,16px,16px,0px); -moz-image-region: rect(0px,16px,16px,0px);