Merge pull request #920 from guillermo-varela/master

Cancel after self fields are used.

js/fileinput.js

@@ -3135,9 +3135,9 @@
                 data = $.extend(true, {}, self._getOutData(), params);
                 data.abortData = self.ajaxAborted.data || {};
                 data.abortMessage = self.ajaxAborted.message;
-                self.cancel();
                 self._setProgress(101, self.$progress, self.msgCancelled);
                 self._showUploadError(self.ajaxAborted.message, data, 'filecustomerror');
+                self.cancel();
                 return true;
             }
             return false;
@@ -3661,4 +3661,4 @@
             $input.fileinput();
         }
     });
-}));
+}));