Merge pull request #4033 from pbakondy/master

fix(): resolve trigger.io - forge.js conflict
ionic-team · Jan 20, 2016 · de4ced4 · de4ced4
2 parents 52b4360 + c51351c
commit de4ced4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/utils/platform.js b/js/utils/platform.js
@@ -154,7 +154,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 {
@@ -194,7 +194,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