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

WIP: embedded display of youtube videos

This commit is contained in:
David Cormier 2013-08-03 11:25:38 -04:00
parent 9a4bdad55d
commit 7ec5b0c926
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/websockets.js
View File

@ -99,13 +99,10 @@ weechat.factory('colors', [function($scope) {
parts: ['', 'black', 'dark gray', 'dark red', 'light red', 'dark green', 'light green', 'brown', 'yellow', 'dark blue', 'light blue', 'dark magenta', 'light magenta', 'dark cyan', 'light cyan', 'gray', 'white'] parts: ['', 'black', 'dark gray', 'dark red', 'light red', 'dark green', 'light green', 'brown', 'yellow', 'dark blue', 'light blue', 'dark magenta', 'light magenta', 'dark cyan', 'light cyan', 'gray', 'white']
} }
}]); }]);
weechat.factory('connection', ['$rootScope', 'colors', function($rootScope, colors) { weechat.factory('connection', ['$rootScope', '$http', 'colors', function($rootScope, $http, colors) {
protocol = new Protocol(); protocol = new Protocol();
var websocket = null; var websocket = null;
@ -159,9 +156,6 @@ weechat.factory('connection', ['$rootScope', 'colors', function($rootScope, colo
var parseMessage = function(message) { var parseMessage = function(message) {
if (!message['id']) { if (!message['id']) {
// should only be in case of hda objects // should only be in case of hda objects
parseObjects(message['objects']); parseObjects(message['objects']);
@ -195,14 +189,27 @@ weechat.factory('connection', ['$rootScope', 'colors', function($rootScope, colo
$rootScope.buffers = buffers; $rootScope.buffers = buffers;
} }
var findMetaData = function(message) {
if (message.indexOf('youtube.com') != -1) {
var index = message.indexOf("?v=");
var token = message.substr(index+3);
return '<iframe width="560" height="315" src="http://www.youtube.com/embed/' + token + '" frameborder="0" allowfullscreen></iframe>'
}
return null;
}
var handleBufferLineAdded = function(message) { var handleBufferLineAdded = function(message) {
var buffer_line = {}
var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']); var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']);
var text = colors.parse(message['objects'][0]['content'][0]['message']); var text = colors.parse(message['objects'][0]['content'][0]['message']);
var buffer = message['objects'][0]['content'][0]['buffer']; var buffer = message['objects'][0]['content'][0]['buffer'];
var buffer_line = _.union(prefix, text); var message = _.union(prefix, text);
console.log('BUFFER: ', $rootScope.buffers[buffer]); buffer_line['message'] = message;
buffer_line['metadata'] = findMetaData(text[0]['text']);
$rootScope.buffers[buffer]['lines'].push(buffer_line); $rootScope.buffers[buffer]['lines'].push(buffer_line);
} }

13
websockets.html
View File

@ -43,11 +43,14 @@
<a ng-click="setActiveBuffer(key)">{{ content.full_name }}</a> <a ng-click="setActiveBuffer(key)">{{ content.full_name }}</a>
</div> </div>
<div ng-repeat="bufferline in activeBuffer.lines"> <div ng-repeat="bufferline in activeBuffer.lines">
<p>
<span ng-repeat="part in bufferline" class="text"> <span ng-repeat="part in bufferline.message" class="text">
{{ part.text }} {{ part.text }}
</span> </span>
</p> <div ng-bind-html-unsafe="bufferline.metadata"></div>
<br>
</div> </div>
<form ng-submit="sendMessage()"> <form ng-submit="sendMessage()">
<input type="text" ng-model="command"></input> <input type="text" ng-model="command"></input>