From c51351c779dc345cd8fef1a55a2f27d5f864b5f0 Mon Sep 17 00:00:00 2001 From: Peter Bakondy Date: Fri, 3 Jul 2015 12:17:14 +0200 Subject: [PATCH] Resolve trigger.io - forge.js conflict Fix for issue #3903 --- js/utils/platform.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/utils/platform.js b/js/utils/platform.js index d26b968c0be..35bae21f4af 100644 --- a/js/utils/platform.js +++ b/js/utils/platform.js @@ -152,7 +152,7 @@ self.platforms.push('webview'); if (!(!window.cordova && !window.PhoneGap && !window.phonegap)) { self.platforms.push('cordova'); - } else if (window.forge) { + } else if (typeof window.forge === 'object') { self.platforms.push('trigger'); } } else { @@ -192,7 +192,7 @@ * @returns {boolean} Check if we are running within a WebView (such as Cordova). */ isWebView: function() { - return !(!window.cordova && !window.PhoneGap && !window.phonegap && !window.forge); + return !(!window.cordova && !window.PhoneGap && !window.phonegap && window.forge !== 'object'); }, /** * @ngdoc method