Conflicts:
	javascript/GridFieldBulkImageUpload.js
This commit is contained in:
colymba 2012-09-06 00:01:02 +03:00
commit 7230602568

View File

@ -72,7 +72,8 @@
}, },
onunmatch: function(){ onunmatch: function(){
}, },
onclick: function(e){ onclick: function(e){
var formsWithUpadtes, url, data, cacheBuster; var formsWithUpadtes, url, data, cacheBuster;
formsWithUpadtes = $('form.bulkImageUploadUpdateForm.hasUpdate'); formsWithUpadtes = $('form.bulkImageUploadUpdateForm.hasUpdate');
@ -90,7 +91,7 @@
data: data, data: data,
type: "POST", type: "POST",
context: $(this) context: $(this)
}).done(function() { }).done(function() {
var btn = $('#bulkImageUploadUpdateBtn'); var btn = $('#bulkImageUploadUpdateBtn');
var totalForms = parseInt( $(btn).data('formsToUpdate') ); var totalForms = parseInt( $(btn).data('formsToUpdate') );