Merge pull request #54 from shankari/release_v_10

Release v 10

bower.json

@@ -2,23 +2,21 @@
   "name": "emission",
   "private": "true",
   "devDependencies": {
-    "ionic": "driftyco/ionic-bower#1.2.4",
+    "ionic": "driftyco/ionic-bower#1.3.1",
     "ionic-toast": "^0.2.0",
     "ngCordova": "^0.1.24-alpha",
     "moment": "^2.11.2",
     "moment-timezone": "^0.5.0",
     "leaflet": "^0.7.7",
     "ui-leaflet": "^1.0.0",
-    "nvd3": "^1.8.2",
     "Leaflet.awesome-markers": "^2.0.2",
     "ionic-datepicker": "^0.9.0"
   },
   "resolutions": {
-    "nvd3": "^1.8.2",
-    "d3": "^3.4.4",
-    "angular": "1.4.3"
+    "angular": "1.5.3",
+    "angular-animate": "1.5.3",
+    "angular-sanitize": "1.5.3"
   },
   "dependencies": {
-    "angularjs-nvd3-directives": "^0.0.7"
   }
 }

config.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="edu.berkeley.eecs.emission" 
-        version="0.0.9" 
-        android-versionCode="9"
-        ios-CFBundleVersion="9"
+        version="0.0.10" 
+        android-versionCode="10"
+        ios-CFBundleVersion="10"
         xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>emission</name>
   <description>

package.json

@@ -62,7 +62,6 @@
       "id": "edu.berkeley.eecs.emission.cordova.datacollection"
     },
     "cordova-plugin-app-version",
-    "cordova-plugin-crosswalk-webview",
     "cordova-plugin-file",
     {
       "locator": "https://github.com/shankari/cordova-plugin-email-composer.git",
@@ -71,6 +70,13 @@
     {
       "locator": "https://github.com/e-mission/cordova-server-sync.git",
       "id": "edu.berkeley.eecs.emission.cordova.serversync"
+    },
+    {
+      "variables": {
+        "XWALK_MODE": "lite"
+      },
+      "locator": "cordova-plugin-crosswalk-webview",
+      "id": "cordova-plugin-crosswalk-webview"
     }
   ],
   "cordovaPlatforms": [

www/index.html

@@ -15,7 +15,6 @@
     <link href="css/main.recent.css" rel="stylesheet">
     <link href="css/main.diary.css" rel="stylesheet">
     <link href="lib/leaflet/dist/leaflet.css" rel="stylesheet">
-    <link href="lib/nvd3/build/nv.d3.css" rel="stylesheet">
     <link href="lib/Leaflet.awesome-markers/dist/leaflet.awesome-markers.css" rel="stylesheet">
     <!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
     <link href="css/ionic.app.css" rel="stylesheet">
@@ -32,10 +31,7 @@
     <script src="manual_lib/leaflet/dist/leaflet-src.js"></script>
     <script src="lib/angular-simple-logger/dist/angular-simple-logger.js"></script>
     <script src="manual_lib/ui-leaflet/dist/ui-leaflet.js"></script>
-    <script src="lib/d3/d3.js"></script>
-    <script src="lib/nvd3/build/nv.d3.js"></script>
     <!-- Made a copy to deal with proper directives -->
-    <script src="manual_lib/angularjs-nvd3-directives/dist/angularjs-nvd3-directives.js"></script>
     <script src="lib/Leaflet.awesome-markers/dist/leaflet.awesome-markers.js"></script>
     <script src="lib/ionic-datepicker/dist/ionic-datepicker.bundle.min.js"></script>
     <script src="non-bower-lib/simple-leaflet-plugins/leaflet-heat.js"></script>

www/js/common.js

@@ -1,4 +1,4 @@
-angular.module('emission.main.common',['ui-leaflet', 'nvd3ChartDirectives',
+angular.module('emission.main.common',['ui-leaflet',
                                       'ionic-datepicker',
                                       'emission.main.common.services',
                                       'emission.services'])

www/js/diary/detail.js

@@ -1,5 +1,5 @@
 'use strict';
-angular.module('emission.main.diary.detail',['ui-leaflet', 'nvd3ChartDirectives',
+angular.module('emission.main.diary.detail',['ui-leaflet',
                                       'ionic-datepicker',
                                       'emission.services'])
 

www/js/diary/list.js

@@ -1,4 +1,4 @@
-angular.module('emission.main.diary.list',['ui-leaflet', 'nvd3ChartDirectives',
+angular.module('emission.main.diary.list',['ui-leaflet',
                                       'ionic-datepicker',
                                       'emission.main.common.services',
                                       'emission.services'])

www/js/main.js

@@ -322,7 +322,7 @@ angular.module('emission.main', ['emission.main.recent', 'emission.main.diary',
         }
     };
 
-    $scope.saveAndReloadCollectSettingsPopover = function() {
+    $scope.saveAndReloadCollectionSettingsPopover = function() {
         console.log("new config = "+$scope.settings.collect.new_config);
         window.cordova.plugins.BEMDataCollection.setConfig($scope.settings.collect.new_config)
             .then($scope.getCollectionSettings);
@@ -469,4 +469,4 @@ angular.module('emission.main', ['emission.main.recent', 'emission.main.diary',
     $scope.collectionExpanded = function() {
         return $scope.expanded;
     }
-});
+});