From 802a5a331bf645ab3cc17e9849a7719146b1d54b Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 19 Apr 2013 13:46:11 +0200 Subject: Fix displaying spinner on delete --- apps/files/js/filelist.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 70c3332ccaf..b1e9a885063 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -320,9 +320,9 @@ var FileList={ } for (var i=0; i'; - deleteAction[0].outerHTML = newHTML; + deleteAction.html(newHTML); } // Finish any existing actions if (FileList.lastAction) { @@ -344,7 +344,7 @@ var FileList={ } else { $.each(files,function(index,file) { var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash"); - deleteAction[0].outerHTML = oldHTML; + deleteAction.html(oldHTML); }); } }); -- cgit v1.2.3 From 1507d1ef26ec92afbb3d603f9e0e2254dbd7d6c7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 22 Apr 2013 21:54:25 +0200 Subject: Files: Fix XSS when creating dropshadow --- apps/files/js/files.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 7e3caf71a03..a2d17fae7d2 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -757,9 +757,9 @@ var createDragShadow = function(event){ var dir=$('#dir').val(); $(selectedFiles).each(function(i,elem){ - var newtr = $('' - +''+elem.name+''+humanFileSize(elem.size)+'' - +''); + var newtr = $('').attr('data-dir', dir).attr('data-filename', elem.name); + newtr.append($('').addClass('filename').text(elem.name)); + newtr.append($('').addClass('size').text(humanFileSize(elem.size))); tbody.append(newtr); if (elem.type === 'dir') { newtr.find('td.filename').attr('style','background-image:url('+OC.imagePath('core', 'filetypes/folder.png')+')'); -- cgit v1.2.3 From ab7fcebeb38f6515ae584fc110cbfd8306ead5e3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 24 Apr 2013 15:26:36 +0200 Subject: Files: fix the order fileactions are computed for a file --- apps/files/js/fileactions.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index f3264da5a12..a77add141a1 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -22,18 +22,18 @@ var FileActions = { if (FileActions.actions.all) { actions = $.extend(actions, FileActions.actions.all); } - if (mime) { - if (FileActions.actions[mime]) { - actions = $.extend(actions, FileActions.actions[mime]); + if (type) {//type is 'dir' or 'file' + if (FileActions.actions[type]) { + actions = $.extend(actions, FileActions.actions[type]); } + } + if (mime) { var mimePart = mime.substr(0, mime.indexOf('/')); if (FileActions.actions[mimePart]) { actions = $.extend(actions, FileActions.actions[mimePart]); } - } - if (type) {//type is 'dir' or 'file' - if (FileActions.actions[type]) { - actions = $.extend(actions, FileActions.actions[type]); + if (FileActions.actions[mime]) { + actions = $.extend(actions, FileActions.actions[mime]); } } var filteredActions = {}; -- cgit v1.2.3 From 637dd685dba5d701b92851a60eae2a25b73bd46f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 24 Apr 2013 16:13:17 +0200 Subject: fix wrong shared icon description fix #2928 translation of string "Shared" has to be marked as located in "files" for the translation extractor --- apps/files/js/fileactions.js | 1 + 1 file changed, 1 insertion(+) (limited to 'apps/files/js') diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index f3264da5a12..264a86adb7b 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -113,6 +113,7 @@ var FileActions = { } }); if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){ + // t('files', 'Share') addAction('Share', actions.Share); } -- cgit v1.2.3 From 6cf6103ed2d8fcb70d5340be583622f32ff08913 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 28 Apr 2013 23:25:58 +0200 Subject: Move onclick handler --- apps/files/js/files.js | 5 +++++ apps/files/templates/index.php | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'apps/files/js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a2d17fae7d2..4010c66593f 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -115,6 +115,11 @@ $(document).ready(function() { return false; }); + // Trigger cancelling of file upload + $('#uploadprogresswrapper stop').on('click', function() { + Files.cancelUploads(); + }); + // Show trash bin $('#trash a').live('click', function() { window.location=OC.filePath('files_trashbin', '', 'index.php'); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 69fcb94e681..66866ee8b43 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -46,7 +46,6 @@
-- cgit v1.2.3 From 3a6e39b990b1e58d03cc81479a8a27b6ad6c74fe Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 28 Apr 2013 23:28:41 +0200 Subject: It's a class --- apps/files/js/files.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/files/js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 4010c66593f..296e54e3568 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -116,7 +116,7 @@ $(document).ready(function() { }); // Trigger cancelling of file upload - $('#uploadprogresswrapper stop').on('click', function() { + $('#uploadprogresswrapper .stop').on('click', function() { Files.cancelUploads(); }); -- cgit v1.2.3 From 3de40f7cfb779b570761dedc837cb3a6bfd0e878 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 6 May 2013 17:55:22 +0200 Subject: Files: set the proper mimetype when creating a new text file --- apps/files/ajax/newfile.php | 2 +- apps/files/js/files.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 38714f34a63..8548fc95ddf 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -85,7 +85,7 @@ if($source) { }elseif(\OC\Files\Filesystem::touch($dir . '/' . $filename)) { $meta = \OC\Files\Filesystem::getFileInfo($dir.'/'.$filename); $id = $meta['fileid']; - OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id))); + OCP\JSON::success(array("data" => array('content'=>$content, 'id' => $id, 'mime' => $meta['mimetype']))); exit(); } } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 296e54e3568..a15f0588f9f 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -511,9 +511,9 @@ $(document).ready(function() { var date=new Date(); FileList.addFile(name,0,date,false,hidden); var tr=$('tr').filterAttr('data-file',name); - tr.attr('data-mime','text/plain'); + tr.attr('data-mime',result.data.mime); tr.attr('data-id', result.data.id); - getMimeIcon('text/plain',function(path){ + getMimeIcon(result.data.mime,function(path){ tr.find('td.filename').attr('style','background-image:url('+path+')'); }); } else { -- cgit v1.2.3 From 591b383f2dd1601009382152079e004034c4258d Mon Sep 17 00:00:00 2001 From: Jörn Friedrich Dreyer Date: Mon, 13 May 2013 15:54:45 +0200 Subject: peselect filename without extension on rename --- apps/files/js/filelist.js | 7 +++++++ core/js/js.js | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) (limited to 'apps/files/js') diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index b1e9a885063..c24d1fd8244 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -191,6 +191,13 @@ var FileList={ td.children('a.name').hide(); td.append(form); input.focus(); + //preselect input + var len = input.val().lastIndexOf('.'); + if (len === -1) { + len = input.val().length; + } + input.selectRange(0,len); + form.submit(function(event){ event.stopPropagation(); event.preventDefault(); diff --git a/core/js/js.js b/core/js/js.js index d85e6d88f8a..3cb4d3dd151 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -767,6 +767,26 @@ OC.set=function(name, value) { context[tail]=value; }; +/** + * select a range in an input field + * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area + * @param {type} start + * @param {type} end + */ +$.fn.selectRange = function(start, end) { + return this.each(function() { + if (this.setSelectionRange) { + this.focus(); + this.setSelectionRange(start, end); + } else if (this.createTextRange) { + var range = this.createTextRange(); + range.collapse(true); + range.moveEnd('character', end); + range.moveStart('character', start); + range.select(); + } + }); +}; /** * Calls the server periodically every 15 mins to ensure that session doesnt -- cgit v1.2.3 From 56006ea8524feb44593df26e26a8c72ecb75fadc Mon Sep 17 00:00:00 2001 From: davidak Date: Fri, 24 May 2013 14:31:06 +0200 Subject: small typo fix: added 2 whitespaces --- apps/files/js/files.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a15f0588f9f..a79d34c9b23 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -708,14 +708,14 @@ function scanFiles(force, dir){ var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir}); scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource); scannerEventSource.listen('count',function(count){ - console.log(count + 'files scanned') + console.log(count + ' files scanned') }); scannerEventSource.listen('folder',function(path){ console.log('now scanning ' + path) }); scannerEventSource.listen('done',function(count){ scanFiles.scanning=false; - console.log('done after ' + count + 'files'); + console.log('done after ' + count + ' files'); }); } scanFiles.scanning=false; -- cgit v1.2.3