From 8ba2b1acf6410b145be18293cf979ff1c75fa775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= <huebschle@kit.edu>
Date: Wed, 19 Apr 2017 14:55:48 +0200
Subject: [PATCH] cordova integration: small fixups

---
 js/filters.js     | 7 +++----
 js/glowingbear.js | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/js/filters.js b/js/filters.js
index 5dd3a7b..e412cd2 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -137,10 +137,9 @@ weechat.filter('DOMfilter', ['$filter', '$sce', function($filter, $sce) {
 
 weechat.filter('linksForCordova', ['$sce', function($sce) {
     return function(text) {
-        if (window.cordova !== undefined) {
-            text = text.replace(/<a (rel="[a-z ]+"\s)?(?:target="_[a-z]+"\s)?href="([^"]+)"/gi, "<a $1 onClick=\"window.open('$2', '_system')\"");
-        }
-
+        // Cordova: need to use window.open instead of href
+        // XXX TODO this needs to be improved
+        text = text.replace(/<a (rel="[a-z ]+"\s)?(?:target="_[a-z]+"\s)?href="([^"]+)"/gi, "<a $1 onClick=\"window.open('$2', '_system')\"");
         return $sce.trustAsHtml(text);
     };
 }]);
diff --git a/js/glowingbear.js b/js/glowingbear.js
index c9d8708..bc30667 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -29,7 +29,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.command = '';
     $scope.themes = ['dark', 'light', 'black', 'dark-spacious', 'blue', 'base16-default', 'base16-light', 'base16-mocha', 'base16-solarized-dark', 'base16-solarized-light'];
-    $scope.utils = utils;
 
     // Initialise all our settings, this needs to include all settings
     // or else they won't be saved to the localStorage.
@@ -821,7 +820,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
                 $scope.disconnect();
             }
 
-            if (cordova !== undefined) {
+            if (window.cordova !== undefined) {
                 $scope.favico.reset();
             }
         }