Changeset 6524

Timestamp:

09/12/06 16:25:12 (5 years ago)

Author:

sam

Message:

Corrected dragging out algo

File:

• trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/webSiteGenerator/scDragMgr.js (modified) (8 diffs)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/webSiteGenerator/scDragMgr.js

@@ -169 +169 @@
                 var parent = item1.parentNode
                 parent.removeChild(item1)
-                parent.insertBefore(item1, item2 ? item2.nextSibling : null)
+                parent.insertBefore(item1, item2 ? scDragMgr.helpers.nextItem(item2, item2.nodeName) : null)
         },
         
@@ -724 +724 @@
         fFirstCatchments : new Array(),
         fLastCatchments : new Array(),
-        fDragContainer : document.createElement("DIV"),
 
         // EXTERNAL functions ========================================================
@@ -1018 +1017 @@
         },
 
-        // INTERNAL remove Item from current container and keep in temp storage
-        _floatItem : function(pDragEvent) {
+        // INTERNAL drag/drop functions
+        _IsDropable : function(pDragEvent) {
+                return( this.fMaxLabels == -1 || scDragMgr.dragdrop.countLabels(this.fContainer) < this.fMaxLabels || pDragEvent.group.element.parentNode.fCatchment == this )
+        },
+        _onDragOver : function(pDragEvent) {
                 var vGroup = pDragEvent.group
                 var vItem = pDragEvent.group.element
-                var vCurrentContainer = vItem.parentNode
-                var vCurrentCatchment = vCurrentContainer.fCatchment
-                vItem.fLastContainer = null
+                var vCurrentCatchment = vItem.parentNode.fCatchment
+                
                 vCurrentCatchment.onDragOut()
                 vCurrentCatchment.className = vCurrentCatchment.fInitClass
                 vCurrentCatchment.fContainer.removeChild(vItem)
                 vCurrentCatchment.xUpdateGui()
-                scDragMgr.dragdrop.fDragContainer.style["position"] = 'absolute'
-                scDragMgr.dragdrop.fDragContainer.style["top"] = '0px'
-//              scDragMgr.dragdrop.fDragContainer.className = vCurrentContainer.className
-                document.body.appendChild(scDragMgr.dragdrop.fDragContainer)
-                scDragMgr.dragdrop.fDragContainer.appendChild(vItem)
-        },
-
-        // INTERNAL remove Item from temp storage
-        _unfloatItem : function(pDragEvent) {
-                var vItem = pDragEvent.group.element
-                if (vItem.parentNode == scDragMgr.dragdrop.fDragContainer){
-                        scDragMgr.dragdrop.fDragContainer.removeChild(vItem)
-                        document.body.removeChild(scDragMgr.dragdrop.fDragContainer)
-                }
-        },
-        
-        // INTERNAL drag/drop functions
-        _IsDropable : function(pDragEvent) {
-                return( this.fMaxLabels == -1 || scDragMgr.dragdrop.countLabels(this.fContainer) < this.fMaxLabels || pDragEvent.group.element.parentNode.fCatchment == this )
-        },
-        _onDragOver : function(pDragEvent) {
-                var vGroup = pDragEvent.group
-                var vItem = pDragEvent.group.element
-                if(vItem.fLastContainer == null){
-                        scDragMgr.dragdrop._unfloatItem(pDragEvent)
-                }else{
-                        var vCurrentCatchment = vItem.parentNode.fCatchment
-                        vCurrentCatchment.onDragOut()
-                        vCurrentCatchment.className = vCurrentCatchment.fInitClass
-                        vCurrentCatchment.fContainer.removeChild(vItem)
-                        vCurrentCatchment.xUpdateGui()
-                }
                 this.fContainer.appendChild(vItem)
                 vItem.fLastContainer = this.fContainer
@@ -1068 +1037 @@
         },
         _onDragOut : function(pDragEvent) {
-                scDragMgr.dragdrop._floatItem(pDragEvent)
+                var vItem = pDragEvent.group.element
+                var vCurrentContainer = vItem.parentNode
+                var vCurrentCatchment = vCurrentContainer.fCatchment
+                
+                vCurrentCatchment.onDragOut()
+                vCurrentCatchment.className = vCurrentCatchment.fInitClass
+                vItem.fLastContainer = null
+                
+                if (vCurrentContainer != vItem.fStartContainer) {
+                        vCurrentCatchment.fContainer.removeChild(vItem)
+                        vCurrentCatchment.xUpdateGui()
+                        
+                        if (vItem.fStartPrevSibling) vItem.fStartContainer.insertBefore(vItem, vItem.fStartPrevSibling ? scDragMgr.helpers.nextItem(vItem.fStartPrevSibling, vItem.fStartPrevSibling.nodeName) : null)
+                        else if (vItem.fStartNextSibling) vItem.fStartContainer.insertBefore(vItem, vItem.fStartNextSibling)
+                        else vItem.fStartContainer.appendChild(vItem)
+                } else {
+                        if (vItem.fStartPrevSibling) scDragMgr.helpers.moveAfter(vItem, vItem.fStartPrevSibling)
+                        else if (vItem.fStartNextSibling) scDragMgr.helpers.moveBefore(vItem, vItem.fStartNextSibling)
+                }
+                vItem.fStartContainer.fCatchment.xUpdateGui()
         },
         _onDropReposition : function(pDragEvent) {
@@ -1116 +1104 @@
                 var vItem = pDragEvent.group.element
                 
-                // update all Catchment bounds, since they may have changed on a previous drag
                 var vCatchment = scDragMgr.dragdrop.fFirstCatchments[vItem.fKey]
                 while (vCatchment != null) {
@@ -1123 +1110 @@
                         vCatchment = vCatchment.fNextCatchment
                 }
-                // item starts out over current parent
                 vItem.fStartContainer = vItem.parentNode
+                vItem.fStartPrevSibling = scDragMgr.helpers.previousItem(vItem, vItem.nodeName)
+                vItem.fStartNextSibling = scDragMgr.helpers.nextItem(vItem, vItem.nodeName)
                 vItem.fLastContainer = vItem.fStartContainer
                 vItem.className = vItem.fInitClass + " " + vItem.fDragClass
@@ -1145 +1133 @@
                         vCatchment = vCatchment.fNextCatchment
                 }
-                // If we are outside all catchment zones then float the item if needed
+                // If we are outside all catchment zones then init the item position if needed
                 if (vIsOutside) {
                         if (vItem.fLastContainer != null) {
@@ -1160 +1148 @@
                 var vItem = pDragEvent.group.element
                 
-                // If we are still floated (not in any catchment zone) then restore the item to it's original container
-                if (vItem.fLastContainer == null && vItem.fStartContainer) {
-                        vItem.fStartContainer.fCatchment.xOnDragOver(pDragEvent, vItem.fStartContainer.fCatchment)
-                }
                 vItem.className = vItem.fInitClass
                 vItem.parentNode.fCatchment.onDragOut()