From 4fdf478426ea648742027990c6a35b8be9c9eee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= <mzrimsek@biosistemika.com>
Date: Wed, 31 Aug 2016 17:52:45 +0200
Subject: [PATCH] Minor refactoring.

---
 app/assets/javascripts/direct-upload.js  | 26 +++++++++++++-----------
 app/assets/javascripts/sitewide/utils.js | 22 ++++++++++----------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/direct-upload.js b/app/assets/javascripts/direct-upload.js
index 0ba5000a3..739c41301 100644
--- a/app/assets/javascripts/direct-upload.js
+++ b/app/assets/javascripts/direct-upload.js
@@ -17,8 +17,8 @@
   function generateThumbnail(origFile, type, max_width, max_height, cb) {
     var fileRequest = $.Deferred();
     var img = new Image;
-    var canvas = document.createElement("canvas");
-    var ctx = canvas.getContext("2d");
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
     // todo allow for different x/y ratio
     canvas.width = max_width;
     canvas.height = max_height;
@@ -35,8 +35,8 @@
         size = this.width;
         offsetY = (this.height - this.width) / 2;
       }
-      if (type === "image/jpeg") {
-        type = "image/jpg";
+      if (type === 'image/jpeg') {
+        type = 'image/jpg';
       }
 
       ctx.drawImage(this, offsetX, offsetY, size, size, 0, 0,
@@ -59,7 +59,7 @@
    */
   function fetchUploadSignature(ev, fileInput, file, signUrl) {
     var formData = new FormData();
-    formData.append("file", file);
+    formData.append('file', file);
 
     return $.ajax({
       url: signUrl,
@@ -68,13 +68,14 @@
       processData: false,
       contentType: false,
       error: function (xhr) {
+        var errMsg;
         try {
           // File error
           var jsonData = $.parseJSON(xhr.responseText);
-          var errMsg = jsonToValuesArray(jsonData.errors);
+          errMsg = jsonToValuesArray(jsonData.errors);
         } catch(err) {
           // Connection error
-          var errMsg = I18n.t('general.file.upload_failure');
+          errMsg = I18n.t('general.file.upload_failure');
         }
         renderFormError(ev, fileInput, errMsg);
       }
@@ -91,7 +92,7 @@
     for (var k in fields) {
       formData.append(k, fields[k]);
     }
-    formData.append("file", postData.file, postData.fileName);
+    formData.append('file', postData.file, postData.fileName);
 
     return $.ajax({
       url: url,
@@ -100,13 +101,14 @@
       processData: false,
       contentType: false,
       error: function (xhr) {
+        var errMsg;
         try {
           // File error
           var $xmlData = $(xhr.responseText);
-          var errMsg = $xmlData.find("Message").text().strToErrorFormat();
+          errMsg = $xmlData.find('Message').text().strToErrorFormat();
         } catch(err) {
           // Connection error
-          var errMsg = I18n.t('general.file.upload_failure');
+          errMsg = I18n.t('general.file.upload_failure');
         }
         renderFormError(ev, fileInput, errMsg);
       }
@@ -176,10 +178,10 @@
     if (typeof willPageRefresh === 'undefined') {
       willPageRefresh = false;
     }
-    $form = $(ev.target.form);
+    var $form = $(ev.target.form);
     $form.clearFormErrors();
     $form.removeBlankFileForms();
-    $fileInputs = $form.find("input[type=file]");
+    var $fileInputs = $form.find('input[type=file]');
     var signRequests = [];
 
     if ($fileInputs.length) {
diff --git a/app/assets/javascripts/sitewide/utils.js b/app/assets/javascripts/sitewide/utils.js
index 4fd3b1cf9..79f7cb06d 100644
--- a/app/assets/javascripts/sitewide/utils.js
+++ b/app/assets/javascripts/sitewide/utils.js
@@ -2,12 +2,12 @@
  * Converts JSON data received from the server to flat array of values.
  */
 function jsonToValuesArray(jsonData) {
-  errMsgs =[];
+  var errMsgs = [];
   for (var key in jsonData) {
   	var values = jsonData[key];
-		$.each(values, function(idx, val) {
-		  errMsgs.push(val);
-		});
+    $.each(values, function (idx, val) {
+      errMsgs.push(val);
+	});
   }
   return errMsgs;
 }
@@ -17,11 +17,11 @@ function jsonToValuesArray(jsonData) {
  * work!)
  */
 $.fn.onAjaxComplete = function (cb) {
-	$(this)
-	.on("ajax:success", function() {
-	  cb();
-	})
-	.on("ajax:error", function() {
-	  cb();
-	});
+  $(this)
+  .on('ajax:success', function () {
+	cb();
+  })
+  .on('ajax:error', function () {
+	cb();
+  });
 }