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')

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')

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')

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')

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')

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


From 5cd6e0f4d98b98809eb17366ca90e79b09a05115 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Jan 2012 00:11:26 +0100
Subject: remove some of the flickering in opera

---
 apps/media/css/music.css |  4 ++--
 core/css/styles.css      |  1 +
 files/css/files.css      |  1 +
 files/js/fileactions.js  | 12 ++++++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'files/js')

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 41ade44a66f..da0407fca58 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -20,8 +20,8 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
 
 #collection { padding-top:1em; position:relative; width:100%; float:left; }
 #collection li.album,#collection li.song { margin-left:3em; }
-#leftcontent img.remove { display:none; float:right; cursor:pointer; }
-#leftcontent li:hover img.remove { display:inline; }
+#leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
+#leftcontent li:hover img.remove { display:inline; opacity: .3; }
 #leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
 #collection li button { float:right; }
 #collection li,#playlist li { list-style-type:none; }
diff --git a/core/css/styles.css b/core/css/styles.css
index 76e1e5760b8..53af8b383e3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -106,6 +106,7 @@ label.infield { cursor: text !important; }
 #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 
 .action, .selectedActions a, #logout { opacity:.3; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
+.action { width: 16px; height: 16px; }
 .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; }
 
 table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
diff --git a/files/css/files.css b/files/css/files.css
index b384fef0b78..6c4d603b4a6 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -70,6 +70,7 @@ table thead.fixed { height:2em; }
 #select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
 .selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
+a.action>img{ max-height:16px; max-width:16px; }
 .selectedActions { display:none; }
 
 /* add breadcrumb divider to the File item in navigation panel */
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 6f0729e43b6..b5dd3982803 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -66,7 +66,7 @@ FileActions={
 				if(img.call){
 					img=img(file);
 				}
-				var html='<a href="#" title="'+name+'" class="action" />';
+				var html='<a href="#" title="'+name+'" class="action" style="display:none" />';
 				var element=$(html);
 				if(img){
 					element.append($('<img src="'+img+'"/>'));
@@ -80,6 +80,7 @@ FileActions={
 					FileActions.hide();
 					action(currentFile);
 				});
+				element.hide();
 				parent.children('a.name').append(element);
 			}
 		}
@@ -88,7 +89,7 @@ FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" title="Delete" class="action" />';
+			var html='<a href="#" title="Delete" class="action" style="display:none" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
@@ -102,10 +103,13 @@ FileActions={
 				FileActions.hide();
 				action(currentFile);
 			});
+			element.hide();
 			parent.parent().children().last().append(element);
 		}
-		$('#fileList .action').hide();
-		$('#fileList .action').fadeIn(200);
+		$('#fileList .action').css('-o-transition-property','none');//temporarly disable 
+		$('#fileList .action').fadeIn(200,function(){
+			$('#fileList .action').css('-o-transition-property','opacity');
+		});
 		return false;
 	},
 	hide:function(){
-- 
cgit v1.2.3