Gitlab CSE Unil

Commit 3649613d authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'master' into dev

parents e9796135 08f7bc0a
...@@ -86,7 +86,7 @@ function($){ ...@@ -86,7 +86,7 @@ function($){
dropZone: params.dropZone, dropZone: params.dropZone,
autoUpload: params.autoUpload, autoUpload: params.autoUpload,
done: function (e, data) { done: function (e, data) {
if ($fileuploadElem.fileupload('active') === 1 && if ($(e.target).fileupload('active') === 1 &&
!data.result.error && data.result.next) { !data.result.error && data.result.next) {
document.location.assign(data.result.next); document.location.assign(data.result.next);
} }
......
...@@ -27371,7 +27371,7 @@ function($){ ...@@ -27371,7 +27371,7 @@ function($){
dropZone: params.dropZone, dropZone: params.dropZone,
autoUpload: params.autoUpload, autoUpload: params.autoUpload,
done: function (e, data) { done: function (e, data) {
if ($fileuploadElem.fileupload('active') === 1 && if ($(e.target).fileupload('active') === 1 &&
!data.result.error && data.result.next) { !data.result.error && data.result.next) {
document.location.assign(data.result.next); document.location.assign(data.result.next);
} }
...@@ -27371,7 +27371,7 @@ function($){ ...@@ -27371,7 +27371,7 @@ function($){
dropZone: params.dropZone, dropZone: params.dropZone,
autoUpload: params.autoUpload, autoUpload: params.autoUpload,
done: function (e, data) { done: function (e, data) {
if ($fileuploadElem.fileupload('active') === 1 && if ($(e.target).fileupload('active') === 1 &&
!data.result.error && data.result.next) { !data.result.error && data.result.next) {
document.location.assign(data.result.next); document.location.assign(data.result.next);
} }
...@@ -17798,7 +17798,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { ...@@ -17798,7 +17798,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
})); }));
   
/*! AdIm - v0.0.0 - 2015-11-12 - Copyright (C) 2015 Université de Lausanne - see licence */ /*! AdIm - v0.0.0 - 2015-11-12 - Copyright (C) 2015 Université de Lausanne - see licence */
define('helper/fileUploader',["jquery","jquery.fileupload","jquery.iframe-transport","jquery.fileupload-proc"],function(a){function b(b){b=a.extend(!0,{elem:"#fileupload",progBar:".progress-bar",alertBox:".adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:2*Math.pow(2,20),dropZone:a(document),onStart:null,processstart:null,autoUpload:!0,sequentialUploads:!1,add:null},b),a(function(){function c(a){a.preventDefault()}var d=a(b.elem),e=a(b.progBar),f=a(b.alertBox);d.fileupload({dataType:"json",dropZone:b.dropZone,autoUpload:b.autoUpload,done:function(a,b){1===d.fileupload("active")&&!b.result.error&&b.result.next&&document.location.assign(b.result.next)},processstart:function(){"function"==typeof b.processstart&&b.processstart(b)},start:function(){f.find("[class^=adim-fu-error-]").addClass("hide").end().addClass("hide"),e.closest(".progress-wrapper").removeClass("hide"),a("#fileupload").fileupload("disable"),a(document).on("drop dragover",c),"function"==typeof b.onStart&&b.onStart(b)},progressall:function(a,b){var c=parseInt(b.loaded/b.total*100,10),d=c+"%";e.text(d).css("width",d)},processQueue:[{action:"validate",always:!0,acceptFileTypes:b.acceptFileTypes,maxFileSize:b.maxFileSize}],processfail:function(b,d){var e=d.files[d.index].error;f.find("[class^=adim-fu-error-]").addClass("hide"),f.removeClass("hide").find(".adim-fu-error-"+e).removeClass("hide"),a(document).off("drop dragover",c),a("#fileupload").fileupload("enable")}}),"function"==typeof b.add&&d.fileupload("option","add",b.add)})}return a.widget("blueimp.fileupload",a.blueimp.fileupload,{processActions:{validate:function(b,c){if(c.disabled)return b;var d=a.Deferred(),e=b.files[b.index];return c.acceptFileTypes.test(e.type)?e.size>c.maxFileSize?(b.files[b.index].error="maxFileSize",d.rejectWith(this,b)):d.resolveWith(this,b):(b.files[b.index].error="acceptFileTypes",d.rejectWith(this,b)),d.promise()}}}),{initialize:b,init:b}}); define('helper/fileUploader',["jquery","jquery.fileupload","jquery.iframe-transport","jquery.fileupload-proc"],function(a){function b(b){b=a.extend(!0,{elem:"#fileupload",progBar:".progress-bar",alertBox:".adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:2*Math.pow(2,20),dropZone:a(document),onStart:null,processstart:null,autoUpload:!0,sequentialUploads:!1,add:null},b),a(function(){function c(a){a.preventDefault()}var d=a(b.elem),e=a(b.progBar),f=a(b.alertBox);d.fileupload({dataType:"json",dropZone:b.dropZone,autoUpload:b.autoUpload,done:function(b,c){1===a(b.target).fileupload("active")&&!c.result.error&&c.result.next&&document.location.assign(c.result.next)},processstart:function(){"function"==typeof b.processstart&&b.processstart(b)},start:function(){f.find("[class^=adim-fu-error-]").addClass("hide").end().addClass("hide"),e.closest(".progress-wrapper").removeClass("hide"),a("#fileupload").fileupload("disable"),a(document).on("drop dragover",c),"function"==typeof b.onStart&&b.onStart(b)},progressall:function(a,b){var c=parseInt(b.loaded/b.total*100,10),d=c+"%";e.text(d).css("width",d)},processQueue:[{action:"validate",always:!0,acceptFileTypes:b.acceptFileTypes,maxFileSize:b.maxFileSize}],processfail:function(b,d){var e=d.files[d.index].error;f.find("[class^=adim-fu-error-]").addClass("hide"),f.removeClass("hide").find(".adim-fu-error-"+e).removeClass("hide"),a(document).off("drop dragover",c),a("#fileupload").fileupload("enable")}}),"function"==typeof b.add&&d.fileupload("option","add",b.add)})}return a.widget("blueimp.fileupload",a.blueimp.fileupload,{processActions:{validate:function(b,c){if(c.disabled)return b;var d=a.Deferred(),e=b.files[b.index];return c.acceptFileTypes.test(e.type)?e.size>c.maxFileSize?(b.files[b.index].error="maxFileSize",d.rejectWith(this,b)):d.resolveWith(this,b):(b.files[b.index].error="acceptFileTypes",d.rejectWith(this,b)),d.promise()}}}),{initialize:b,init:b}});
/*! AdIm - v0.0.0 - 2015-11-12 - Copyright (C) 2015 Université de Lausanne - see licence */ /*! AdIm - v0.0.0 - 2015-11-12 - Copyright (C) 2015 Université de Lausanne - see licence */
define('adim/main-newao',["jquery","paper","signals","adim/config","adim/view","adim/io","adim/attributes","adim/ui","helper/theme","helper/fileUploader"],function(a,b,c,d,e,f,g,h,i,j){a(function(){return i.updateTheme(),e.init("my-canvas")?(h.init({ro:!0,locked:!0}),h.adjustCanvasToImage(1),a("#page-loader").fadeOut(100),j.init({elem:"#fileupload",progBar:".adim-fu-status .progress-bar",alertBox:".adim-fu-status .adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:d.uploadMaxFileSize,dropZone:a(document)}),void j.init({elem:"#fileupload-alt",progBar:"#adim-fu-alt-status .progress-bar",alertBox:"#adim-fu-alt-status .adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:d.uploadMaxFileSize,dropZone:null,processstart:function(){a("#adim-fu-alt-status").modal("show")}})):void(console&&console.error&&console.error("View not initialized. Abort."))})}); define('adim/main-newao',["jquery","paper","signals","adim/config","adim/view","adim/io","adim/attributes","adim/ui","helper/theme","helper/fileUploader"],function(a,b,c,d,e,f,g,h,i,j){a(function(){return i.updateTheme(),e.init("my-canvas")?(h.init({ro:!0,locked:!0}),h.adjustCanvasToImage(1),a("#page-loader").fadeOut(100),j.init({elem:"#fileupload",progBar:".adim-fu-status .progress-bar",alertBox:".adim-fu-status .adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:d.uploadMaxFileSize,dropZone:a(document)}),void j.init({elem:"#fileupload-alt",progBar:"#adim-fu-alt-status .progress-bar",alertBox:"#adim-fu-alt-status .adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:d.uploadMaxFileSize,dropZone:null,processstart:function(){a("#adim-fu-alt-status").modal("show")}})):void(console&&console.error&&console.error("View not initialized. Abort."))})});
/** /**
......
...@@ -17798,7 +17798,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { ...@@ -17798,7 +17798,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
})); }));
   
/*! AdIm - v0.0.0 - 2015-11-12 - Copyright (C) 2015 Université de Lausanne - see licence */ /*! AdIm - v0.0.0 - 2015-11-12 - Copyright (C) 2015 Université de Lausanne - see licence */
define('helper/fileUploader',["jquery","jquery.fileupload","jquery.iframe-transport","jquery.fileupload-proc"],function(a){function b(b){b=a.extend(!0,{elem:"#fileupload",progBar:".progress-bar",alertBox:".adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:2*Math.pow(2,20),dropZone:a(document),onStart:null,processstart:null,autoUpload:!0,sequentialUploads:!1,add:null},b),a(function(){function c(a){a.preventDefault()}var d=a(b.elem),e=a(b.progBar),f=a(b.alertBox);d.fileupload({dataType:"json",dropZone:b.dropZone,autoUpload:b.autoUpload,done:function(a,b){1===d.fileupload("active")&&!b.result.error&&b.result.next&&document.location.assign(b.result.next)},processstart:function(){"function"==typeof b.processstart&&b.processstart(b)},start:function(){f.find("[class^=adim-fu-error-]").addClass("hide").end().addClass("hide"),e.closest(".progress-wrapper").removeClass("hide"),a("#fileupload").fileupload("disable"),a(document).on("drop dragover",c),"function"==typeof b.onStart&&b.onStart(b)},progressall:function(a,b){var c=parseInt(b.loaded/b.total*100,10),d=c+"%";e.text(d).css("width",d)},processQueue:[{action:"validate",always:!0,acceptFileTypes:b.acceptFileTypes,maxFileSize:b.maxFileSize}],processfail:function(b,d){var e=d.files[d.index].error;f.find("[class^=adim-fu-error-]").addClass("hide"),f.removeClass("hide").find(".adim-fu-error-"+e).removeClass("hide"),a(document).off("drop dragover",c),a("#fileupload").fileupload("enable")}}),"function"==typeof b.add&&d.fileupload("option","add",b.add)})}return a.widget("blueimp.fileupload",a.blueimp.fileupload,{processActions:{validate:function(b,c){if(c.disabled)return b;var d=a.Deferred(),e=b.files[b.index];return c.acceptFileTypes.test(e.type)?e.size>c.maxFileSize?(b.files[b.index].error="maxFileSize",d.rejectWith(this,b)):d.resolveWith(this,b):(b.files[b.index].error="acceptFileTypes",d.rejectWith(this,b)),d.promise()}}}),{initialize:b,init:b}}); define('helper/fileUploader',["jquery","jquery.fileupload","jquery.iframe-transport","jquery.fileupload-proc"],function(a){function b(b){b=a.extend(!0,{elem:"#fileupload",progBar:".progress-bar",alertBox:".adim-fu-error-box",acceptFileTypes:/(\.|\/)(jpe?g|png)$/i,maxFileSize:2*Math.pow(2,20),dropZone:a(document),onStart:null,processstart:null,autoUpload:!0,sequentialUploads:!1,add:null},b),a(function(){function c(a){a.preventDefault()}var d=a(b.elem),e=a(b.progBar),f=a(b.alertBox);d.fileupload({dataType:"json",dropZone:b.dropZone,autoUpload:b.autoUpload,done:function(b,c){1===a(b.target).fileupload("active")&&!c.result.error&&c.result.next&&document.location.assign(c.result.next)},processstart:function(){"function"==typeof b.processstart&&b.processstart(b)},start:function(){f.find("[class^=adim-fu-error-]").addClass("hide").end().addClass("hide"),e.closest(".progress-wrapper").removeClass("hide"),a("#fileupload").fileupload("disable"),a(document).on("drop dragover",c),"function"==typeof b.onStart&&b.onStart(b)},progressall:function(a,b){var c=parseInt(b.loaded/b.total*100,10),d=c+"%";e.text(d).css("width",d)},processQueue:[{action:"validate",always:!0,acceptFileTypes:b.acceptFileTypes,maxFileSize:b.maxFileSize}],processfail:function(b,d){var e=d.files[d.index].error;f.find("[class^=adim-fu-error-]").addClass("hide"),f.removeClass("hide").find(".adim-fu-error-"+e).removeClass("hide"),a(document).off("drop dragover",c),a("#fileupload").fileupload("enable")}}),"function"==typeof b.add&&d.fileupload("option","add",b.add)})}return a.widget("blueimp.fileupload",a.blueimp.fileupload,{processActions:{validate:function(b,c){if(c.disabled)return b;var d=a.Deferred(),e=b.files[b.index];return c.acceptFileTypes.test(e.type)?e.size>c.maxFileSize?(b.files[b.index].error="maxFileSize",d.rejectWith(this,b)):d.resolveWith(this,b):(b.files[b.index].error="acceptFileTypes",d.rejectWith(this,b)),d.promise()}}}),{initialize:b,init:b}});
/*! /*!
* jQuery Hotkeys Plugin * jQuery Hotkeys Plugin
* Copyright 2010, John Resig * Copyright 2010, John Resig
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment