From 2c4ab355ac3ace893cc06c645d4a8d25a63dbdc1 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 00:47:24 +0000
Subject: Shared folder no longer draggable or droppable

---
 files/js/files.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'files/js/files.js')

diff --git a/files/js/files.js b/files/js/files.js
index 53437453ff9..8df7aa35357 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-file!=Shared] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-file!=Shared] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
@@ -70,7 +70,9 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			if(!FileList.isLoading(filename)){
+			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 action=FileActions.getDefault(mime,type);
-- 
cgit v1.2.3


From 06d2a87ee4759f3fc26e0f6b16027080036ba34a Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 00:52:53 +0000
Subject: Fix js error

---
 files/js/files.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'files/js/files.js')

diff --git a/files/js/files.js b/files/js/files.js
index 8df7aa35357..e37eac9bf6a 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr[data-file!=Shared] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-file!=Shared] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-file!="Shared"] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-file!="Shared"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
@@ -70,9 +70,7 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			var tr=$('tr').filterAttr('data-file',filename);
-			var renaming=tr.data('renaming')
-				if(!renaming && !FileList.isLoading(filename)){
+			if(!FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
 				var action=FileActions.getDefault(mime,type);
-- 
cgit v1.2.3


From e7de25434206a4849a7c7315d4d9926325c7b730 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 01:14:00 +0000
Subject: Fix missing ;

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

(limited to 'files/js/files.js')

diff --git a/files/js/files.js b/files/js/files.js
index e37eac9bf6a..88a07a0776e 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -70,7 +70,9 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			if(!FileList.isLoading(filename)){
+			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 action=FileActions.getDefault(mime,type);
-- 
cgit v1.2.3


From 0730077840a82a67a491780257089dfe7c7f64e2 Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Jan 2012 17:07:10 +0000
Subject: Used data-read and data-wite when binding drag and drop events

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

(limited to 'files/js/files.js')

diff --git a/files/js/files.js b/files/js/files.js
index 88a07a0776e..6044541d4aa 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr[data-file!="Shared"] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-file!="Shared"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-read="false"][data-write="false"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
-- 
cgit v1.2.3


From ebe3ae58cffa8c16ef2b1b74c5b7a9228a5495ff Mon Sep 17 00:00:00 2001
From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Jan 2012 18:08:20 +0000
Subject: removed data-read and fixed droppable logic

---
 files/js/files.js             | 2 +-
 files/templates/part.list.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'files/js/files.js')

diff --git a/files/js/files.js b/files/js/files.js
index 6044541d4aa..7c04245c223 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -12,7 +12,7 @@ $(document).ready(function() {
 
 	//drag/drop of files
 	$('#fileList tr td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-read="false"][data-write="false"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-type="dir"][data-write="true"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 81ba24dac9f..a364862119d 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,5 +1,4 @@
 		<?php foreach($_['files'] as $file):
-			$read = ($file['readable']) ? 'true' : 'false';
 			$write = ($file['writeable']) ? 'true' : 'false';
 			$simple_file_size = simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
@@ -11,7 +10,7 @@
 			$name = str_replace('%2F','/', $name);
 			$directory = str_replace('+','%20',urlencode($file['directory']));
 			$directory = str_replace('%2F','/', $directory); ?>
-			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>' data-read='<?php echo $read;?>' data-write='<?php echo $write;?>'>
+			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>' data-write='<?php echo $write;?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
 					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
-- 
cgit v1.2.3