masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New buffers are always active

This commit is contained in:
David Cormier 2013-12-14 12:53:35 -05:00
parent ae3a9f7044
commit f85b7110da
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/websockets.js
View File

@ -63,11 +63,7 @@ weechat.factory('handlers', ['$rootScope', 'models', 'plugins', function($rootSc
var bufferMessage = message['objects'][0]['content'][0]; var bufferMessage = message['objects'][0]['content'][0];
var buffer = new models.Buffer(bufferMessage); var buffer = new models.Buffer(bufferMessage);
models.addBuffer(buffer); models.addBuffer(buffer);
if ($rootScope.waitForQueryWindow === buffer.fullName) { models.setActiveBuffer(buffer.id);
// We're waiting for a query window
models.setActiveBuffer(buffer.id);
$rootScope.waitForQueryWindow = "";
}
} }
var handleBufferTitleChanged = function(message) { var handleBufferTitleChanged = function(message) {
@ -554,7 +550,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
buffName = buffName.substring(0, buffName.lastIndexOf('.')) + '.' + nick; buffName = buffName.substring(0, buffName.lastIndexOf('.')) + '.' + nick;
if (!$scope.setActiveBuffer(buffName, 'fullName')) { if (!$scope.setActiveBuffer(buffName, 'fullName')) {
$rootScope.waitForQueryWindow = buffName;
connection.sendMessage('/query ' + nick); connection.sendMessage('/query ' + nick);
} }
} }