From 6665eac870925973bffd704355b09fec824f8085 Mon Sep 17 00:00:00 2001 From: Andres Olave Date: Thu, 4 Dec 2014 09:01:44 +0200 Subject: [PATCH 1/2] Add support for trigger.io --- js/utils/platform.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/utils/platform.js b/js/utils/platform.js index 94f3110ca22..4776da591d0 100644 --- a/js/utils/platform.js +++ b/js/utils/platform.js @@ -115,7 +115,11 @@ if (this.isWebView()) { this.platforms.push('webview'); - this.platforms.push('cordova'); + if(!(!window.cordova && !window.PhoneGap && !window.phonegap)) { + this.platforms.push('cordova'); + } else if(!!window.forge) { + this.platforms.push('trigger'); + } } else { this.platforms.push('browser'); } @@ -153,7 +157,7 @@ * @returns {boolean} Check if we are running within a WebView (such as Cordova). */ isWebView: function() { - return !(!window.cordova && !window.PhoneGap && !window.phonegap); + return !(!window.cordova && !window.PhoneGap && !window.phonegap && !window.forge); }, /** * @ngdoc method From 4a4afb85cec6a80b924fcf8feb168c1726422e71 Mon Sep 17 00:00:00 2001 From: Andres Olave Date: Thu, 12 Mar 2015 17:12:37 +0200 Subject: [PATCH 2/2] correction to trigger.io merge --- js/utils/platform.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/utils/platform.js b/js/utils/platform.js index dbc0cce45a7..8d6d0303ac8 100644 --- a/js/utils/platform.js +++ b/js/utils/platform.js @@ -148,7 +148,7 @@ self.platforms = []; var grade = 'a'; - if (this.isWebView()) { + if (self.isWebView()) { self.platforms.push('webview'); if(!(!window.cordova && !window.PhoneGap && !window.phonegap)) { self.platforms.push('cordova');