From 6d0e41e630c89e1fd82eab1f09cddf84e784e1ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 28 Feb 2015 21:30:57 +0100 Subject: [PATCH] Save emojify preference in settings This fixes a bug where the preference would not be saved --- index.html | 4 ++-- js/glowingbear.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 4ef87ee..ad81166 100644 --- a/index.html +++ b/index.html @@ -275,7 +275,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
+ --> @@ -434,7 +434,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
diff --git a/js/glowingbear.js b/js/glowingbear.js index 1be7dee..0bf07b7 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -35,7 +35,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', 'showtimestampSeconds': false, 'fontsize': '14px', 'fontfamily': (utils.isMobileUi() ? 'sans-serif' : 'Inconsolata, Consolas, Monaco, Ubuntu Mono, monospace'), - 'readlineBindings': false + 'readlineBindings': false, + 'enableJSEmoji': false }); $scope.settings = settings;