diff --git a/css/glowingbear.css b/css/glowingbear.css index 46e4b13..71c3692 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -71,6 +71,26 @@ input#sendMessage { border: 0; width: 100%; } +.panel input { + max-width: 300px; +} +input[type=text], input[type=password] { + color: black; + border: 0; + -webkit-box-shadow: + inset 0 0 8px rgba(0,0,0,0.4), + 0 0 16px rgba(0,0,0,0.4); + -moz-box-shadow: + inset 0 0 8px rgba(0,0,0,0.4), + 0 0 16px rgba(0,0,0,0.4); + box-shadow: + inset 0 0 8px rgba(0,0,0,0.4), + 0 0 16px rgba(0,0,0,0.4); + background: rgba(255,255,255,0.5); +} +#sidebar, .panel { + background: #282828; +} #sidebar { position: fixed; width: 12%; @@ -78,8 +98,7 @@ input#sendMessage { height: 100%; min-width: 130px; overflow: auto; - background: #282828; -} + } .content { height: 100%; min-height: 100%; diff --git a/index.html b/index.html index c9a0301..0273904 100644 --- a/index.html +++ b/index.html @@ -16,6 +16,7 @@ + @@ -28,58 +29,99 @@ WeeChat web frontend -
WeeChat 0.4.2 or later is required
Oh no! We cannot connect!
-
-
- - -

Enter the hostname to the WeeChat relay

-
-
- - -

Enter the the port to the WeeChat relay

-
-
- - -

Password will be stored in your browser session

+
+
+
+

+ + Connection settings + +

-
- - -

Check the box if you want to encrypt communication between browser and WeeChat. Note: Due to a bug encryption will not work in Firefox. You must also first visit the URL https://weechathost:relayport/ to accept the certificate

+
+
+ +
+ + +

Enter the hostname to the WeeChat relay

+
+
+ + +

Enter the the port to the WeeChat relay

+
+
+ + +

Password will be stored in your browser session

+
+
+ + +

Read encryption instructions for help

+
+
+ + +

Enter number of lines to sync from WeeChat on connect

+
+ + +
+
+
+
+
+

+ + Usage instructions + +

+
+
+
+
To start using, please enable relay in your WeeChat client: + 
+          /set relay.network.password yourpassword
+          /relay add weechat 9001
+ WeeChat version 0.4.2 or higher is required.
+ The communication goes directly between your browser and your weechat in clear text. + Connection settings are saved between sessions, including password, in your own browser. +
+
+
+
+
+

+ + Encryption instructions + +

+
+
+
+ If you check the encryption box, communication between browser and WeeChat will be encrypted.
+ Note: Due to a bug encryption will not work in Firefox. You must also first visit the URL https://weechathost:relayport/ to accept the certificate

+ If you want to use encrypted session you first have to set up the relay using SSL like this: + 
+          $ mkdir -p ~/.weechat/ssl
+          $ cd ~/.weechat/ssl
+          $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
+
+ If WeeChat is already running, you can reload the certificate and private key with command: + 
+          /relay sslcertkey
+          /relay add ssl.weechat 8000
+
+
+
+
+
-
- - -

Enter number of lines to sync from WeeChat on connect

-
- - - -

Instructions

-
To start using, please enable relay in your WeeChat client: - 
-/set relay.network.password yourpassword
-/relay add weechat 9001
- Note: The communication goes directly between your browser and your weechat in clear text. - Connection settings are saved between sessions, including password, in your own browser. -

Encryption

