aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-08-17 13:07:18 +0200
committerVincent Petry <pvince81@owncloud.com>2013-09-13 19:59:14 +0200
commit1304b511e9533dee4cf1125e625568c8a74719a1 (patch)
tree2430ff5abeeb0f378547e49cb4b311b41c035421 /apps/files/js
parentc149b57d3b4020c65d33966d5dc8395b8b821fc9 (diff)
downloadnextcloud-server-1304b511e9533dee4cf1125e625568c8a74719a1.tar.gz
nextcloud-server-1304b511e9533dee4cf1125e625568c8a74719a1.zip
Ajax calls for "files" and "files_trashbin" apps
Frontend: - The files app list now uses ajax calls to refresh the list. - Added support the browser back button (history API). - Added mask + spinner while loading file list Backend: - Added utility function in core JS for parsing query strings. - Moved file list + breadcrumb template data code to helper functions - Fixed some file paths in trashbin app to be similar to the files app
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/fileactions.js5
-rw-r--r--apps/files/js/filelist.js137
-rw-r--r--apps/files/js/files.js48
3 files changed, 159 insertions, 31 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 097fe521aa6..330fe86f6b3 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -196,13 +196,12 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
FileList.rename(filename);
});
-
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
- var dir = $('#dir').val();
+ var dir = $('#dir').val() || '/';
if (dir !== '/') {
dir = dir + '/';
}
- window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent(dir + filename);
+ FileList.changeDirectory(dir + filename);
});
FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 29be5e0d362..c205ae32aa9 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1,7 +1,25 @@
var FileList={
useUndo:true,
+ postProcessList: function(){
+ $('#fileList tr').each(function(){
+ //little hack to set unescape filenames in attribute
+ $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
+ });
+ },
update:function(fileListHtml) {
- $('#fileList').empty().html(fileListHtml);
+ var $fileList = $('#fileList');
+ $fileList.empty().html(fileListHtml);
+ $('#emptycontent').toggleClass('hidden', $fileList.find('tr').length > 0);
+ $fileList.find('tr').each(function () {
+ FileActions.display($(this).children('td.filename'));
+ });
+ $fileList.trigger(jQuery.Event("fileActionsReady"));
+ FileList.postProcessList();
+ // "Files" might not be loaded in extending apps
+ if (window.Files){
+ Files.setupDragAndDrop();
+ }
+ $fileList.trigger(jQuery.Event("updated"));
},
createRow:function(type, name, iconurl, linktarget, size, lastModified, permissions){
var td, simpleSize, basename, extension;
@@ -134,20 +152,83 @@ var FileList={
FileActions.display(tr.find('td.filename'));
return tr;
},
- refresh:function(data) {
- var result = jQuery.parseJSON(data.responseText);
+ /**
+ * @brief Changes the current directory and reload the file list.
+ * @param targetDir target directory (non URL encoded)
+ * @param changeUrl false if the URL must not be changed (defaults to true)
+ */
+ changeDirectory: function(targetDir, changeUrl){
+ var $dir = $('#dir'),
+ url,
+ currentDir = $dir.val() || '/';
+ targetDir = targetDir || '/';
+ if (currentDir === targetDir){
+ return;
+ }
+ FileList.setCurrentDir(targetDir, changeUrl);
+ FileList.reload();
+ },
+ setCurrentDir: function(targetDir, changeUrl){
+ $('#dir').val(targetDir);
+ // Note: IE8 handling ignored for now
+ if (window.history.pushState && changeUrl !== false){
+ url = OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(targetDir).replace(/%2F/g, '/'),
+ window.history.pushState({dir: targetDir}, '', url);
+ }
+ },
+ /**
+ * @brief Reloads the file list using ajax call
+ */
+ reload: function(){
+ FileList.showMask();
+ if (FileList._reloadCall){
+ FileList._reloadCall.abort();
+ }
+ FileList._reloadCall = $.ajax({
+ url: OC.filePath('files','ajax','list.php'),
+ data: {
+ dir : $('#dir').val(),
+ breadcrumb: true
+ },
+ error: function(result){
+ FileList.reloadCallback(result);
+ },
+ success: function(result) {
+ FileList.reloadCallback(result);
+ }
+ });
+ },
+ reloadCallback: function(result){
+ var $controls = $('#controls');
+
+ delete FileList._reloadCall;
+ FileList.hideMask();
+
+ if (!result || result.status === 'error') {
+ OC.Notification.show(result.data.message);
+ return;
+ }
+
+ if (result.status === 404){
+ // go back home
+ FileList.changeDirectory('/');
+ return;
+ }
+
if(typeof(result.data.breadcrumb) != 'undefined'){
- updateBreadcrumb(result.data.breadcrumb);
+ $controls.find('.crumb').remove();
+ $controls.prepend(result.data.breadcrumb);
+ // TODO: might need refactor breadcrumb code into a new file
+ //resizeBreadcrumbs(true);
}
FileList.update(result.data.files);
- resetFileActionPanel();
},
remove:function(name){
$('tr').filterAttr('data-file',name).find('td.filename').draggable('destroy');
$('tr').filterAttr('data-file',name).remove();
FileList.updateFileSummary();
if($('tr[data-file]').length==0){
- $('#emptycontent').show();
+ $('#emptycontent').removeClass('hidden');
}
},
insertElement:function(name,type,element){
@@ -177,7 +258,7 @@ var FileList={
}else{
$('#fileList').append(element);
}
- $('#emptycontent').hide();
+ $('#emptycontent').addClass('hidden');
FileList.updateFileSummary();
},
loadingDone:function(name, id){
@@ -508,6 +589,30 @@ var FileList={
$connector.show();
}
}
+ },
+ showMask: function(){
+ // in case one was shown before
+ var $mask = $('#content .mask');
+ if ($mask.length){
+ return;
+ }
+
+ $mask = $('<div class="mask transparent"></div>');
+
+ $mask.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+ $('#content').append($mask);
+
+ // block UI, but only make visible in case loading takes longer
+ FileList._maskTimeout = window.setTimeout(function(){
+ // reset opacity
+ $mask.removeClass('transparent');
+ }, 250);
+ },
+ hideMask: function(){
+ var $mask = $('#content .mask').remove();
+ if (FileList._maskTimeout){
+ window.clearTimeout(FileList._maskTimeout);
+ }
}
};
@@ -629,8 +734,8 @@ $(document).ready(function(){
}
// update folder size
- var size = parseInt(data.context.data('size'));
- size += parseInt(file.size) ;
+ var size = parseInt(data.context.data('size'));
+ size += parseInt(file.size);
data.context.attr('data-size', size);
data.context.find('td.filesize').text(humanFileSize(size));
@@ -710,5 +815,19 @@ $(document).ready(function(){
$(window).trigger('beforeunload');
});
+ window.onpopstate = function(e){
+ var targetDir;
+ if (e.state && e.state.dir){
+ targetDir = e.state.dir;
+ }
+ else{
+ // read from URL
+ targetDir = (OC.parseQueryString(location.search) || {dir: '/'}).dir || '/';
+ }
+ if (targetDir){
+ FileList.changeDirectory(targetDir, false);
+ }
+ }
+
FileList.createFileSummary();
});
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index d729077ea72..ce72c7bcb5a 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -94,29 +94,34 @@ Files={
OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
return;
}
+ },
+
+ setupDragAndDrop: function(){
+ var $fileList = $('#fileList');
+
+ //drag/drop of files
+ $fileList.find('tr td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
+ $(e).draggable(dragOptions);
+ }
+ });
+
+ $fileList.find('tr[data-type="dir"] td.filename').each(function(i,e){
+ if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
+ $(e).droppable(folderDropOptions);
+ }
+ });
}
};
$(document).ready(function() {
Files.displayEncryptionWarning();
Files.bindKeyboardShortcuts(document, jQuery);
- $('#fileList tr').each(function(){
- //little hack to set unescape filenames in attribute
- $(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
- });
+
+ FileList.postProcessList();
+ Files.setupDragAndDrop();
$('#file_action_panel').attr('activeAction', false);
- //drag/drop of files
- $('#fileList tr td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
- $(e).draggable(dragOptions);
- }
- });
- $('#fileList tr[data-type="dir"] td.filename').each(function(i,e){
- if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
- $(e).droppable(folderDropOptions);
- }
- });
$('div.crumb:not(.last)').droppable(crumbDropOptions);
$('ul#apps>li:first-child').data('dir','');
if($('div.crumb').length){
@@ -335,6 +340,9 @@ $(document).ready(function() {
resizeBreadcrumbs(true);
+ // event handlers for breadcrumb items
+ $('#controls').delegate('.crumb a', 'click', onClickBreadcrumb);
+
// display storage warnings
setTimeout ( "Files.displayStorageWarnings()", 100 );
OC.Notification.setDefault(Files.displayStorageWarnings);
@@ -415,10 +423,6 @@ function boolOperationFinished(data, callback) {
}
}
-function updateBreadcrumb(breadcrumbHtml) {
- $('p.nav').empty().html(breadcrumbHtml);
-}
-
var createDragShadow = function(event){
//select dragged file
var isDragSelected = $(event.target).parents('tr').find('td input:first').prop('checked');
@@ -681,3 +685,9 @@ function checkTrashStatus() {
}
});
}
+
+function onClickBreadcrumb(e){
+ var $el = $(e.target).closest('.crumb');
+ e.preventDefault();
+ FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+}