Merge pull request #183 from sajjad-shirazy/master

Delete extra data enhancements

js/fileinput.js

@@ -754,7 +754,7 @@
                         url: vUrl,
                         type: 'POST',
                         dataType: 'json',
-                        data: {key: vKey, extraData: extraData},
+                        data: $.extend({key: vKey}, extraData),
                         beforeSend: function (jqXHR) {
                             addCss($frame, 'file-uploading');
                             addCss($el, 'disabled');
@@ -765,7 +765,10 @@
                                 self.raise('filedeleted', [vKey, jqXHR, extraData]);
                             } else {
                                 self.showError(data.error, extraData, $el.attr('id'), vKey, 'filedeleteerror', jqXHR);
+                                $frame.removeClass('file-uploading');
+                                $el.removeClass('disabled');
                                 resetProgress();
+                                return;
                             }
                             $frame.removeClass('file-uploading').addClass('file-deleted');
                             $frame.fadeOut('slow', function () {
@@ -1835,4 +1838,4 @@
             $input.fileinput();
         }
     });
-})(window.jQuery);
+})(window.jQuery);