From 677db01d1bbc93d1e1c671835f1e17693fd10433 Mon Sep 17 00:00:00 2001 From: Alice Jenkinson Date: Sat, 18 Mar 2017 20:04:50 +1300 Subject: [PATCH] Change all references to "cordova" to "window.cordova" --- js/glowingbear.js | 6 +++--- js/notifications.js | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/js/glowingbear.js b/js/glowingbear.js index fd5a60d..0f470f6 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -241,7 +241,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $scope.notifications = notifications.unreadCount('notification'); $scope.unread = notifications.unreadCount('unread'); - if (cordova === undefined && settings.useFavico && $rootScope.favico) { + if (window.cordova === undefined && settings.useFavico && $rootScope.favico) { notifications.updateFavico(); } }); @@ -381,7 +381,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', return; } - if (cordova !== undefined) { + if (window.cordova !== undefined) { return; } @@ -398,7 +398,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', // This also fires when the page is loaded if enabled. // Note that this says MathJax but we switched to KaTeX settings.addCallback('enableMathjax', function(enabled) { - if (cordova === undefined && enabled && !$rootScope.mathjax_init) { + if (window.cordova === undefined && enabled && !$rootScope.mathjax_init) { // Load MathJax only once $rootScope.mathjax_init = true; diff --git a/js/notifications.js b/js/notifications.js index 487aed8..2779ebb 100644 --- a/js/notifications.js +++ b/js/notifications.js @@ -37,15 +37,15 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', fu document.addEventListener('deviceready', function() { // Add cordova local notification click handler - if (cordova !== null && cordova.plugins !== undefined && cordova.plugins.notification !== undefined && - cordova.plugins.notification.local !== undefined) { - cordova.plugins.notification.local.on("click", function (notification) { + if (window.cordova !== null && window.cordova.plugins !== undefined && window.cordova.plugins.notification !== undefined && + window.cordova.plugins.notification.local !== undefined) { + window.cordova.plugins.notification.local.on("click", function (notification) { // go to buffer var data = JSON.parse(notification.data); models.setActiveBuffer(data.buffer); window.focus(); // clear this notification - cordova.plugins.notification.local.clear(notification.id); + window.cordova.plugins.notification.local.clear(notification.id); }); } }); @@ -112,17 +112,17 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', fu delete notifications[this.id]; }; - } else if (cordova !== undefined && cordova.plugins !== undefined && cordova.plugins.notification !== undefined && cordova.plugins.notification.local !== undefined) { + } else if (window.cordova !== undefined && window.cordova.plugins !== undefined && window.cordova.plugins.notification !== undefined && window.cordova.plugins.notification.local !== undefined) { // Cordova local notification // Calculate notification id from buffer ID // Needs to be unique number, but we'll only ever have one per buffer var id = parseInt(buffer.id, 16); // Cancel previous notification for buffer (if there was one) - cordova.plugins.notification.local.clear(id); + window.cordova.plugins.notification.local.clear(id); // Send new notification - cordova.plugins.notification.local.schedule({ + window.cordova.plugins.notification.local.schedule({ id: id, text: body, title: title, @@ -166,7 +166,7 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', fu }; var updateFavico = function() { - if (cordova !== undefined) { + if (window.cordova !== undefined) { return; } @@ -235,7 +235,7 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', fu showNotification(buffer, title, body); - if (cordova === undefined && settings.soundnotification) { + if (window.cordova === undefined && settings.soundnotification) { // TODO fill in a sound file var audioFile = "assets/audio/sonar"; var soundHTML = '';