isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grabHelper: Clean up

Browse Source 
Remove a dummy "return;", and remove an unused parameter.
This commit is contained in:
Jasper St. Pierre 2012-08-16 13:40:20 -04:00
parent 1fd17b5027
commit 79c25d1dc8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/grabHelper.js
View File

@ -140,7 +140,7 @@ const GrabHelper = new Lang.Class({
let focus = global.stage.key_focus; let focus = global.stage.key_focus;
let hadFocus = focus && this._isWithinGrabbedActor(focus); let hadFocus = focus && this._isWithinGrabbedActor(focus);
let newFocus = hadFocus ? focus : params.actor; let newFocus = hadFocus : focus ? params.actor;
if (this.isActorGrabbed(params.actor)) if (this.isActorGrabbed(params.actor))
return; return;
@ -156,8 +156,6 @@ const GrabHelper = new Lang.Class({
this._modalCount++; this._modalCount++;
_navigateActor(newFocus, hadFocus); _navigateActor(newFocus, hadFocus);
return;
}, },
_fullGrab: function(hadFocus, modal, grabFocus) { _fullGrab: function(hadFocus, modal, grabFocus) {
@ -232,15 +230,14 @@ const GrabHelper = new Lang.Class({
// If we took away the last grab, ungrab ourselves. // If we took away the last grab, ungrab ourselves.
if (this._grabStack.length == 0) if (this._grabStack.length == 0)
this._fullUngrab(newFocus); this._fullUngrab();
if (modal) if (modal)
this._modalCount--; this._modalCount--;
return;
}, },
_fullUngrab: function(newFocus) { _fullUngrab: function() {
global.stage.disconnect(this._capturedEventId); global.stage.disconnect(this._capturedEventId);
this._capturedEventId = 0; this._capturedEventId = 0;
global.stage.disconnect(this._eventId); global.stage.disconnect(this._eventId);