diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-12-23 16:36:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-23 16:36:53 +0100 |
commit | 56c016946d0695a62e418839cf19786a223b4ae7 (patch) | |
tree | e62fcaf393a43e653c8bbdec815e88e2fa63d80e /apps/files/js/file-upload.js | |
parent | 6f96af0fce24bf86b201b8ed5b27c2eff62099fc (diff) | |
parent | cfada468e6a0b277b6c80ddd7f5ebfdad78326f6 (diff) | |
download | nextcloud-server-56c016946d0695a62e418839cf19786a223b4ae7.tar.gz nextcloud-server-56c016946d0695a62e418839cf19786a223b4ae7.zip |
Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch
[downstream] Fix maindetailsview favorite star patch
Diffstat (limited to 'apps/files/js/file-upload.js')
-rw-r--r-- | apps/files/js/file-upload.js | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index d1ceb436720..0fbf3f559fe 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -158,15 +158,6 @@ OC.FileUpload.prototype = { this._conflictMode = mode; }, - /** - * Returns whether the upload is in progress - * - * @return {boolean} - */ - isPending: function() { - return this.data.state() === 'pending'; - }, - deleteUpload: function() { delete this.data.jqXHR; }, @@ -561,21 +552,6 @@ OC.Uploader.prototype = _.extend({ OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10}); }, 500), /** - * Checks the currently known uploads. - * returns true if any hxr has the state 'pending' - * @returns {boolean} - */ - isProcessing:function() { - var count = 0; - - jQuery.each(this._uploads, function(i, upload) { - if (upload.isPending()) { - count++; - } - }); - return count > 0; - }, - /** * callback for the conflicts dialog */ onCancel:function() { @@ -1134,13 +1110,6 @@ OC.Uploader.prototype = _.extend({ } } - // warn user not to leave the page while upload is in progress - $(window).on('beforeunload', function(e) { - if (self.isProcessing()) { - return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.'); - } - }); - //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used) if (navigator.userAgent.search(/konqueror/i) === -1) { this.$uploadEl.attr('multiple', 'multiple'); |