Backout 55adba3eb627 bug 902539 for missing review comment.

This commit is contained in:
Brandon Benvie 2013-10-15 12:09:38 -07:00
Родитель ac03d14051
Коммит 0b635b8e37
2 изменённых файлов: 3 добавлений и 19 удалений

Просмотреть файл

@ -100,26 +100,19 @@ function test() {
ok(!testScope.expanded, ok(!testScope.expanded,
"The testScope should remember it is collapsed after it is reshown."); "The testScope should remember it is collapsed after it is reshown.");
EventUtils.sendMouseEvent({ type: "mousedown", button: 1 },
testScope.target.querySelector(".title"),
aPanel.panelWin);
ok(!testScope.expanded,
"Clicking the testScope title with the right mouse button should't expand it.");
EventUtils.sendMouseEvent({ type: "mousedown" }, EventUtils.sendMouseEvent({ type: "mousedown" },
testScope.target.querySelector(".title"), testScope.target.querySelector(".title"),
aPanel.panelWin); aPanel.panelWin);
ok(testScope.expanded, ok(testScope.expanded,
"Clicking the testScope title should expand it."); "Clicking the testScope tilte should expand it.");
EventUtils.sendMouseEvent({ type: "mousedown" }, EventUtils.sendMouseEvent({ type: "mousedown" },
testScope.target.querySelector(".title"), testScope.target.querySelector(".title"),
aPanel.panelWin); aPanel.panelWin);
ok(!testScope.expanded, ok(!testScope.expanded,
"Clicking again the testScope title should collapse it."); "Clicking again the testScope tilte should collapse it.");
closeDebuggerAndFinish(aPanel); closeDebuggerAndFinish(aPanel);
}); });

Просмотреть файл

@ -1651,8 +1651,7 @@ Scope.prototype = {
* The click listener for this scope's title. * The click listener for this scope's title.
*/ */
_onClick: function(e) { _onClick: function(e) {
if (e.button != 0 || if (e.target == this._inputNode ||
e.target == this._inputNode ||
e.target == this._editNode || e.target == this._editNode ||
e.target == this._deleteNode) { e.target == this._deleteNode) {
return; return;
@ -2779,10 +2778,6 @@ Variable.prototype = Heritage.extend(Scope.prototype, {
* The click listener for the edit button. * The click listener for the edit button.
*/ */
_onEdit: function(e) { _onEdit: function(e) {
if (e.button != 0) {
return;
}
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
this._activateValueInput(); this._activateValueInput();
@ -2792,10 +2787,6 @@ Variable.prototype = Heritage.extend(Scope.prototype, {
* The click listener for the delete button. * The click listener for the delete button.
*/ */
_onDelete: function(e) { _onDelete: function(e) {
if ("button" in e && e.button != 0) {
return;
}
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();