Code Cosmetics
This commit is contained in:
@ -6,6 +6,7 @@
|
||||
* Version 1.0.0
|
||||
* Licensed under the MIT license.
|
||||
*/
|
||||
|
||||
(function($) {
|
||||
"use strict";
|
||||
|
||||
@ -57,13 +58,13 @@
|
||||
|
||||
// Translate texts
|
||||
this.$modalTitle.text(this.options.modalTitle)
|
||||
this.$modalFooter.children("button").text(this.options.modalFooter)
|
||||
this.$modalFooter.children("button").text(this.options.modalFooter);
|
||||
|
||||
this.$modal.on("hidden.bs.modal", $.proxy(this.reset, this));
|
||||
},
|
||||
|
||||
reset: function() {
|
||||
this.$modalTitle.text(this.options.modalTitle)
|
||||
this.$modalTitle.text(this.options.modalTitle);
|
||||
this.$modalFooter.hide();
|
||||
this.$modalBar.addClass("progress-bar-success");
|
||||
this.$modalBar.removeClass("progress-bar-danger");
|
||||
@ -132,25 +133,25 @@
|
||||
// Replace the contents of the form, with the returned html
|
||||
if (xhr.status === 422) {
|
||||
var newHtml = $.parseHTML(xhr.responseText);
|
||||
this.$modalBar.text(newHtml[0].data);
|
||||
//this.$modal.modal("hide");
|
||||
this.replaceForm(newHtml);
|
||||
this.$modal.modal("hide");
|
||||
}
|
||||
// Write the error response to the document.
|
||||
else{
|
||||
var responseText = xhr.responseText;
|
||||
// Handle no response error
|
||||
if (contentType) {
|
||||
var responseText = xhr.responseText;
|
||||
if (contentType.indexOf("text/plain") !== -1) {
|
||||
responseText = "<pre>" + responseText + "</pre>";
|
||||
}
|
||||
document.write(xhr.responseText);
|
||||
document.write(responseText);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
set_progress: function(percent){
|
||||
setProgress: function(percent) {
|
||||
var txt = percent + "%";
|
||||
if (percent == 100) {
|
||||
if (percent === 100) {
|
||||
txt = this.options.uploadedMsg;
|
||||
}
|
||||
this.$modalBar.attr("aria-valuenow", percent);
|
||||
@ -158,21 +159,20 @@
|
||||
this.$modalBar.css("width", percent + "%");
|
||||
},
|
||||
|
||||
progress: function(/*ProgressEvent*/e){
|
||||
progress: function(/*ProgressEvent*/e) {
|
||||
var percent = Math.round((e.loaded / e.total) * 100);
|
||||
this.set_progress(percent);
|
||||
this.setProgress(percent);
|
||||
},
|
||||
|
||||
// replace_form replaces the contents of the current form
|
||||
// replaceForm replaces the contents of the current form
|
||||
// with the form in the html argument.
|
||||
// We use the id of the current form to find the new form in the html
|
||||
replace_form: function(html) {
|
||||
replaceForm: function(html) {
|
||||
var newForm;
|
||||
var formId = this.$form.attr("id");
|
||||
if(formId !== undefined){
|
||||
if ( typeof(formId) !== "undefined") {
|
||||
newForm = $(html).find("#" + formId);
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
newForm = $(html).find("form");
|
||||
}
|
||||
// add the filestyle again
|
||||
@ -181,11 +181,11 @@
|
||||
}
|
||||
};
|
||||
|
||||
$.fn.uploadprogress = function(options, value){
|
||||
$.fn.uploadprogress = function(options) {
|
||||
return this.each(function() {
|
||||
var _options = $.extend({}, $.fn.uploadprogress.defaults, options);
|
||||
var file_progress = new UploadProgress(this, _options);
|
||||
file_progress.constructor();
|
||||
var fileProgress = new UploadProgress(this, _options);
|
||||
fileProgress.constructor();
|
||||
});
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user