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

Displays buffer names screen

This commit is contained in:
David Cormier 2013-07-30 09:01:08 -04:00
parent 6cf0e687b7
commit 33119f292d
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/websockets.js
View File

@ -125,6 +125,7 @@ weechat.factory('connection', ['$rootScope', 'colors', function($scope, colors)
websocket.onopen = function (evt) { websocket.onopen = function (evt) {
if (proto == "weechat") { if (proto == "weechat") {
doSend("init compression=off\nversion\n"); doSend("init compression=off\nversion\n");
doSend("hdata buffer:gui_buffers(*) full_name\n");
doSend("sync\n"); doSend("sync\n");
} else { } else {
doSend("PASS " + password + "\r\nNICK test\r\nUSER test 0 * :test\r\n"); doSend("PASS " + password + "\r\nNICK test\r\nUSER test 0 * :test\r\n");
@ -141,7 +142,7 @@ weechat.factory('connection', ['$rootScope', 'colors', function($scope, colors)
websocket.onmessage = function (evt) { websocket.onmessage = function (evt) {
protocol.setData(evt.data); protocol.setData(evt.data);
message = protocol.parse() message = protocol.parse()
console.log(evt); console.log(message);
$scope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type) ; $scope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type) ;
parseMessage(message); parseMessage(message);
data = evt.data; data = evt.data;
@ -157,19 +158,44 @@ weechat.factory('connection', ['$rootScope', 'colors', function($scope, colors)
} }
var parseMessage = function(message) { var parseMessage = function(message) {
console.log(message['id']);
if (message['id'] == '_buffer_line_added') { if (message['id'] == '_buffer_line_added') {
types[message['id']](message); types[message['id']](message);
} }
console.log(message);
if (!message['id']) {
// should only be in case of hda objects
parseObjects(message['objects']);
}
};
var parseObjects = function(objects) {
for (var i = 0; i < objects.length ; i++) {
console.log('type', objects[i]['type']);
if (objects[i]['type'] == 'hda') {
parseHdaObject(objects[i]);
}
}
} }
var parseHdaObject = function(hdaObject) {
console.log('parse hda', hdaObject['content'], hdaObject['content'].length);
buffers = {};
for (var i = 0; i < hdaObject['content'].length; i++) {
content = hdaObject['content'][i];
console.log('content', content);
var pointer = content['pointers'][0];
buffers[pointer] = content;
}
$scope.buffers = buffers;
}
var handleBufferLineAdded = function(message) { var handleBufferLineAdded = function(message) {
var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']); var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']);
var message = colors.parse(message['objects'][0]['content'][0]['message']); var message = colors.parse(message['objects'][0]['content'][0]['message']);
var buffer_line = _.union(prefix, message); var buffer_line = _.union(prefix, message);
@ -195,7 +221,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', 'connection', functio
$rootScope.commands = [] $rootScope.commands = []
$rootScope.buffer = [] $rootScope.buffer = []
$rootScope.buffers = {}
$scope.hostport = "localhost:9001" $scope.hostport = "localhost:9001"
$scope.proto = "weechat" $scope.proto = "weechat"
$scope.password = "" $scope.password = ""

3
websockets.html
View File

@ -38,6 +38,9 @@
</form> </form>
</div> </div>
<div ng-show="connected"> <div ng-show="connected">
<div ng-repeat="(key, content) in buffers">
{{ content.full_name }}
</div>
<div ng-repeat="bufferline in buffer"> <div ng-repeat="bufferline in buffer">
<p> <p>
<span ng-repeat="part in bufferline" class="text"> <span ng-repeat="part in bufferline" class="text">