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

background: Rename animationUpdate to updateAnimation

Browse Source 
This is more consistent.

https://bugzilla.gnome.org/show_bug.cgi?id=695882
This commit is contained in:
Jasper St. Pierre 2013-03-14 17:00:57 -04:00
parent eeea8559b6
commit b351536dee
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/background.js
View File

@ -267,9 +267,9 @@ const Background = new Lang.Class({
_destroy: function() { _destroy: function() {
this._cancellable.cancel(); this._cancellable.cancel();
if (this._animationUpdateTimeoutId) { if (this._updateAnimationTimeoutId) {
GLib.source_remove (this._animationUpdateTimeoutId); GLib.source_remove (this._updateAnimationTimeoutId);
this._animationUpdateTimeoutId = 0 this._updateAnimationTimeoutId = 0;
} }
let i; let i;
@ -378,17 +378,17 @@ const Background = new Lang.Class({
if (this._images[1]) if (this._images[1])
this._images[1].opacity = this._animation.transitionProgress * 255; this._images[1].opacity = this._animation.transitionProgress * 255;
this._queueAnimationUpdate(); this._queueUpdateAnimation();
}, },
_updateAnimation: function() { _updateAnimation: function() {
this._animationUpdateTimeoutId = 0; this._updateAnimationTimeoutId = 0;
let files = this._animation.getKeyFrameFiles(this._layoutManager.monitors[this._monitorIndex]); let files = this._animation.getKeyFrameFiles(this._layoutManager.monitors[this._monitorIndex]);
if (!files) { if (!files) {
this._setLoaded(); this._setLoaded();
this._queueAnimationUpdate(); this._queueUpdateAnimation();
return; return;
} }
@ -432,8 +432,8 @@ const Background = new Lang.Class({
} }
}, },
_queueAnimationUpdate: function() { _queueUpdateAnimation: function() {
if (this._animationUpdateTimeoutId != 0) if (this._updateAnimationTimeoutId != 0)
return; return;
if (!this._cancellable || this._cancellable.is_cancelled()) if (!this._cancellable || this._cancellable.is_cancelled())
@ -447,10 +447,10 @@ const Background = new Lang.Class({
let interval = Math.max(ANIMATION_MIN_WAKEUP_INTERVAL * 1000, let interval = Math.max(ANIMATION_MIN_WAKEUP_INTERVAL * 1000,
timePerStep); timePerStep);
this._animationUpdateTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
interval, interval,
Lang.bind(this, function() { Lang.bind(this, function() {
this._animationUpdateTimeoutId = 0; this._updateAnimationTimeoutId = 0;
this._updateAnimation(); this._updateAnimation();
return false; return false;
})); }));