From 36cf4f0560b89618e8b361a3757ecd853c0b35a3 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 31 May 2016 10:45:59 -0300 Subject: [PATCH] rm all services --- src/js/services/isChromeApp.js | 5 ---- src/js/services/isCordova.js | 3 --- src/js/services/isDevel.js | 5 ---- src/js/services/isMobile.js | 29 ----------------------- src/js/services/nodeWebkit.js | 4 ---- src/js/services/platformInfo.js | 42 +++++++++++++++++++++++++++++++++ 6 files changed, 42 insertions(+), 46 deletions(-) delete mode 100644 src/js/services/isChromeApp.js delete mode 100644 src/js/services/isCordova.js delete mode 100644 src/js/services/isDevel.js delete mode 100644 src/js/services/isMobile.js create mode 100644 src/js/services/platformInfo.js diff --git a/src/js/services/isChromeApp.js b/src/js/services/isChromeApp.js deleted file mode 100644 index 03194df33..000000000 --- a/src/js/services/isChromeApp.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -angular.module('copayApp.services').factory('isChromeApp', function(nodeWebkit) { - return !!(window.chrome && chrome.runtime && chrome.runtime.id && !nodeWebkit.isDefined()); -}); diff --git a/src/js/services/isCordova.js b/src/js/services/isCordova.js deleted file mode 100644 index 180ace923..000000000 --- a/src/js/services/isCordova.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -angular.module('copayApp.services').value('isCordova', window.cordova ? true : false); diff --git a/src/js/services/isDevel.js b/src/js/services/isDevel.js deleted file mode 100644 index f96ea53e4..000000000 --- a/src/js/services/isDevel.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -angular.module('copayApp.services').factory('isDevel', function(nodeWebkit, isChromeApp, isMobile) { - return !isMobile.any() && !isChromeApp && !nodeWebkit.isDefined(); -}); diff --git a/src/js/services/isMobile.js b/src/js/services/isMobile.js deleted file mode 100644 index 7c2a6b09d..000000000 --- a/src/js/services/isMobile.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -// Detect mobile devices -var isMobile = { - Android: function() { - return !!navigator.userAgent.match(/Android/i); - }, - BlackBerry: function() { - return !!navigator.userAgent.match(/BlackBerry/i); - }, - iOS: function() { - return /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; - }, - Opera: function() { - return !!navigator.userAgent.match(/Opera Mini/i); - }, - Windows: function() { - return !!navigator.userAgent.match(/IEMobile/i); - }, - Safari: function() { - return Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; - }, - any: function() { - return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Opera() || isMobile.Windows()); - } -}; - - -angular.module('copayApp.services').value('isMobile', isMobile); diff --git a/src/js/services/nodeWebkit.js b/src/js/services/nodeWebkit.js index 580d502eb..c1e13d84b 100644 --- a/src/js/services/nodeWebkit.js +++ b/src/js/services/nodeWebkit.js @@ -14,10 +14,6 @@ angular.module('copayApp.services').factory('nodeWebkit', function nodeWebkitFac } }; - root.isDefined = function() { - return isNodeWebkit(); - }; - root.readFromClipboard = function() { if (!isNodeWebkit()) return; var gui = require('nw.gui'); diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js new file mode 100644 index 000000000..b405c7e04 --- /dev/null +++ b/src/js/services/platformInfo.js @@ -0,0 +1,42 @@ +'use strict'; + +angular.module('copayApp.services').factory('platformInfo', function( $navigator, $window) { + + var ua= $navigator.userAgent; + + var isNodeWebkit = function() { + var isNode = (typeof process !== "undefined" && typeof require !== "undefined"); + if(isNode) { + try { + return (typeof require('nw.gui') !== "undefined"); + } catch(e) { + return false; + } + } + }; + + + // Detect mobile devices + var ret = { + isAndroid: function() { + return !!ua.match(/Android/i); + }, + isIOS: function() { + return /iPad|iPhone|iPod/.test(ua) && !$window.MSStream; + }, + isWP: function() { + return !!ua.match(/IEMobile/i); + }, + Safari: function() { + return Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; + } + }; + + ret.isMobile = ret.isAndroid() || ret.isIOS() || ret.isWP(); + ret.isChromeApp = !!($window.chrome && chrome.runtime && chrome.runtime.id && !nodeWebkit.isDefined()); + ret.isCordova = !!$window.cordova; + ret.isNW = isNodeWebkit(); + ret.isDevel =!ret.isMobile() && !ret.isChromeApp && !ret.isNW(); + + return ret; +});