Commit ebe2f86d authored by Kevin Gutierrez's avatar Kevin Gutierrez
Browse files

Format js files

parent 5a60d550
...@@ -23,8 +23,8 @@ $(function () { ...@@ -23,8 +23,8 @@ $(function () {
add: function (e, data) { add: function (e, data) {
$('.messages').empty(); $('.messages').empty();
var $this = $(this); var $this = $(this);
var that = $this.data('blueimp-fileupload') || $this.data('fileupload') var that = $this.data('blueimp-fileupload') || $this.data('fileupload');
var li = $($('#upload-list-item').html()).addClass('upload-uploading') var li = $($('#upload-list-item').html()).addClass('upload-uploading');
var options = that.options; var options = that.options;
$('#upload-list').append(li); $('#upload-list').append(li);
...@@ -39,10 +39,8 @@ $(function () { ...@@ -39,10 +39,8 @@ $(function () {
}); });
}).done(function () { }).done(function () {
data.context.find('.start').prop('disabled', false); data.context.find('.start').prop('disabled', false);
if ((that._trigger('added', e, data) !== false) && if (that._trigger('added', e, data) !== false && (options.autoUpload || data.autoUpload) && data.autoUpload !== false) {
(options.autoUpload || data.autoUpload) && data.submit();
data.autoUpload !== false) {
data.submit()
} }
}).fail(function () { }).fail(function () {
if (data.files.error) { if (data.files.error) {
...@@ -66,21 +64,26 @@ $(function () { ...@@ -66,21 +64,26 @@ $(function () {
return false; return false;
} }
var progress = Math.floor(data.loaded / data.total * 100); var progress = Math.floor((data.loaded / data.total) * 100);
data.context.each(function () { data.context.each(function () {
$(this).find('.progress').addClass('active').attr('aria-valuenow', progress).find('.bar').css( $(this)
'width', .find('.progress')
progress + '%' .addClass('active')
).html(progress + '%'); .attr('aria-valuenow', progress)
.find('.bar')
.css('width', progress + '%')
.html(progress + '%');
}); });
}, },
progressall: function (e, data) { progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10); var progress = parseInt((data.loaded / data.total) * 100, 10);
$('#overall-progress').addClass('active').attr('aria-valuenow', progress).find('.bar').css( $('#overall-progress')
'width', .addClass('active')
progress + '%' .attr('aria-valuenow', progress)
).html(progress + '%'); .find('.bar')
.css('width', progress + '%')
.html(progress + '%');
if (progress >= 100) { if (progress >= 100) {
$('#overall-progress').removeClass('active').find('.bar').css('width', '0%'); $('#overall-progress').removeClass('active').find('.bar').css('width', '0%');
...@@ -92,14 +95,13 @@ $(function () { ...@@ -92,14 +95,13 @@ $(function () {
var response = $.parseJSON(data.result); var response = $.parseJSON(data.result);
if (response.success) { if (response.success) {
itemElement.addClass('upload-success') itemElement.addClass('upload-success');
$('.preview', itemElement).attr('data-thumb-target', response.video_id); $('.preview', itemElement).attr('data-thumb-target', response.video_id);
$('.right', itemElement).append(response.form); $('.right', itemElement).append(response.form);
} else { } else {
itemElement.addClass('upload-failure'); itemElement.addClass('upload-failure');
$('.right .error_messages', itemElement).append(response.error_message); $('.right .error_messages', itemElement).append(response.error_message);
} }
}, },
fail: function (e, data) { fail: function (e, data) {
...@@ -124,7 +126,9 @@ $(function () { ...@@ -124,7 +126,9 @@ $(function () {
if (data.success) { if (data.success) {
var statusText = $('.status-msg.update-success').text(); var statusText = $('.status-msg.update-success').text();
addMessage('success', statusText); addMessage('success', statusText);
itemElement.slideUp(function () { $(this).remove() }); itemElement.slideUp(function () {
$(this).remove();
});
} else { } else {
form.replaceWith(data.form); form.replaceWith(data.form);
...@@ -144,9 +148,10 @@ $(function () { ...@@ -144,9 +148,10 @@ $(function () {
$.post(this.href, { csrfmiddlewaretoken: CSRFToken }, function (data) { $.post(this.href, { csrfmiddlewaretoken: CSRFToken }, function (data) {
if (data.success) { if (data.success) {
itemElement.slideUp(function () { $(this).remove() }); itemElement.slideUp(function () {
$(this).remove();
});
} }
}); });
}); });
}); });
...@@ -13,7 +13,7 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = { ...@@ -13,7 +13,7 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = {
}); });
$('.pagination a', context).click(function () { $('.pagination a', context).click(function () {
var page = this.getAttribute("data-page"); var page = this.getAttribute('data-page');
setPage(page); setPage(page);
return false; return false;
}); });
...@@ -71,8 +71,8 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = { ...@@ -71,8 +71,8 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = {
error: function (response, textStatus, errorThrown) { error: function (response, textStatus, errorThrown) {
var message = jsonData['error_message'] + '<br />' + errorThrown + ' - ' + response.status; var message = jsonData['error_message'] + '<br />' + errorThrown + ' - ' + response.status;
$('#upload').append( $('#upload').append(
'<div class="help-block help-critical">' + '<div class="help-block help-critical">' + '<strong>' + jsonData['error_label'] + ': </strong>' + message + '</div>'
'<strong>' + jsonData['error_label'] + ': </strong>' + message + '</div>'); );
} }
}); });
...@@ -91,7 +91,7 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = { ...@@ -91,7 +91,7 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = {
currentTag = $(this).text(); currentTag = $(this).text();
$('#id_q').val(''); $('#id_q').val('');
fetchResults({ fetchResults({
'tag': currentTag, tag: currentTag,
collection_id: $('#collection_chooser_collection_id').val() collection_id: $('#collection_chooser_collection_id').val()
}); });
return false; return false;
...@@ -105,4 +105,4 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = { ...@@ -105,4 +105,4 @@ var VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS = {
modal.respond('videoChosen', jsonData['result']); modal.respond('videoChosen', jsonData['result']);
modal.close(); modal.close();
}, },
} };
Markdown is supported
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