From fde0a8b520203aee9800959847ff3bf4ec53250f Mon Sep 17 00:00:00 2001
From: VicDeo <victor.dubiniuk@gmail.com>
Date: Mon, 18 Feb 2013 13:22:43 +0300
Subject: Add Ability to the app to detect more details on the file

---
 apps/files/js/files.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 918182162d4..8327460cca6 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -162,9 +162,10 @@ $(document).ready(function() {
 			var tr=$('tr').filterAttr('data-file',filename);
 			var renaming=tr.data('renaming');
 			if(!renaming && !FileList.isLoading(filename)){
-				var mime=$(this).parent().parent().data('mime');
-				var type=$(this).parent().parent().data('type');
-				var permissions = $(this).parent().parent().data('permissions');
+				FileActions.currentFile = $(this).parent();
+				var mime=FileActions.getCurrentMimeType();
+				var type=FileActions.getCurrentType();
+				var permissions = FileActions.getCurrentPermissions();
 				var action=FileActions.getDefault(mime,type, permissions);
 				if(action){
 					event.preventDefault();
-- 
cgit v1.2.3


From 3b9d9eea09bc7ccaad1445882f60ec2478bc34d0 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 20 Feb 2013 21:57:50 +0100
Subject: replaced for in loops with normal enumerating loops to fix #1803

---
 apps/files/js/filelist.js       | 4 ++--
 apps/files_trashbin/js/trash.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc107656da8..0bf1f79ab77 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -315,8 +315,8 @@ var FileList={
 	do_delete:function(files){
 		if(files.substr){
 			files=[files];
-		}	
-		for (var i in files) {
+		}
+		for (var i=0; i<files.length; i++) {
 			var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
 			var oldHTML = deleteAction[0].outerHTML;
 			var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 6c810e4c2bd..23e5fb2fc93 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -88,7 +88,7 @@ $(document).ready(function() {
 				}
 			}
 			processSelection();
-		});		
+		});
 		
 		$('.undelete').click('click',function(event) {
 			var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
@@ -96,7 +96,7 @@ $(document).ready(function() {
 			var fileslist=files.join(';');
 			var dirlisting=getSelectedFiles('dirlisting')[0];
 			
-			for (var i in files) {
+			for (var i=0; i<files.length; i++) {
 				var undeleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date");
 				undeleteAction[0].innerHTML = undeleteAction[0].innerHTML+spinner;
 			}
@@ -111,7 +111,7 @@ $(document).ready(function() {
 						if (result.status != 'success') {
 							OC.dialogs.alert(result.data.message, 'Error');
 						}
-					});		
+					});
 			});
 	
 
-- 
cgit v1.2.3