Merge branch 'master' into gh-pages

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "glowing-bear",
   "description": "A webclient for WeeChat",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "homepage": "https://github.com/glowing-bear/glowing-bear",
   "license": "GPLv3",
   "private": true,

index.html

@@ -290,7 +290,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
           </li>
         </ul>
       </div>
-      <div id="nicklist" ng-if="showNicklist" ng-swipe-right="swipeRight()" ng-swipe-disable-mouse class="vertical-line-left">
+      <div id="nicklist" ng-if="showNicklist" ng-swipe-right="swipeRight()" ng-swipe-disable-mouse class="favorite-font vertical-line-left">
         <ul class="nicklistgroup list-unstyled" ng-repeat="group in nicklist">
           <li ng-repeat="nick in group.nicks|orderBy:'name'">
             <a ng-click="openBuffer(nick.name)"><span ng-class="::nick.prefixClasses" ng-bind="::nick.prefix"></span><span ng-class="::nick.nameClasses" ng-bind="::nick.name"></span></a>
@@ -344,7 +344,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" ng-click="closeModal($event)" aria-hidden="true">&times;</button>
-            <span class="pull-right version">Glowing Bear version 0.7.0</span>
+            <span class="pull-right version">Glowing Bear version 0.8.0</span>
             <h4 class="modal-title">Settings</h4>
             <p>Settings will be stored in your browser.</p>
           </div>
@@ -522,7 +522,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
           <div class="modal-header">
             <button type="button" class="close" ng-click="closeModal($event)" aria-hidden="true">&times;</button>
             <h4 class="modal-title">Channel topic {{ activeBuffer().shortName || activeBuffer().fullName }}</h4>
-            <p ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank':{rel:'noopener noreferrer'} | DOMfilter:'irclinky')"></p>
+            <span ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank':{rel:'noopener noreferrer'} | DOMfilter:'irclinky')"></span>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-primary" ng-click="closeModal($event)">Close</button>

js/connection.js

@@ -4,10 +4,11 @@
 var weechat = angular.module('weechat');
 
 weechat.factory('connection',
-                ['$rootScope', '$log', 'handlers', 'models', 'ngWebsockets', function($rootScope,
+                ['$rootScope', '$log', 'handlers', 'models', 'settings', 'ngWebsockets', function($rootScope,
          $log,
          handlers,
          models,
+         settings,
          ngWebsockets) {
 
     var protocol = new weeChat.Protocol();
@@ -194,17 +195,19 @@ weechat.factory('connection',
                         handlers.handleHotlistInfo(hotlist);
 
                     });
-                    // Schedule hotlist syncing every so often so that this
-                    // client will have unread counts (mostly) in sync with
-                    // other clients or terminal usage directly.
-                    setInterval(function() {
-                        if ($rootScope.connected) {
-                            _requestHotlist().then(function(hotlist) {
-                                handlers.handleHotlistInfo(hotlist);
-
-                            });
-                        }
-                    }, 60000); // Sync hotlist every 60 second
+                    if (settings.hotlistsync) {
+                        // Schedule hotlist syncing every so often so that this
+                        // client will have unread counts (mostly) in sync with
+                        // other clients or terminal usage directly.
+                        setInterval(function() {
+                            if ($rootScope.connected) {
+                                _requestHotlist().then(function(hotlist) {
+                                    handlers.handleHotlistInfo(hotlist);
+
+                                });
+                            }
+                        }, 60000); // Sync hotlist every 60 second
+                    }
 
 
                     // Fetch weechat time format for displaying timestamps

js/glowingbear.js

@@ -520,7 +520,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         // the messages in this buffer before you switched to the new one
         // this is only needed with new type of clearing since in the old
         // way WeeChat itself takes care of that part
-        if (models.version[0] >= 1) {
+        if (settings.hotlistsync && models.version[0] >= 1) {
             connection.sendHotlistClear();
         }
 
@@ -791,6 +791,13 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
             return true;
         }
         $scope.showNicklist = true;
+        // hack: retrigger the favorite-font update mechanism when showing the
+        // nicklist because the div is ng-if=showNicklist instead of ng-show for
+        // performance reasons (especially on mobile)
+        $timeout(function() {
+            utils.changeClassStyle('favorite-font', 'fontFamily', settings.fontfamily);
+            utils.changeClassStyle('favorite-font', 'fontSize', settings.fontsize);
+        }, 0);
         return true;
     };
 

js/inputbar.js

@@ -200,7 +200,7 @@ weechat.directive('inputBar', function() {
                 }
 
                 // New style clearing requires this, old does not
-                if (models.version[0] >= 1) {
+                if (settings.hotlistsync && models.version[0] >= 1) {
                     connection.sendHotlistClear();
                 }
 

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Glowing Bear",
   "description": "WeeChat Web frontend",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "manifest_version": 2,
   "icons": {
     "32": "assets/img/favicon.png",

manifest.webapp

@@ -25,5 +25,5 @@
       "desktop-notification":{}
   },
   "default_locale": "en",
-  "version": "0.7.0"
+  "version": "0.8.0"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "glowing-bear",
   "private": true,
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "A web client for Weechat",
   "repository": "https://github.com/glowing-bear/glowing-bear",
   "main": "electron-main.js",
@@ -34,9 +34,9 @@
     "protractor": "protractor test/protractor-conf.js",
     "premake-local": "bower install --dev",
     "make-local": "make -f electron.makefile uselocal",
-    "build-electron-windows": "make -f electron.makefile build-electron-windows",
-    "build-electron-darwin": "make -f electron.makefile build-electron-darwin",
-    "build-electron-linux": "make -f electron.makefile build-electron-linux",
+    "build-electron-windows": "make -f electron.makefile bower build-electron-windows",
+    "build-electron-darwin": "make -f electron.makefile bower build-electron-darwin",
+    "build-electron-linux": "make -f electron.makefile bower build-electron-linux",
     "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
   }
 }