Changeset 594

Timestamp:

01/31/06 13:21:26 (3 years ago)

Author:

therve@gmail.com

Message:

Small updates, remove outhover, correct onhover problem, doc and sample

Files:

• mochikit/branches/scriptaculous/MochiKit/Controls.js (modified) (1 diff)
• mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js (modified) (3 diffs)
• mochikit/branches/scriptaculous/MochiKit/New.js (modified) (1 diff)
• mochikit/branches/scriptaculous/MochiKit/Sortable.js (modified) (1 diff)
• mochikit/branches/scriptaculous/doc/rst/MochiKit/DragAndDrop.rst (modified) (2 diffs)
• mochikit/branches/scriptaculous/examples/simple_dnd/index.html (modified) (2 diffs)

mochikit/branches/scriptaculous/MochiKit/Controls.js

@@ -40 +40 @@
-MochiKit.Base.update(MochiKit.Base, {
-    ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
+
+    flatten: function (array) {
+        return MochiKit.Base.map(function (item) {
+            if (item.constructor == Array) {
+                return MochiKit.Base.flatten(item);
+            } else {
+                return item;
+            }
+        }, array);
+    },
+
-
-    stripScripts: function (str) {

mochikit/branches/scriptaculous/MochiKit/DragAndDrop.js

@@ -194 +194 @@
-        }
-
-        if (this.options.accept) {
-            this.options.accept = MochiKit.Base.flatten([this.options.accept]);
-        }
-
-        MochiKit.DOM.makePositioned(this.element); // fix IE
-
@@ -237 +233 @@
-                                            this.options.hoverclass);
-        }
-outhover
-outhover(this.element
+hoverfunc
+hoverfunc(this.element, false
-        }
-        MochiKit.DragAndDrop.Droppables.last_active = null;
@@ -251 +247 @@
-        if (this.options.hoverclass) {
-            MochiKit.DOM.addElementClass(this.element, this.options.hoverclass);
+        }
+        if (this.options.hoverfunc) {
+            this.options.hoverfunc(this.element, true);
-        }
-        MochiKit.DragAndDrop.Droppables.last_active = this;

mochikit/branches/scriptaculous/MochiKit/New.js

@@ -18 +18 @@
-        }
-        return camelizedString;
-    },
-
-    flatten: function (array) {
-        return MochiKit.Base.map(function (item) {
-            if (item.constructor == Array) {
-                return MochiKit.Base.flatten(item);
-            } else {
-                return item;
-            }
-        }, array);
-    },
-

mochikit/branches/scriptaculous/MochiKit/Sortable.js

@@ -194 +194 @@
-        });
-
-MochiKit.Base.flatten(elements)
+elements
-    },
-

mochikit/branches/scriptaculous/doc/rst/MochiKit/DragAndDrop.rst

@@ -35 +35 @@
-- :mochiref:`MochiKit.Color`
-- :mochiref:`MochiKit.Effect`
+- :mochiref:`MochiKit.Signal`
-
-Overview
@@ -83 +84 @@
-    containment   ``null``
-    accept        ``null``
-outhover 
+hoverfunc
-    onhover       ``null``
-    onactive      ``null``

mochikit/branches/scriptaculous/examples/simple_dnd/index.html

@@ -34 +34 @@
-    <!--
-    var saveTxt = "";
-
-saveTxt = element.childNodes[0].nodeValue;
-element.childNodes[0].nodeValue = "Please drop on me!"
-}
-outHoverFunc = function (element)
+, onhover
+if (onhover) {
+    saveTxt = element.childNodes[0].nodeValue
+        element.childNodes[0].nodeValue = "Please drop on me!"
+    } else
-        element.childNodes[0].nodeValue = saveTxt;
+        }
-    };
-    onActiveFunc = function (element, dragElt) {
@@ -70 +71 @@
-    new MochiKit.DragAndDrop.Droppable('drop-2', {'ondrop': ondrop, 'hoverclass': 'drop-hover'});
-    new MochiKit.DragAndDrop.Droppable('drop-3', {'ondrop': ondrop, 'activeclass': 'drop-active'});
-onhover': onHoverFunc, 'outhover': out
+hoverfunc': on
-    new MochiKit.DragAndDrop.Droppable('drop-5', {'ondrop': ondrop, 'onactive': onActiveFunc, 'ondesactive': onDesactiveFunc});
-    new MochiKit.DragAndDrop.Droppable('drop-6', {'ondrop': ondrop, 'transparent': true});