[KSS-checkins] r37469 - in kukit/kss.core/trunk/kss/core: . plugins/draganddrop/browser plugins/effects/browser

[reebalazs at codespeak.net]

Author: reebalazs
Date: Sun Jan 28 15:30:58 2007
New Revision: 37469

Modified:
   kukit/kss.core/trunk/kss/core/concatresource.zcml
   kukit/kss.core/trunk/kss/core/plugins/draganddrop/browser/kss_dragdrop.js
   kukit/kss.core/trunk/kss/core/plugins/effects/browser/plugin.js
Log:
Merge in gotcha-late-binding branch :r36464

Modified: kukit/kss.core/trunk/kss/core/concatresource.zcml
==============================================================================
--- kukit/kss.core/trunk/kss/core/concatresource.zcml	(original)
+++ kukit/kss.core/trunk/kss/core/concatresource.zcml	Sun Jan 28 15:30:58 2007
@@ -4,8 +4,8 @@
  
   <browser:concatresource
     files="kukit/kukit/utils.js
+        kukit/kukit/errors.js
         kukit/kukit/oper.js
-        kukit/kukit/requestmanager.js
         kukit/kukit/kukit.js
         kukit/kukit/tokenizer.js
         kukit/kukit/resourcedata.js
@@ -14,18 +14,20 @@
         kukit/kukit/actionreg.js
         kukit/kukit/dom.js
         kukit/kukit/commandreg.js
+        kukit/kukit/serveraction.js
+        kukit/kukit/requestmanager.js
+        kukit/kukit/commandprocessor.js
         kukit/kukit/selectorreg.js
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit.js"
-      compress_level="safe"
-
+    compress_level="safe"
   />
  
   <browser:concatresource
     files="kukit/kukit/utils.js
+        kukit/kukit/errors.js
         kukit/kukit/oper.js
-        kukit/kukit/requestmanager.js
         kukit/kukit/kukit.js
         kukit/kukit/tokenizer.js
         kukit/kukit/resourcedata.js
@@ -34,12 +36,14 @@
         kukit/kukit/actionreg.js
         kukit/kukit/dom.js
         kukit/kukit/commandreg.js
+        kukit/kukit/serveraction.js
+        kukit/kukit/requestmanager.js
+        kukit/kukit/commandprocessor.js
         kukit/kukit/selectorreg.js
         kukit/kukit/forms.js
         kukit/kukit/plugin.js"
     name="kukit-src.js"
-      compress_level="none"
-
+    compress_level="none"
   />
   
   <!--

Modified: kukit/kss.core/trunk/kss/core/plugins/draganddrop/browser/kss_dragdrop.js
==============================================================================
--- kukit/kss.core/trunk/kss/core/plugins/draganddrop/browser/kss_dragdrop.js	(original)
+++ kukit/kss.core/trunk/kss/core/plugins/draganddrop/browser/kss_dragdrop.js	Sun Jan 28 15:30:58 2007
@@ -1,34 +1,24 @@
 kukit.draganddrop = {};
 
 kukit.draganddrop.DragAndDropEvent = function() {
-    this.boundDraggables = [];
-    this.boundDroppables = [];
 };
 
