[polari/wip/fmuellner/misc-cleanups: 8/12] chatroomManager: Simplify actions code a bit
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari/wip/fmuellner/misc-cleanups: 8/12] chatroomManager: Simplify actions code a bit
- Date: Sun, 7 Aug 2016 01:51:23 +0000 (UTC)
commit f93d0a5690c52c991daa1876f0cd49a3fd625101
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Jul 30 17:57:56 2016 +0200
chatroomManager: Simplify actions code a bit
Save some code repetition by iterating over an array of ActionEntry-like
objects to look up actions and connect to their ::activate signal.
https://bugzilla.gnome.org/show_bug.cgi?id=769582
src/chatroomManager.js | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/chatroomManager.js b/src/chatroomManager.js
index 24201d1..1269027 100644
--- a/src/chatroomManager.js
+++ b/src/chatroomManager.js
@@ -165,23 +165,23 @@ const _ChatroomManager = new Lang.Class({
},
_onPrepared: function(mon, am) {
- let joinAction = this._app.lookup_action('join-room');
- joinAction.connect('activate', Lang.bind(this, this._onJoinActivated));
-
- let queryAction = this._app.lookup_action('message-user');
- queryAction.connect('activate', Lang.bind(this, this._onQueryActivated));
-
- let leaveAction = this._app.lookup_action('leave-room');
- leaveAction.connect('activate', Lang.bind(this, this._onLeaveActivated));
-
- let connectAction = this._app.lookup_action('connect-account');
- connectAction.connect('activate', Lang.bind(this, this._onConnectAccountActivated));
-
- let reconnectAction = this._app.lookup_action('reconnect-account');
- reconnectAction.connect('activate', Lang.bind(this, this._onReconnectAccountActivated));
-
- let authAction = this._app.lookup_action('authenticate-account');
- authAction.connect('activate', Lang.bind(this, this._onAuthenticateAccountActivated));
+ let actions = [
+ { name: 'join-room',
+ handler: Lang.bind(this, this._onJoinActivated) },
+ { name: 'message-user',
+ handler: Lang.bind(this, this._onQueryActivated) },
+ { name: 'leave-room',
+ handler: Lang.bind(this, this._onLeaveActivated) },
+ { name: 'connect-account',
+ handler: Lang.bind(this, this._onConnectAccountActivated) },
+ { name: 'reconnect-account',
+ handler: Lang.bind(this, this._onReconnectAccountActivated) },
+ { name: 'authenticate-account',
+ handler: Lang.bind(this, this._onAuthenticateAccountActivated) },
+ ];
+ actions.forEach(a => {
+ this._app.lookup_action(a.name).connect('activate', a.handler);
+ });
this._client = new Client(am, this);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]