- If you want to use encrypted session you first have to set up the relay using SSL - 
-$ mkdir -p ~/.weechat/ssl
-$ cd ~/.weechat/ssl
-$ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
-
- If WeeChat is already running, you can reload the certificate and private key with command: - 
-/relay sslcertkey
-/relay add ssl.weechat 8000
-
@@ -100,7 +142,8 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
  • - + + {{ content.shortName }}{{ content.fullName }}
    • @@ -119,7 +162,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel {{ part.text }} - {{ part.text }} +
    diff --git a/js/favico-0.3.0.min.js b/js/favico-0.3.0.min.js new file mode 100644 index 0000000..0ebcc24 --- /dev/null +++ b/js/favico-0.3.0.min.js @@ -0,0 +1,7 @@ +/** + * @license MIT + * @fileOverview Favico animations + * @author Miroslav Magda, http://blog.ejci.net + * @version 0.3.0 + */ +!function(){var t=function(t){"use strict";function e(t){if(t.paused||t.ended||g)return!1;try{s.clearRect(0,0,h,a),s.drawImage(t,0,0,h,a)}catch(o){}setTimeout(e,L.duration,t),E.setIcon(c)}function o(t){var e=/^#?([a-f\d])([a-f\d])([a-f\d])$/i;t=t.replace(e,function(t,e,o,n){return e+e+o+o+n+n});var o=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(t);return o?{r:parseInt(o[1],16),g:parseInt(o[2],16),b:parseInt(o[3],16)}:!1}function n(t,e){var o,n={};for(o in t)n[o]=t[o];for(o in e)n[o]=e[o];return n}t=t?t:{};var r,i,a,h,c,s,l,f,u,d,y,g,w,x={bgColor:"#d00",textColor:"#fff",fontFamily:"sans-serif",fontStyle:"bold",type:"circle",position:"down",animation:"slide",elementId:!1},m=[];y=function(){},f=g=!1;var p=function(){if(r=n(x,t),r.bgColor=o(r.bgColor),r.textColor=o(r.textColor),r.position=r.position.toLowerCase(),r.animation=L.types[""+r.animation]?r.animation:x.animation,"up"===r.position)for(var e=0;e0?l.height:32,h=l.width>0?l.width:32,c.height=a,c.width=h,s=c.getContext("2d"),v.ready()},w={},w.ff=/firefox/i.test(navigator.userAgent.toLowerCase()),w.chrome=/chrome/i.test(navigator.userAgent.toLowerCase()),w.opera=/opera/i.test(navigator.userAgent.toLowerCase()),w.ie=/msie/i.test(navigator.userAgent.toLowerCase())||/trident/i.test(navigator.userAgent.toLowerCase()),w.supported=w.chrome||w.ff||w.opera}catch(u){throw"Error initializing favico..."}},v={};v.ready=function(){f=!0,v.reset(),y()},v.reset=function(){m=[],u=!1,s.clearRect(0,0,h,a),s.drawImage(l,0,0,h,a),E.setIcon(c)},v.start=function(){if(f&&!d){var t=function(){u=m[0],d=!1,m.length>0&&(m.shift(),v.start())};m.length>0&&(d=!0,u?L.run(u.options,function(){L.run(m[0].options,function(){t()},!1)},!0):L.run(m[0].options,function(){t()},!1))}};var b={},C=function(t){return t.n=Math.abs(t.n),t.x=h*t.x,t.y=a*t.y,t.w=h*t.w,t.h=a*t.h,t};b.circle=function(t){t=C(t);var e=t.n>9&&t.n<100;e&&(t.x=t.x-.4*t.w,t.w=1.4*t.w),s.clearRect(0,0,h,a),s.drawImage(l,0,0,h,a),s.beginPath(),s.font=r.fontStyle+" "+Math.floor(t.h)+"px "+r.fontFamily,s.textAlign="center",e?(s.moveTo(t.x+t.w/2,t.y),s.lineTo(t.x+t.w-t.h/2,t.y),s.quadraticCurveTo(t.x+t.w,t.y,t.x+t.w,t.y+t.h/2),s.lineTo(t.x+t.w,t.y+t.h-t.h/2),s.quadraticCurveTo(t.x+t.w,t.y+t.h,t.x+t.w-t.h/2,t.y+t.h),s.lineTo(t.x+t.h/2,t.y+t.h),s.quadraticCurveTo(t.x,t.y+t.h,t.x,t.y+t.h-t.h/2),s.lineTo(t.x,t.y+t.h/2),s.quadraticCurveTo(t.x,t.y,t.x+t.h/2,t.y)):s.arc(t.x+t.w/2,t.y+t.h/2,t.h/2,0,2*Math.PI),s.fillStyle="rgba("+r.bgColor.r+","+r.bgColor.g+","+r.bgColor.b+","+t.o+")",s.fill(),s.closePath(),s.beginPath(),s.stroke(),s.fillStyle="rgba("+r.textColor.r+","+r.textColor.g+","+r.textColor.b+","+t.o+")",t.n>99?s.fillText("∞",Math.floor(t.x+t.w/2),Math.floor(t.y+t.h-.15*t.h)):s.fillText(t.n,Math.floor(t.x+t.w/2),Math.floor(t.y+t.h-.15*t.h)),s.closePath()},b.rectangle=function(t){t=C(t);var e=t.n>9&&t.n<100;e&&(t.x=Math.floor(t.x-.4*t.w),t.w=Math.floor(1.4*t.w)),s.clearRect(0,0,h,a),s.drawImage(l,0,0,h,a),s.beginPath(),s.font="bold "+Math.floor(t.h)+"px sans-serif",s.textAlign="center",s.fillStyle="rgba("+r.bgColor.r+","+r.bgColor.g+","+r.bgColor.b+","+t.o+")",s.fillRect(t.x,t.y,t.w,t.h),s.fillStyle="rgba("+r.textColor.r+","+r.textColor.g+","+r.textColor.b+","+t.o+")",t.n>99?s.fillText("∞",Math.floor(t.x+t.w/2),Math.floor(t.y+t.h-.15*t.h)):s.fillText(t.n,Math.floor(t.x+t.w/2),Math.floor(t.y+t.h-.15*t.h)),s.closePath()};var I=function(t,e){y=function(){try{if(t>0){if(L.types[""+e]&&(r.animation=e),m.push({type:"badge",options:{n:t}}),m.length>100)throw"Too many badges requests in queue...";v.start()}else v.reset()}catch(o){throw"Error setting badge..."}},f&&y()},A=function(t){y=function(){try{var e=t.width,o=t.height,n=document.createElement("img"),r=o/a>e/h?e/h:o/a;n.setAttribute("src",t.getAttribute("src")),n.height=o/r,n.width=e/r,s.clearRect(0,0,h,a),s.drawImage(n,0,0,h,a),E.setIcon(c)}catch(i){throw"Error setting image..."}},f&&y()},M=function(t){y=function(){try{if("stop"===t)return g=!0,v.reset(),g=!1,void 0;t.addEventListener("play",function(){e(this)},!1)}catch(o){throw"Error setting video..."}},f&&y()},T=function(t){if(window.URL&&window.URL.createObjectURL||(window.URL=window.URL||{},window.URL.createObjectURL=function(t){return t}),w.supported){var o=!1;navigator.getUserMedia=navigator.getUserMedia||navigator.oGetUserMedia||navigator.msGetUserMedia||navigator.mozGetUserMedia||navigator.webkitGetUserMedia,y=function(){try{if("stop"===t)return g=!0,v.reset(),g=!1,void 0;o=document.createElement("video"),o.width=h,o.height=a,navigator.getUserMedia({video:!0,audio:!1},function(t){o.src=URL.createObjectURL(t),o.play(),e(o)},function(){})}catch(n){throw"Error setting webcam..."}},f&&y()}},E={};E.getIcon=function(){var t=!1,e=function(){for(var t=document.getElementsByTagName("head")[0].getElementsByTagName("link"),e=t.length,o=e-1;o>=0;o--)if(/icon/i.test(t[o].getAttribute("rel")))return t[o];return!1};return r.elementId?(t=document.getElementById(r.elementId),t.setAttribute("href",t.getAttribute("src"))):(t=e(),t===!1&&(t=document.createElement("link"),t.setAttribute("rel","icon"),document.getElementsByTagName("head")[0].appendChild(t))),t.setAttribute("type","image/png"),t},E.setIcon=function(t){var e=t.toDataURL("image/png");if(r.elementId)document.getElementById(r.elementId).setAttribute("src",e);else if(w.ff||w.opera){var o=i;i=document.createElement("link"),w.opera&&i.setAttribute("rel","icon"),i.setAttribute("rel","icon"),i.setAttribute("type","image/png"),document.getElementsByTagName("head")[0].appendChild(i),i.setAttribute("href",e),o.parentNode&&o.parentNode.removeChild(o)}else i.setAttribute("href",e)};var L={};return L.duration=40,L.types={},L.types.fade=[{x:.4,y:.4,w:.6,h:.6,o:0},{x:.4,y:.4,w:.6,h:.6,o:.1},{x:.4,y:.4,w:.6,h:.6,o:.2},{x:.4,y:.4,w:.6,h:.6,o:.3},{x:.4,y:.4,w:.6,h:.6,o:.4},{x:.4,y:.4,w:.6,h:.6,o:.5},{x:.4,y:.4,w:.6,h:.6,o:.6},{x:.4,y:.4,w:.6,h:.6,o:.7},{x:.4,y:.4,w:.6,h:.6,o:.8},{x:.4,y:.4,w:.6,h:.6,o:.9},{x:.4,y:.4,w:.6,h:.6,o:1}],L.types.none=[{x:.4,y:.4,w:.6,h:.6,o:1}],L.types.pop=[{x:1,y:1,w:0,h:0,o:1},{x:.9,y:.9,w:.1,h:.1,o:1},{x:.8,y:.8,w:.2,h:.2,o:1},{x:.7,y:.7,w:.3,h:.3,o:1},{x:.6,y:.6,w:.4,h:.4,o:1},{x:.5,y:.5,w:.5,h:.5,o:1},{x:.4,y:.4,w:.6,h:.6,o:1}],L.types.popFade=[{x:.75,y:.75,w:0,h:0,o:0},{x:.65,y:.65,w:.1,h:.1,o:.2},{x:.6,y:.6,w:.2,h:.2,o:.4},{x:.55,y:.55,w:.3,h:.3,o:.6},{x:.5,y:.5,w:.4,h:.4,o:.8},{x:.45,y:.45,w:.5,h:.5,o:.9},{x:.4,y:.4,w:.6,h:.6,o:1}],L.types.slide=[{x:.4,y:1,w:.6,h:.6,o:1},{x:.4,y:.9,w:.6,h:.6,o:1},{x:.4,y:.9,w:.6,h:.6,o:1},{x:.4,y:.8,w:.6,h:.6,o:1},{x:.4,y:.7,w:.6,h:.6,o:1},{x:.4,y:.6,w:.6,h:.6,o:1},{x:.4,y:.5,w:.6,h:.6,o:1},{x:.4,y:.4,w:.6,h:.6,o:1}],L.run=function(t,e,o,i){var a=L.types[r.animation];return i=o===!0?"undefined"!=typeof i?i:a.length-1:"undefined"!=typeof i?i:0,e=e?e:function(){},i=0?(b[r.type](n(t,a[i])),setTimeout(function(){o?i-=1:i+=1,L.run(t,e,o,i)},L.duration),E.setIcon(c),void 0):(e(),void 0)},p(),{badge:I,video:M,image:A,webcam:T,reset:v.reset}};"undefined"!=typeof define&&define.amd?define([],function(){return t}):"undefined"!=typeof module&&module.exports?module.exports=t:this.Favico=t}(); \ No newline at end of file diff --git a/js/models.js b/js/models.js index a505b81..5afdcb2 100644 --- a/js/models.js +++ b/js/models.js @@ -16,10 +16,10 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) { var number = message['number'] var pointer = message['pointers'][0] var lines = [] - var active = false; - var notification = false; - var unread = ''; - var lastSeen = -2; + var active = false + var notification = 0 + var unread = 0 + var lastSeen = -2 /* * Adds a line to this buffer @@ -30,7 +30,7 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) { var addLine = function(line) { lines.push(line); } - + return { id: pointer, fullName: fullName, @@ -40,6 +40,8 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) { lines: lines, addLine: addLine, lastSeen: lastSeen, + unread: unread, + notification: notification, } } @@ -100,6 +102,8 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) { var BufferList = [] activeBuffer = null; + unreads = 0; + notifications = 0; this.model = { 'buffers': {} } @@ -161,11 +165,12 @@ models.service('models', ['$rootScope', 'colors', function($rootScope, colors) { } }); - activeBuffer.notification = false; activeBuffer.active = true; - activeBuffer.unread = ''; + activeBuffer.unread = 0; + activeBuffer.notification = 0; $rootScope.$emit('activeBufferChanged'); + $rootScope.$emit('notificationChanged'); } /* diff --git a/js/plugins.js b/js/plugins.js index af04f2b..a151128 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -55,31 +55,46 @@ plugins.service('plugins', ['userPlugins', '$sce', function(userPlugins, $sce) */ var contentForMessage = function(message) { - var content = []; + message.metadata = []; for (var i = 0; i < plugins.length; i++) { var nsfw = false; var visible = true; - if (message.match(nsfwRegexp)) { + if (message.text.match(nsfwRegexp)) { var nsfw = true; var visible = false; } - var pluginContent = plugins[i].contentForMessage(message); + var pluginContent = plugins[i].contentForMessage(message.text); if (pluginContent) { var pluginContent = {'visible': visible, 'content': $sce.trustAsHtml(pluginContent), 'nsfw': nsfw, 'name': plugins[i].name } - content.push(pluginContent); + message.metadata.push(pluginContent); + if (plugins[i].exclusive) { break; } } } - return content; + + /* Replace all URLs with hyperlinks */ + + var urlRegexp = RegExp(/(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])?/g); + for(k in message.content) { + var text = message.content[k].text; + var url = text.match(urlRegexp); + for(i in url) { + var u = url[i]; + text = text.replace(u, '' + u + ''); + } + message.content[k].text = $sce.trustAsHtml(text); + } + + return message; } return { @@ -124,16 +139,6 @@ plugins.factory('userPlugins', function() { }); youtubePlugin.name = 'youtube video'; - var urlPlugin = new Plugin(function(message) { - var url = message.match(urlRegexp); - if (url) { - return '' + url[0] + ''; - } - return null; - - }); - urlPlugin.name = 'url'; - var imagePlugin = new Plugin(function(message) { var url = message.match(urlRegexp); @@ -149,6 +154,6 @@ plugins.factory('userPlugins', function() { imagePlugin.name = 'image'; return { - plugins: [youtubePlugin, urlPlugin, imagePlugin] + plugins: [youtubePlugin, imagePlugin] } }); diff --git a/js/websockets.js b/js/websockets.js index 70965de..82c99cc 100644 --- a/js/websockets.js +++ b/js/websockets.js @@ -191,7 +191,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi // Only react to line if its displayed if(message.displayed) { var buffer = models.getBuffer(message.buffer); - message.metadata = plugins.PluginManager.contentForMessage(message.text); + message = plugins.PluginManager.contentForMessage(message); buffer.addLine(message); if (buffer.active) { @@ -200,16 +200,14 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi if (!initial) { if (!buffer.active && _.contains(message.tags, 'notify_message') && !_.contains(message.tags, 'notify_none')) { - if (buffer.unread == '' || buffer.unread == undefined) { - buffer.unread = 1; - }else { - buffer.unread++; - } + buffer.unread++; + $rootScope.$emit('notificationChanged'); } if(message.highlight || _.contains(message.tags, 'notify_private') ) { + buffer.notification++; $rootScope.createHighlight(buffer, message); - buffer.notification = true; + $rootScope.$emit('notificationChanged'); } } } @@ -243,18 +241,6 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi old.shortName = obj['short_name']; } - - /* - * Handle answers to (bufinfo) messages - * - * (bufinfo) messages are specified by this client. It is the first - * message that is sent to the relay after connection. - */ - var handleBufferInfo = function(message) { - // buffer info from message - } - - /* * Handle answers to (lineinfo) messages * @@ -276,7 +262,6 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi } var eventHandlers = { - bufinfo: handleBufferInfo, lineinfo: handleLineInfo, _buffer_closing: handleBufferClosing, _buffer_line_added: handleBufferLineAdded, @@ -292,7 +277,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'models', 'plugins', functi }]); -weechat.factory('connection', ['$q', '$rootScope', '$log', 'handlers', 'colors', 'models', function($q, $rootScope, $log, handlers, colors, models) { +weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers', 'colors', 'models', function($q, $rootScope, $log, storage, handlers, colors, models) { protocol = new WeeChatProtocol(); var websocket = null; @@ -329,14 +314,16 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', 'handlers', 'colors', websocket.binaryType = "arraybuffer" websocket.onopen = function (evt) { - doSend(WeeChatProtocol.formatInit({ + $log.info("Connected to relay"); + doSend(WeeChatProtocol.formatInit({ password: passwd, compression: 'off' - })); + })); doSendWithCallback(WeeChatProtocol.formatHdata({ path: 'buffer:gui_buffers(*)', keys: ['number,full_name,short_name,title'] - })).then(function(hdata) { + })).then(function(message) { + $log.info("Parsing bufinfo"); var bufferInfos = message['objects'][0]['content']; // buffers objects for (var i = 0; i < bufferInfos.length ; i++) { @@ -347,16 +334,19 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', 'handlers', 'colors', models.setActiveBuffer(buffer.id); } } - - // Request latest buffer lines for each buffer - $rootScope.getLines(); - + $rootScope.connected = true; + }).then(function() { + $log.info("Parsing lineinfo"); + doSendWithCallback(WeeChatProtocol.formatHdata({ + path: "buffer:gui_buffers(*)/own_lines/last_line(-"+storage.get('lines')+")/data", + keys: [] + })).then(function(hdata) { + handlers.handleLineInfo(hdata); + }); + }).then(function() { + doSend(WeeChatProtocol.formatSync({})); + $log.info("Synced"); }); - doSend(WeeChatProtocol.formatSync({})); - - $log.info("Connected to relay"); - $rootScope.connected = true; - $rootScope.$apply(); } websocket.onclose = function (evt) { @@ -395,18 +385,9 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', 'handlers', 'colors', })); } - var getLines = function(count) { - doSendWithCallback(WeeChatProtocol.formatHdata({ - path: "buffer:gui_buffers(*)/own_lines/last_line(-"+count+")/data", - keys: [] - })).then(function(hdata) { - handlers.handleLineInfo(hdata); - }); - } return { send: doSend, - getLines: getLines, connect: connect, sendMessage: sendMessage } @@ -428,13 +409,29 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', } } - $rootScope.$on('activeBufferChanged', function() { $rootScope.scrollToBottom(); document.getElementById('sendMessage').focus(); var ab = models.getActiveBuffer(); $rootScope.pageTitle = ab.shortName + ' | ' + ab.title; }); + $rootScope.$on('notificationChanged', function() { + var notifications = _.reduce(models.model.buffers, function(memo, num) { return (memo||0) + num.notification;}); + if (notifications > 0 ) { + $scope.favico = new Favico({ + animation:'none' + }); + $scope.favico.badge(notifications); + }else { + var unread = _.reduce(models.model.buffers, function(memo, num) { return (memo||0) + num.unread;}); + $scope.favico = new Favico({ + animation:'none', + bgColor : '#5CB85C', + textColor : '#ff0', + }); + $scope.favico.badge(unread); + } + }); $scope.buffers = models.model.buffers; $scope.activeBuffer = models.getActiveBuffer @@ -480,9 +477,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $scope.connect = function() { connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl); } - $rootScope.getLines = function() { - connection.getLines($scope.lines); - } /* Function gets called from bufferLineAdded code if user should be notified */ $rootScope.createHighlight = function(buffer, message) { @@ -510,7 +504,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', if (models.getActiveBuffer() == buffer) { return true; } - return (parseInt(buffer.unread) || 0) > 0; + return buffer.unread > 0; } return true; }; @@ -519,10 +513,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', // Find next buffer with activity and switch to it for(i in $scope.buffers) { var buffer = $scope.buffers[i]; - if(buffer.notification) { + if(buffer.notification > 0) { $scope.setActiveBuffer(buffer.id); break; - }else if((parseInt(buffer.unread) || 0) > 0) { + }else if(buffer.unread > 0) { $scope.setActiveBuffer(buffer.id); break; } @@ -560,5 +554,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', return true; } }; + }] );