-kukit.draganddrop.DragAndDropEvent.prototype.isNotBoundDraggable = function(node) {
-    for (var index = 0; index < this.boundDraggables.length; index += 1) {
-        if (node == this.boundDraggables[index]) {
-            return false;
-        }
-    }
-    return true;
+kukit.draganddrop.DragAndDropEvent.prototype.isNotBoundDraggable = function(oper) {
+    return ! (oper.getBindingForNode(this, 'drop', oper.node) || 
+           oper.getBindingForNode(this, 'hover', oper.node));
 };
 
-kukit.draganddrop.DragAndDropEvent.prototype.isNotBoundDroppable = function(node) {
-    for (var index = 0; index < this.boundDroppables.length; index += 1) {
-        if (node == this.boundDroppables[index]) {
-            return false;
-        }
-    }
-    return true
+kukit.draganddrop.DragAndDropEvent.prototype.isNotBoundDroppable = function(oper) {
+    return ! (oper.getBindingForNode(this, 'drag', oper.node) || 
+           oper.getBindingForNode(this, 'start', oper.node) || 
+           oper.getBindingForNode(this, 'end', oper.node));
 };
 
 kukit.draganddrop.DragAndDropEvent.prototype.__bind_drop__ = function(name, func_to_bind, oper) {
     // validate and set parameters
     oper.completeParms([], {}, 'dad-drop event binding');
     self = this;
-    if (this.isNotBoundDroppable(oper.node)) {
-        this.boundDroppables.push(oper.node);
+    if (this.isNotBoundDroppable(oper)) {
         var options = {
             onDrop : this.__make_func_to_bind__('drop', oper.node),
             onHover: this.__make_func_to_bind__('hover', oper.node)
@@ -41,8 +31,7 @@
 kukit.draganddrop.DragAndDropEvent.prototype.__bind_drag__ = function(name, func_to_bind, oper) {
     // validate and set parameters
     oper.completeParms([], {}, 'dad-drag event binding');
-    if (this.isNotBoundDraggable(oper.node)) {
-        this.boundDraggables.push(oper.node);
+    if (this.isNotBoundDraggable(oper)) {
         var options = {
             onDrag : this.__make_func_to_bind__('drag', oper.node),
             onStart : this.__make_func_to_bind__('start', oper.node),
@@ -53,8 +42,8 @@
     }
 };
 
-kukit.er.eventRegistry.register('dad', 'drop', kukit.draganddrop.DragAndDropEvent, '__bind_drop__', null);
-kukit.er.eventRegistry.register('dad', 'hover', kukit.draganddrop.DragAndDropEvent, '__bind_drop__', null);
-kukit.er.eventRegistry.register('dad', 'drag', kukit.draganddrop.DragAndDropEvent, '__bind_drag__', null);
-kukit.er.eventRegistry.register('dad', 'start', kukit.draganddrop.DragAndDropEvent, '__bind_drag__', null);
-kukit.er.eventRegistry.register('dad', 'end', kukit.draganddrop.DragAndDropEvent, '__bind_drag__', null);
+kukit.eventsGlobalRegistry.register('dad', 'drop', kukit.draganddrop.DragAndDropEvent, '__bind_drop__', null);
+kukit.eventsGlobalRegistry.register('dad', 'hover', kukit.draganddrop.DragAndDropEvent, '__bind_drop__', null);
+kukit.eventsGlobalRegistry.register('dad', 'drag', kukit.draganddrop.DragAndDropEvent, '__bind_drag__', null);
+kukit.eventsGlobalRegistry.register('dad', 'start', kukit.draganddrop.DragAndDropEvent, '__bind_drag__', null);
+kukit.eventsGlobalRegistry.register('dad', 'end', kukit.draganddrop.DragAndDropEvent, '__bind_drag__', null);

Modified: kukit/kss.core/trunk/kss/core/plugins/effects/browser/plugin.js
==============================================================================
--- kukit/kss.core/trunk/kss/core/plugins/effects/browser/plugin.js	(original)
+++ kukit/kss.core/trunk/kss/core/plugins/effects/browser/plugin.js	Sun Jan 28 15:30:58 2007
@@ -9,7 +9,7 @@
 }
 
 if (kukit.HASEFFECTS) {
-    kukit.ar.actionRegistry.register("effect", function (oper) {
+    kukit.actionsGlobalRegistry.register("effect", function (oper) {
         oper.completeParms([], {'type': 'fade'}, 'scriptaculous effect');
         var node = oper.node;
         if (oper.parms.type == 'fade') {
@@ -25,7 +25,7 @@
         }
     });
 
-    kukit.cr.commandRegistry.registerFromAction('effect', kukit.cr.makeSelectorCommand);
+    kukit.commandsGlobalRegistry.registerFromAction('effect', kukit.cr.makeSelectorCommand);
 
     // This is terrible. We needed to copy this part
     // from prototype. Notice that I put this.$ =