[polari] chatView: Use new _channel property instead of _room.channel
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] chatView: Use new _channel property instead of _room.channel
- Date: Tue, 15 Apr 2014 16:06:47 +0000 (UTC)
commit b4364b2cf682a81bcb0bf51694f97f65de973de3
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Apr 14 19:46:21 2014 +0200
chatView: Use new _channel property instead of _room.channel
Now that we have it, save a couple of keystrokes ...
src/chatView.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/chatView.js b/src/chatView.js
index b1b058e..2a02f90 100644
--- a/src/chatView.js
+++ b/src/chatView.js
@@ -248,7 +248,7 @@ const ChatView = new Lang.Class({
_onDestroy: function() {
for (let i = 0; i < this._channelSignals.length; i++)
- this._room.channel.disconnect(this._channelSignals[i]);
+ this._channel.disconnect(this._channelSignals[i]);
this._channelSignals = [];
for (let i = 0; i < this._roomSignals.length; i++)
@@ -442,12 +442,12 @@ const ChatView = new Lang.Class({
},
_checkMessages: function() {
- if (!this._active || !this._toplevelFocus || !this._room.channel)
+ if (!this._active || !this._toplevelFocus || !this._channel)
return;
this._needsIndicator = true;
- let pending = this._room.channel.dup_pending_messages();
+ let pending = this._channel.dup_pending_messages();
if (pending.length == 0)
return;
@@ -457,13 +457,13 @@ const ChatView = new Lang.Class({
let [id,] = pending[i].get_pending_message_id();
let mark = this._pending[id];
if (!mark) {
- this._room.channel.ack_message_async(pending[i], null);
+ this._channel.ack_message_async(pending[i], null);
continue;
}
let iter = buffer.get_iter_at_mark(mark);
let iterRect = this._view.get_iter_location(iter);
if (rect.y <= iterRect.y && rect.y + rect.height > iterRect.y)
- this._room.channel.ack_message_async(pending[i], null);
+ this._channel.ack_message_async(pending[i], null);
}
},
@@ -492,10 +492,10 @@ const ChatView = new Lang.Class({
handler: Lang.bind(this, this._pendingMessageRemoved) }
];
channelSignals.forEach(Lang.bind(this, function(signal) {
- this._channelSignals.push(this._room.channel.connect(signal.name, signal.handler));
+ this._channelSignals.push(this._channel.connect(signal.name, signal.handler));
}));
- this._room.channel.dup_pending_messages().forEach(Lang.bind(this,
+ this._channel.dup_pending_messages().forEach(Lang.bind(this,
function(message) {
this._insertTpMessage(this._room, message);
}));
@@ -660,7 +660,7 @@ const ChatView = new Lang.Class({
let buffer = this._view.get_buffer();
if (!valid /* outgoing */ ||
(this._active && this._toplevelFocus && this._nPending == 0)) {
- this._room.channel.ack_message_async(tpMessage, null);
+ this._channel.ack_message_async(tpMessage, null);
} else if (message.shouldHighlight || this._needsIndicator) {
let iter = buffer.get_end_iter();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]