From 6b9ae27b90ee5649fcab2417ebaf14e87559756e Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 18 Mar 2014 17:14:38 +0100 Subject: drop file cache migration OC5 -> OC6 --- apps/files/js/upgrade.js | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 apps/files/js/upgrade.js (limited to 'apps/files/js') diff --git a/apps/files/js/upgrade.js b/apps/files/js/upgrade.js deleted file mode 100644 index 714adf824a1..00000000000 --- a/apps/files/js/upgrade.js +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2014 - * - * This file is licensed under the Affero General Public License version 3 - * or later. - * - * See the COPYING-README file. - * - */ - -/* global OC */ -$(document).ready(function () { - var eventSource, total, bar = $('#progressbar'); - console.log('start'); - bar.progressbar({value: 0}); - eventSource = new OC.EventSource(OC.filePath('files', 'ajax', 'upgrade.php')); - eventSource.listen('total', function (count) { - total = count; - console.log(count + ' files needed to be migrated'); - }); - eventSource.listen('count', function (count) { - bar.progressbar({value: (count / total) * 100}); - console.log(count); - }); - eventSource.listen('done', function () { - document.location.reload(); - }); -}); -- cgit v1.2.3 From fa28c089fa3ffb72e97ca0f89cbfade3d0a8a8a5 Mon Sep 17 00:00:00 2001 From: Oskar Hollmann Date: Wed, 19 Mar 2014 22:09:09 +0100 Subject: Fix: 'Upload button tooltip doesn't disappear' Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM. --- apps/files/js/file-upload.js | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 apps/files/js/file-upload.js (limited to 'apps/files/js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js old mode 100644 new mode 100755 index ea4061c9b0b..c668bbf397d --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -320,6 +320,7 @@ OC.Upload = { */ start: function(e) { OC.Upload.log('start', e, null); + $('#upload').tipsy('hide'); // otherwise "Upload max." covers progress bar }, submit: function(e, data) { OC.Upload.rememberUpload(data); -- cgit v1.2.3 From 90839b784f748b18a2a5fae4cc3f80bd1df7b355 Mon Sep 17 00:00:00 2001 From: Oskar Hollmann Date: Wed, 19 Mar 2014 23:05:03 +0100 Subject: Comment moved to prevent 'Line is too long' warning. --- apps/files/js/file-upload.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apps/files/js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index c668bbf397d..371c83e742c 100755 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -320,7 +320,8 @@ OC.Upload = { */ start: function(e) { OC.Upload.log('start', e, null); - $('#upload').tipsy('hide'); // otherwise "Upload max." covers progress bar + //hide the tooltip otherwise it covers the progress bar + $('#upload').tipsy('hide'); }, submit: function(e, data) { OC.Upload.rememberUpload(data); -- cgit v1.2.3 From 5747e0e3f98d3c299b0bd46bb77ca7bf6b170312 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 20 Mar 2014 13:26:21 +0100 Subject: remove executable flag for file-upload.js --- apps/files/js/file-upload.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 apps/files/js/file-upload.js (limited to 'apps/files/js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js old mode 100755 new mode 100644 -- cgit v1.2.3