[gnome-shell] cleanup: Use arrow functions for tweener callbacks
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] cleanup: Use arrow functions for tweener callbacks
- Date: Tue, 2 Jul 2019 12:24:39 +0000 (UTC)
commit 8fcd6c715307e15f1afefd652eb4d26da8fd8cfb
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Jun 29 17:37:59 2019 +0200
cleanup: Use arrow functions for tweener callbacks
While it is legal to use method syntax for the function properties
here, arrow notation is less unexpected and allows us to drop the
separate scope properties.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/608
js/gdm/authPrompt.js | 3 +--
js/gdm/loginDialog.js | 16 ++++++----------
js/ui/dnd.js | 5 ++---
js/ui/messageList.js | 3 +--
js/ui/panel.js | 8 +++-----
js/ui/pointerA11yTimeout.js | 6 ++----
js/ui/popupMenu.js | 12 ++++--------
js/ui/ripples.js | 4 ++--
js/ui/screenShield.js | 15 ++++++---------
js/ui/workspaceSwitcherPopup.js | 3 +--
js/ui/workspaceThumbnail.js | 5 ++---
11 files changed, 30 insertions(+), 50 deletions(-)
---
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index d4cc9f06d..48135e920 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -295,8 +295,7 @@ var AuthPrompt = class {
time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
transition: 'linear',
- onCompleteScope: this,
- onComplete() {
+ onComplete: () => {
if (wasSpinner) {
if (this._spinner)
this._spinner.stop();
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 7f3c7ed97..94cd3460a 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -913,7 +913,7 @@ var LoginDialog = GObject.registerClass({
{ opacity: 255,
time: _FADE_ANIMATION_TIME,
transition: 'easeOutQuad',
- onUpdate() {
+ onUpdate: () => {
let children = Main.layoutManager.uiGroup.get_children();
for (let i = 0; i < children.length; i++) {
@@ -921,12 +921,10 @@ var LoginDialog = GObject.registerClass({
children[i].opacity = this.opacity;
}
},
- onUpdateScope: this,
- onComplete() {
+ onComplete: () => {
if (this._authPrompt.verificationStatus !=
AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
this._authPrompt.reset();
- },
- onCompleteScope: this });
+ } });
}
_gotGreeterSessionProxy(proxy) {
@@ -943,7 +941,7 @@ var LoginDialog = GObject.registerClass({
{ opacity: 0,
time: _FADE_ANIMATION_TIME,
transition: 'easeOutQuad',
- onUpdate() {
+ onUpdate: () => {
let children = Main.layoutManager.uiGroup.get_children();
for (let i = 0; i < children.length; i++) {
@@ -951,11 +949,9 @@ var LoginDialog = GObject.registerClass({
children[i].opacity = this.opacity;
}
},
- onUpdateScope: this,
- onComplete() {
+ onComplete: () => {
this._greeter.call_start_session_when_ready_sync(serviceName, true, null);
- },
- onCompleteScope: this });
+ } });
}
_onSessionOpened(client, serviceName) {
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index e53de0b44..b5e4d1a5a 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -434,14 +434,13 @@ var _Draggable = class _Draggable {
scale_y: scale * origScale,
time: SCALE_ANIMATION_TIME,
transition: 'easeOutQuad',
- onUpdate() {
+ onUpdate: () => {
let currentScale = this._dragActor.scale_x / origScale;
this._dragOffsetX = currentScale * origDragOffsetX;
this._dragOffsetY = currentScale * origDragOffsetY;
this._dragActor.set_position(this._dragX + this._dragOffsetX,
this._dragY + this._dragOffsetY);
- },
- onUpdateScope: this });
+ } });
}
}
}
diff --git a/js/ui/messageList.js b/js/ui/messageList.js
index 34a11066e..3aaf73f67 100644
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -469,8 +469,7 @@ var Message = class Message {
{ scale_y: 0,
time: MessageTray.ANIMATION_TIME,
transition: 'easeOutQuad',
- onCompleteScope: this,
- onComplete() {
+ onComplete: () => {
this._actionBin.hide();
this.expanded = false;
} });
diff --git a/js/ui/panel.js b/js/ui/panel.js
index ed25959ad..cf8b64fe4 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -283,10 +283,9 @@ var AppMenuButton = GObject.registerClass({
{ opacity: 0,
time: Overview.ANIMATION_TIME,
transition: 'easeOutQuad',
- onComplete() {
+ onComplete: () => {
this.hide();
- },
- onCompleteScope: this });
+ } });
}
_onStyleChanged(actor) {
@@ -328,8 +327,7 @@ var AppMenuButton = GObject.registerClass({
{ opacity: 0,
time: SPINNER_ANIMATION_TIME,
transition: "easeOutQuad",
- onCompleteScope: this,
- onComplete() {
+ onComplete: () => {
this._spinner.stop();
this._spinner.actor.opacity = 255;
this._spinner.actor.hide();
diff --git a/js/ui/pointerA11yTimeout.js b/js/ui/pointerA11yTimeout.js
index 617555eb7..a293a4043 100644
--- a/js/ui/pointerA11yTimeout.js
+++ b/js/ui/pointerA11yTimeout.js
@@ -66,10 +66,8 @@ class PieTimer extends St.DrawingArea {
{ opacity: 255,
time: duration / 1000,
transition: 'easeOutQuad',
- onUpdateScope: this,
- onUpdate() { this.queue_repaint(); },
- onCompleteScope: this,
- onComplete() { this.stop(); }
+ onUpdate: () => this.queue_repaint(),
+ onComplete: () => this.stop()
});
}
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 1d3be68ba..fd410b0fd 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1015,12 +1015,10 @@ var PopupSubMenu = class extends PopupMenuBase {
{ _arrowRotation: targetAngle,
height: naturalHeight,
time: 0.25,
- onUpdateScope: this,
- onUpdate() {
+ onUpdate: () => {
this._arrow.rotation_angle_z = this.actor._arrowRotation;
},
- onCompleteScope: this,
- onComplete() {
+ onComplete: () => {
this.actor.set_height(-1);
}
});
@@ -1048,12 +1046,10 @@ var PopupSubMenu = class extends PopupMenuBase {
{ _arrowRotation: 0,
height: 0,
time: 0.25,
- onUpdateScope: this,
- onUpdate() {
+ onUpdate: () => {
this._arrow.rotation_angle_z = this.actor._arrowRotation;
},
- onCompleteScope: this,
- onComplete() {
+ onComplete: () => {
this.actor.hide();
this.actor.set_height(-1);
},
diff --git a/js/ui/ripples.js b/js/ui/ripples.js
index 58e3fa13d..d478b05a9 100644
--- a/js/ui/ripples.js
+++ b/js/ui/ripples.js
@@ -56,8 +56,8 @@ var Ripples = class Ripples {
delay: delay,
time: time,
transition: 'linear',
- onUpdate() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
- onComplete() { ripple.visible = false; } });
+ onUpdate: () => ripple.opacity = 255 * Math.sqrt(ripple._opacity),
+ onComplete: () => ripple.visible = false });
}
addTo(stage) {
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index e80e0316d..d407f4f42 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -255,11 +255,10 @@ var NotificationsBox = class {
{ height: natHeight,
transition: 'easeOutQuad',
time: 0.25,
- onComplete() {
+ onComplete: () => {
this._scrollView.vscrollbar_policy = St.PolicyType.AUTOMATIC;
widget.set_height(-1);
- },
- onCompleteScope: this
+ }
});
this._updateVisibility();
@@ -791,11 +790,10 @@ var ScreenShield = class {
{ y: 0,
time: time,
transition: 'easeInQuad',
- onComplete() {
+ onComplete: () => {
this._lockScreenGroup.fixed_position_set = false;
this._lockScreenState = MessageTray.State.SHOWN;
- },
- onCompleteScope: this,
+ }
});
this._maybeCancelDialog();
@@ -1008,11 +1006,10 @@ var ScreenShield = class {
{ y: 0,
time: MANUAL_FADE_TIME,
transition: 'easeOutQuad',
- onComplete() {
+ onComplete: () => {
this._lockScreenShown({ fadeToBlack: fadeToBlack,
animateFade: true });
- },
- onCompleteScope: this
+ }
});
} else {
this._lockScreenGroup.fixed_position_set = false;
diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index 6052ef289..44fab23fb 100644
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -161,8 +161,7 @@ class WorkspaceSwitcherPopup extends St.Widget {
Tweener.addTween(this._container, { opacity: 0.0,
time: ANIMATION_TIME,
transition: 'easeOutQuad',
- onComplete() { this.destroy(); },
- onCompleteScope: this
+ onComplete: () => this.destroy()
});
return GLib.SOURCE_REMOVE;
}
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 8d23518f4..43fe96363 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -1318,11 +1318,10 @@ class ThumbnailsBox extends St.Widget {
{ indicatorY: thumbnail.actor.allocation.y1,
time: WorkspacesView.WORKSPACE_SWITCH_TIME,
transition: 'easeOutQuad',
- onComplete() {
+ onComplete: () => {
this._animatingIndicator = false;
this._queueUpdateStates();
- },
- onCompleteScope: this
+ }
});
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
