tidy up a bit

.jshintrc

@@ -8,6 +8,7 @@
     "angular": false,
     "describe": false,
     "expect": false,
+    "filepicker": true,
     "format": true,
     "hyloEnv": true,
     "it": false,

src/js/app/index.js

@@ -1,3 +1,6 @@
+var connectWebViewJavascriptBridge = require('./services/webViewJavascriptBridge'),
+  isiOSApp = require('./services/isIOSApp');
+
 require('./directives');
 require('./controllers');
 
@@ -74,12 +77,8 @@ app.run(function($rootScope, $state, growl, $bodyClass, CurrentUser) {
   $rootScope.$state = $state;
   $rootScope.$bodyClass = $bodyClass;
 
-  var connectWebViewJavascriptBridge = require('./services/webviewjavascriptbridge'),
-    isiOSApp = require('./services/isiosapp');
-
   $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams, error) {
-
-    if(isiOSApp()) {    
+    if (isiOSApp()) {
       if (fromState.name === "") {
         connectWebViewJavascriptBridge(function(bridge) {
           bridge.init(function(message, responseCallback) {
@@ -95,7 +94,7 @@ app.run(function($rootScope, $state, growl, $bodyClass, CurrentUser) {
         var payload = {message: "stateChanged", toState: toState.name};
         bridge.send(JSON.stringify(payload));
       });
-    };
+    }
   });
-  
+
 });

src/js/app/services/filepickerUpload.js

@@ -1,7 +1,8 @@
 var path = require('path'),
   qs = require('querystring'),
-  isiOSApp = require('./isiosapp'),
-  connectWebViewJavascriptBridge = require('./webviewjavascriptbridge');
+  isiOSApp = require('./isIOSApp'),
+  connectToBridge = require('./webViewJavascriptBridge');
+
 // order matters, except for CONVERT, which toggles the crop UI
 var services = [
   // 'CONVERT',
@@ -14,7 +15,6 @@ var services = [
   'GOOGLE_DRIVE'
 ];
 
-
 var makeFilename = function(blob) {
   var extension = '',
     timestamp = new Date().getTime().toString();
@@ -41,17 +41,14 @@ var makeFilename = function(blob) {
  */
 module.exports = function(opts) {
 
-  var convertAndStoreImage = function(blob) {
-
-    // this function captures 'opts'
-
+  var convertAndStore = function(blob) {
     // apply additional context-specific conversion settings
     var conversion = _.extend({compress: true, quality: 90}, opts.convert);
-    
+
     // blob.url will end with "/convert?crop=..."
     // if "CONVERT" is in the list of services
     var url = blob.url + '/convert?' + qs.stringify(conversion);
-    
+
     filepicker.storeUrl(
       url,
       {
@@ -60,44 +57,29 @@ module.exports = function(opts) {
         location: 'S3',
         path: path.join(opts.path, makeFilename(blob))
       },
-      function(stored) {
-        opts.success(hyloEnv.s3.cloudfrontHost + '/' + stored.key);
-      },
+      stored => opts.success(hyloEnv.s3.cloudfrontHost + '/' + stored.key),
       opts.failure
     );
-  };    
+  };
 
   filepicker.setKey(hyloEnv.filepicker.key);
-
-  if (isiOSApp()) {
 
-    console.log("JS Reloaded");
-
-    connectWebViewJavascriptBridge(function(bridge) {
-      var payload = {message: "filepickerUpload", options: opts};
-      bridge.send(JSON.stringify(payload), function (responseData) {
+  if (isiOSApp()) {
+    var payload = JSON.stringify({message: "filepickerUpload", options: opts});
 
-        if (responseData == "")
-          return opts.failure("Cancelled");
+    connectToBridge(bridge => bridge.send(payload, resp =>
+      (resp === "" ? opts.failure("Cancelled") : convertAndStore(JSON.parse(resp)))));
 
-        convertAndStoreImage(JSON.parse(responseData));
-      });      
-    });
-
   } else {
-
     filepicker.pick(
       {
         mimetype: 'image/*',
         multple: false,
         services: services
       },
-
-      convertAndStoreImage,
-
+      convertAndStore,
       opts.failure
     );
-
-  }  
+  }
 
 };

src/js/app/services/webviewjavascriptbridge.js

@@ -1,5 +1,5 @@
-/* usage: 
- * var connectWebViewJavascriptBridge = require('webviewjavascriptbridge');
+/* usage:
+ * var connectWebViewJavascriptBridge = require('webViewJavascriptBridge');
  * connectWebViewJavascriptBridge(function(bridge) {
  *   bridge.send(...)
  * }