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

modalDialog: Fix invalid argument 'timestamp' for pushModal

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=722752
This commit is contained in:
Heiher 2014-01-22 10:39:52 +08:00 committed by Florian Müllner
parent c039a3ddda
commit a23b293fe2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/modalDialog.js
View File

@ -259,7 +259,7 @@ const ModalDialog = new Lang.Class({
if (this.state == State.OPENED || this.state == State.OPENING) if (this.state == State.OPENED || this.state == State.OPENING)
return true; return true;
if (!this.pushModal({ timestamp: timestamp })) if (!this.pushModal(timestamp))
return false; return false;
this._fadeOpen(onPrimary); this._fadeOpen(onPrimary);
@ -318,8 +318,11 @@ const ModalDialog = new Lang.Class({
pushModal: function (timestamp) { pushModal: function (timestamp) {
if (this._hasModal) if (this._hasModal)
return true; return true;
if (!Main.pushModal(this._group, { timestamp: timestamp,
actionMode: this._actionMode })) let params = { actionMode: this._actionMode };
if (timestamp)
params['timestamp'] = timestamp;
if (!Main.pushModal(this._group, params))
return false; return false;
this._hasModal = true; this._hasModal = true;