Author: sevein
Date: Thu Oct 15 06:57:32 2009
New Revision: 3751
Log:
YUI treeView/drag&drop bug fixes. IMHO, this stuff is tricky!
Modified:
trunk/web/js/treeView.js
Modified: trunk/web/js/treeView.js
==============================================================================
--- trunk/web/js/treeView.js Thu Oct 15 00:02:27 2009 (r3750)
+++ trunk/web/js/treeView.js Thu Oct 15 06:57:32 2009 (r3751)
@@ -21,7 +21,7 @@
textNode.highlight();
}
- if (Qubit.treeView.draggable && !textNode.parent.isRoot())
+ if (Qubit.treeView.draggable)
{
var dd = new YAHOO.util.DDProxy(textNode.labelElId);
@@ -35,6 +35,7 @@
if (parentNode.contentElId == newParent.contentElId)
{
+ $('#' + id).css('font-weight', 'normal');
return false;
}
@@ -63,15 +64,10 @@
dd.invalidHandleTypes = {};
});
- if (newParent.expanded || newParent.isLeaf)
+ if (newParent.expanded)
{
textNode.appendTo(newParent);
- if (newParent.isLeaf)
- {
- newParent.isLeaf = false;
- }
-
newParent.refresh();
$('.ygtvlabel', '#' +
newParent.getChildrenElId()).each(function ()
@@ -85,6 +81,11 @@
dd.invalidHandleTypes = {};
});
}
+ else if (newParent.isLeaf)
+ {
+ newParent.isLeaf = false;
+ newParent.refresh();
+ }
if (textNode.highlightState > 0)
{
@@ -136,7 +137,7 @@
var textNode = new YAHOO.widget.TextNode(data[i], node, false);
textNode.isLeaf = data[i].isLeaf;
- if (Qubit.treeView.draggable && !textNode.parent.isRoot())
+ if (Qubit.treeView.draggable)
{
var dd = new YAHOO.util.DDProxy(textNode.labelElId);
@@ -150,6 +151,7 @@
if (newParent.contentElId == node.contentElId)
{
+ $('#' + id).css('font-weight', 'normal');
return false;
}
@@ -178,15 +180,10 @@
dd.invalidHandleTypes = {};
});
- if (newParent.expanded || newParent.isLeaf)
+ if (newParent.expanded)
{
textNode.appendTo(newParent);
- if (newParent.isLeaf)
- {
- newParent.isLeaf = false;
- }
-
newParent.refresh();
$('.ygtvlabel', '#' +
newParent.getChildrenElId()).each(function ()
@@ -200,6 +197,10 @@
dd.invalidHandleTypes = {};
});
}
+ else if (newParent.isLeaf)
+ {
+ newParent.isLeaf = false;
+ }
if (textNode.highlightState > 0)
{
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
