diff options
| -rw-r--r-- | ionic.project | 2 | ||||
| -rw-r--r-- | package.json | 10 | ||||
| -rw-r--r-- | plugins/fetch.json | 8 | ||||
| -rw-r--r-- | www/js/ModalCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 4 |
5 files changed, 7 insertions, 21 deletions
diff --git a/ionic.project b/ionic.project index b1e6799d..0c79b120 100644 --- a/ionic.project +++ b/ionic.project @@ -12,7 +12,7 @@ { "platform": "android", "browser": "crosswalk", - "version": "14.42.334.0" + "version": "15.44.384.9" } ], "gulpStartupTasks": [ diff --git a/package.json b/package.json index cdae17b5..39b9b145 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,7 @@ { "locator": "https://github.com/pliablepixels/cordova-plugin-media.git", "id": "org.apache.cordova.media" - }, - "cordova-plugin-crosswalk-webview" + } ], "cordovaPlatforms": [ "ios", @@ -82,11 +81,6 @@ "version": "", "locator": "ios" }, - "android", - { - "platform": "android", - "version": "", - "locator": "android" - } + "android" ] } diff --git a/plugins/fetch.json b/plugins/fetch.json index 421ac12e..0195ecba 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -206,13 +206,5 @@ }, "is_top_level": true, "variables": {} - }, - "cordova-plugin-crosswalk-webview": { - "source": { - "type": "registry", - "id": "cordova-plugin-crosswalk-webview" - }, - "is_top_level": true, - "variables": {} } }
\ No newline at end of file diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index aafaa355..1c2333af 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -315,8 +315,8 @@ $scope.togglePresets = function() $scope.isBackground = function() { - console.log ("Is background called from ModalCtrl and returned " + - ZMDataModel.isBackground()); + // console.log ("Is background called from ModalCtrl and returned " + + // ZMDataModel.isBackground()); return ZMDataModel.isBackground(); }; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 1cf9efd9..98305eb1 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -300,8 +300,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $scope.isBackground = function() { - console.log ("Is background called from Montage and returned " + - ZMDataModel.isBackground()); + //console.log ("Is background called from Montage and returned " + + //ZMDataModel.isBackground()); return ZMDataModel.isBackground(); }; |