scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-10 17:03:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Minor refactoring.

Browse source
This commit is contained in:
Matej Zrimšek 2016-08-31 17:52:45 +02:00
parent 828eebeb16
commit 4fdf478426
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/assets/javascripts/direct-upload.js
View file

@ -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) {

22
app/assets/javascripts/sitewide/utils.js
View file

@ -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();
});
}