fix to use images with whitespaces

Author: paoloboschini

app.js

@@ -280,11 +280,16 @@ app.post('/upload', function(req, res){
   }
 
   fs.readFile(req.files.savefile.path, function (err, data) {
-    var newPath = __dirname + '/public/uploads/' + req.files.savefile.name;
+
+    // needs to remove whitespaces (replace with _), since the
+    // file name is going to be used as an URL by the mobile
+    var filename = req.files.savefile.name.replace(/ /g,'_');
+
+    var newPath = __dirname + '/public/uploads/' + filename;
     console.log(newPath);
     fs.writeFile(newPath, data, function (err) {
       console.log(err);
-      res.send(req.files.savefile.name);
+      res.send(filename);
     });
   });
 
@@ -383,8 +388,8 @@ io.sockets.on('connection', function(socket) {
     io.sockets.in('mobile').emit('downloadResourceFromWeb', data);
   });
 
-  socket.on('resourceSaved', function(message) {
-    io.sockets.in('webapp').emit('resourceSaved', message);
+  socket.on('resourceSaved', function(message, filename) {
+    io.sockets.in('webapp').emit('resourceSaved', message, filename);
   });
 
   socket.on('getListResources', function() {

public/js/libs/main.js

@@ -208,7 +208,7 @@
     // 
     $('#resourceModalSave').click(function() {
       socket.emit('downloadResourceFromWeb', {url : $('#inputUrlResource').val(), filename : $('#inputFilenameResource').val() });
-      CodeMirror.resourceImages().push('resources/' + response);
+      LiveUtils.showFlashMessage('Downloading resource...', 10000);
     });
 
     //-------------------------------------------------------
@@ -235,18 +235,16 @@
     // 
     $('#upload').submit(function(e) {
       e.preventDefault();
+      LiveUtils.showFlashMessage('Downloading resource...');
 
       $(this).ajaxSubmit({
         success: function(response) {
           if(response.error) {
             status('Opps, something bad happened');
             return;
           }
-          // alert('file uploaded!');
           $('#downloadResourceModal').modal('hide');
           socket.emit('downloadResourceFromServer', response);
-
-          CodeMirror.resourceImages().push('resources/' + response);
         }
       });
 
@@ -258,7 +256,8 @@
     // Alert the user with the result of an attempt to save
     // a new file resurce on the device
     // 
-    socket.on('resourceSaved', function(message) {
+    socket.on('resourceSaved', function(message, filename) {
+      CodeMirror.resourceImages().push('resources/' + filename);
       LiveUtils.showFlashMessage(message);
     });
 
@@ -359,12 +358,16 @@ var LiveUtils = (function() {
   var LiveUtils = {};
 
   // When a gist file is saved, give feedback to the user
-  LiveUtils.showFlashMessage = function(message) {
+  LiveUtils.showFlashMessage = function(message, duration) {
     LiveUtils.hideLoadIndicator();
     $('#flashMessage').html(message);
-    $('#flashMessage').fadeIn(1000, function() {
-      $('#flashMessage').fadeOut(3000);
-    });
+    if(duration) {
+      $('#flashMessage').fadeIn(1000);
+    } else {
+      $('#flashMessage').fadeIn(1000, function() {
+        $('#flashMessage').fadeOut(3000);
+      });
+    }
   };
 
   // helper functions to show and hide a load indicator

public/js/libs/mobilejs.js

@@ -93,7 +93,7 @@
       'http://' + _serverip + ':5678/uploads/' + filename,
       filename
     ], function(message) {
-      socket.emit('resourceSaved', message);
+      socket.emit('resourceSaved', message, filename);
     });
   });
 
@@ -104,7 +104,7 @@
       data.url,
       data.filename
     ], function(message) {
-      socket.emit('resourceSaved', message);
+      socket.emit('resourceSaved', message, data.filename);
     });
   });
 

public/js/vendors/Color.Picker.Classic.js

@@ -230,15 +230,11 @@ Color.Picker = function (props) {
 	/// helper functions
 
 	this.update = function(color) { // accepts HEX, RGB, and HSV
-		console.log('color in update:', color);
 		if (typeof(color) === "string") {
-			console.log('string');
 			that.color = Color.Space(color, "STRING>HEX>RGB>HSV");
 		} else if (typeof(color.R) !== "undefined") {
-			console.log('color.R undefined');
 			that.color = Color.Space(color, "RGB>HSV");
 		} else if (typeof(color.H) !== "undefined") {
-			console.log('color.H undefined');
 			that.color = color;
 		}
 		///