From 6c69d521ce46599fe06bd111219a762f139de2ee Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Tue, 24 May 2016 10:37:51 -0400
Subject: #259 - config changes

Former-commit-id: ae948135cea4c1a0a9dc12c5b737d4d75881bd92
---
 ionic.config.json  | 26 ++++++++++++++++++++++++++
 ionic.project      | 26 --------------------------
 package.json       | 12 +++++++++++-
 plugins/fetch.json | 29 ++---------------------------
 www/js/app.js      |  2 +-
 5 files changed, 40 insertions(+), 55 deletions(-)
 create mode 100644 ionic.config.json
 delete mode 100644 ionic.project

diff --git a/ionic.config.json b/ionic.config.json
new file mode 100644
index 00000000..40dc6930
--- /dev/null
+++ b/ionic.config.json
@@ -0,0 +1,26 @@
+{
+  "name": "zmNinja",
+  "app_id": "8f73ad5f",
+  "proxies": [
+    {
+      "path": "/zm",
+      "proxyUrl": "",
+      "rejectUnauthorized": false
+    }
+  ],
+  "browsers": [
+    {
+      "platform": "android",
+      "browser": "crosswalk",
+      "version": "12.41.296.5"
+    }
+  ],
+  "gulpStartupTasks": [
+    "sass",
+    "watch"
+  ],
+  "watchPatterns": [
+    "www/**/*",
+    "!www/lib/**/*"
+  ]
+}
diff --git a/ionic.project b/ionic.project
deleted file mode 100644
index 40dc6930..00000000
--- a/ionic.project
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "zmNinja",
-  "app_id": "8f73ad5f",
-  "proxies": [
-    {
-      "path": "/zm",
-      "proxyUrl": "",
-      "rejectUnauthorized": false
-    }
-  ],
-  "browsers": [
-    {
-      "platform": "android",
-      "browser": "crosswalk",
-      "version": "12.41.296.5"
-    }
-  ],
-  "gulpStartupTasks": [
-    "sass",
-    "watch"
-  ],
-  "watchPatterns": [
-    "www/**/*",
-    "!www/lib/**/*"
-  ]
-}
diff --git a/package.json b/package.json
index bd33d56b..8d384ba5 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,16 @@
   "cordovaPlatforms": [
     {},
     "ios",
-    "android"
+    "android",
+    {
+      "platform": "android",
+      "version": "",
+      "locator": "android"
+    },
+    {
+      "platform": "ios",
+      "version": "",
+      "locator": "ios"
+    }
   ]
 }
diff --git a/plugins/fetch.json b/plugins/fetch.json
index 2f64a763..0546a587 100644
--- a/plugins/fetch.json
+++ b/plugins/fetch.json
@@ -1,30 +1,5 @@
 {
-    "org.pbernasconi.progressindicator": {
-        "source": {
-            "type": "git",
-            "url": "https://github.com/pbernasconi/cordova-progressIndicator.git",
-            "subdir": "."
-        },
-        "is_top_level": true,
-        "variables": {}
-    },
-    "org.apache.cordova.file": {
-        "source": {
-            "type": "registry",
-            "id": "org.apache.cordova.file"
-        },
-        "is_top_level": false,
-        "variables": {}
-    },
-    "cordova-plugin-app-event": {
-        "source": {
-            "type": "registry",
-            "id": "cordova-plugin-app-event"
-        },
-        "is_top_level": false,
-        "variables": {}
-    },
-    "phonegap-plugin-push": {
+        "phonegap-plugin-push": {
         "source": {
             "type": "registry",
             "id": "phonegap-plugin-push"
@@ -166,4 +141,4 @@
         "is_top_level": true,
         "variables": {}
     }
-}
\ No newline at end of file
+}
diff --git a/www/js/app.js b/www/js/app.js
index 5ee6b424..373e242e 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -87,7 +87,7 @@ angular.module('zmApp', [
       link: function($scope, $element, $attrs) {
         var onMouseWheel, scrollCtrl;
         scrollCtrl = $element.controller('$ionicScroll');
-        console.log(scrollCtrl);
+        //console.log(scrollCtrl);
         if (!scrollCtrl) {
           return console.error('mouseWheelScroll must be attached to a $ionicScroll controller.');
         }
-- 
cgit v1.2.3