Changeset 6503

Timestamp:

09/11/06 11:37:01 (5 years ago)

Author:

sam

Message:

Correction scDragMgr.setMode(pContainer, pMode, pMax)
pMax incorrectement reinit.

File:

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

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

@@ -1015 +1015 @@
         
         // INTERNAL drag/drop functions
-        _IsDropable : function(pDragEvent, pCatchment) {
-                return( pCatchment.fMaxLabels =-1 || scDragMgr.dragdrop.countLabels(pCatchment.fContainer) < pCatchment.fMaxLabels || pDragEvent.group.element.parentNode.fCatchment == pCatchment )
-        },
-        _onDragOver : function(pDragEvent, pCatchment) {
+        _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
@@ -1029 +1029 @@
                         vCurrentCatchment.xUpdateGui()
                 }
-                pCatchment.fContainer.appendChild(vItem)
-                vItem.fLastContainer = pCatchment.fContainer
-                pCatchment.xUpdateGui()
-                pCatchment.onDragOver()
+                this.fContainer.appendChild(vItem)
+                vItem.fLastContainer = this.fContainer
+                this.xUpdateGui()
+                this.onDragOver()
         },
         _onDragOut : function(pDragEvent) {
@@ -1042 +1042 @@
         },
         // INTERNAL - sorting algorythm
-        _onDragSort : function(pDragEvent, pCatchment) {
+        _onDragSort : function(pDragEvent) {
                 var vHelpers = scDragMgr.helpers
                 var vItem = pDragEvent.group.element
@@ -1104 +1104 @@
                 var vCatchment = scDragMgr.dragdrop.fFirstCatchments[vItem.fKey]
                 while (vCatchment != null) {
-                        if (vHelpers.isMouseInside(pDragEvent, vCatchment) && vCatchment.xIsDropable(pDragEvent, vCatchment)) {
+                        if (vHelpers.isMouseInside(pDragEvent, vCatchment) && vCatchment.xIsDropable(pDragEvent)) {
                                 vIsOutside = false
                                 break
@@ -1117 +1117 @@
 
                 // else if we are in a new catchment zone switch to the new one  
-                } else if (vItem.fLastContainer == null || vCatchment != vItem.fLastContainer.fCatchment) {
-                        vCatchment.xOnDragOver(pDragEvent, vCatchment)
+                } else if (vCatchment && (vItem.fLastContainer == null || vCatchment != vItem.fLastContainer.fCatchment)) {
+                        vCatchment.xOnDragOver(pDragEvent)
                 }
                 if (vCatchment) vCatchment.xOnDragPostProcess(pDragEvent, vCatchment)