You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/04/19 14:52:21 UTC

svn commit: r1791927 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/

Author: solomax
Date: Wed Apr 19 14:52:21 2017
New Revision: 1791927

URL: http://svn.apache.org/viewvc?rev=1791927&view=rev
Log:
[OPENMEETINGS-1634] drag to trash should work better

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1791927&r1=1791926&r2=1791927&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html Wed Apr 19 14:52:21 2017
@@ -27,9 +27,9 @@
 			if (s.parents('a').hasClass('ui-state-active')) {
 				s = $('.ui-state-active .ui-draggable.ui-draggable-handle');
 			}
-			var c = $('<div/>').attr('id', 'draggingContainer');
-			c.append(s.clone());
-			return c;
+			var c = $('<div/>').attr('id', 'draggingContainer').width(80).height(36);
+			var h = $('<div class="ui-corner-all ui-widget-header"/>').append(s.clone()).width(s.width());
+			return c.append(h);
 		}
 		function treeRevert(dropped) {
 			$('.file.tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop - 32;

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1791927&r1=1791926&r2=1791927&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java Wed Apr 19 14:52:21 2017
@@ -91,6 +91,7 @@ public class FolderPanel extends Panel {
 					behavior.setOption("revert", "treeRevert");
 					behavior.setOption("cursor", Options.asString("move"));
 					behavior.setOption("helper", "dragHelper");
+					behavior.setOption("cursorAt", "{left: 40, top: 18}");
 				}
 			}.setContainment(treePanel.getContainment());
 			String cls = r instanceof Recording ? "recorditem" : "fileitem";

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1791927&r1=1791926&r2=1791927&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html Wed Apr 19 14:52:21 2017
@@ -27,9 +27,9 @@
 			if (s.parents('a').hasClass('ui-state-active')) {
 				s = $('.ui-state-active .ui-draggable.ui-draggable-handle');
 			}
-			var c = $('<div/>').attr('id', 'draggingContainer');
-			c.append(s.clone());
-			return c;
+			var c = $('<div/>').attr('id', 'draggingContainer').width(80).height(36);
+			var h = $('<div class="ui-corner-all ui-widget-header"/>').append(s.clone()).width(s.width());
+			return c.append(h);
 		}
 		function treeRevert(dropped) {
 			$('.file.tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop - 32;

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java?rev=1791927&r1=1791926&r2=1791927&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java Wed Apr 19 14:52:21 2017
@@ -91,6 +91,7 @@ public class FolderPanel extends Panel {
 					behavior.setOption("revert", "treeRevert");
 					behavior.setOption("cursor", Options.asString("move"));
 					behavior.setOption("helper", "dragHelper");
+					behavior.setOption("cursorAt", "{left: 40, top: 18}");
 				}
 			}.setContainment(treePanel.getContainment());
 			String cls = r instanceof Recording ? "recorditem" : "fileitem";