Update to latest MochiKit so gBitThemes->isAjaxRequest() works again.

9 files changed, 65 insertions, 42 deletions

diff --git a/javascript/libs/MochiKit/Async.js b/javascript/libs/MochiKit/Async.js
index 55f4857..bb2cc5e 100644
--- a/javascript/libs/MochiKit/Async.js
+++ b/javascript/libs/MochiKit/Async.js
@@ -385,6 +385,7 @@ MochiKit.Base.update(MochiKit.Async, {
         if (req.overrideMimeType && opts.mimeType) {
             req.overrideMimeType(opts.mimeType);
         }
+        req.setRequestHeader("X-Requested-With", "XMLHttpRequest");
         if (opts.headers) {
             var headers = opts.headers;
             if (!m.isArrayLike(headers)) {
diff --git a/javascript/libs/MochiKit/Base.js b/javascript/libs/MochiKit/Base.js
index ba5d2c3..fe7b874 100644
--- a/javascript/libs/MochiKit/Base.js
+++ b/javascript/libs/MochiKit/Base.js
@@ -27,7 +27,7 @@ MochiKit.Base.VERSION = "1.4";
 MochiKit.Base.NAME = "MochiKit.Base";
 /** @id MochiKit.Base.update */
 MochiKit.Base.update = function (self, obj/*, ... */) {
-    if (self === null) {
+    if (self === null || self === undefined) {
         self = {};
     }
     for (var i = 1; i < arguments.length; i++) {
@@ -150,7 +150,7 @@ MochiKit.Base.update(MochiKit.Base, {
 
     /** @id MochiKit.Base.updatetree */
     updatetree: function (self, obj/*, ...*/) {
-        if (self === null) {
+        if (self === null || self === undefined) {
             self = {};
         }
         for (var i = 1; i < arguments.length; i++) {
@@ -171,7 +171,7 @@ MochiKit.Base.update(MochiKit.Base, {
 
     /** @id MochiKit.Base.setdefault */
     setdefault: function (self, obj/*, ...*/) {
-        if (self === null) {
+        if (self === null || self === undefined) {
             self = {};
         }
         for (var i = 1; i < arguments.length; i++) {
@@ -386,7 +386,8 @@ MochiKit.Base.update(MochiKit.Base, {
                 (typ != 'object' && !(typ == 'function' && typeof(o.item) == 'function')) ||
                 o === null ||
                 typeof(o.length) != 'number' ||
-                o.nodeType === 3
+                o.nodeType === 3 ||
+                o.nodeType === 4
             ) {
                 return false;
             }
@@ -1406,6 +1407,8 @@ if (MochiKit.__export__) {
     compare = MochiKit.Base.compare;
     compose = MochiKit.Base.compose;
     serializeJSON = MochiKit.Base.serializeJSON;
+    mean = MochiKit.Base.mean;
+    median = MochiKit.Base.median;
 }
 
 MochiKit.Base._exportSymbols(this, MochiKit.Base);
diff --git a/javascript/libs/MochiKit/DOM.js b/javascript/libs/MochiKit/DOM.js
index 02fe5bf..550d3ff 100644
--- a/javascript/libs/MochiKit/DOM.js
+++ b/javascript/libs/MochiKit/DOM.js
@@ -81,6 +81,9 @@ MochiKit.DOM.EXPORT = [
     "UL",
     "OL",
     "LI",
+	"DL",
+	"DT",
+	"DD",
     "TD",
     "TR",
     "THEAD",
@@ -370,15 +373,20 @@ MochiKit.Base.update(MochiKit.DOM, {
         if (typeof(maybeparent) == "string") {
             maybeparent = self.getElement(maybeparent);
         }
-        if (node === maybeparent) {
-            return true;
+        if (typeof(node) == 'undefined' || node === null || node === self._document) {
+            return false;
         }
-        while (node && node.tagName.toUpperCase() != "BODY") {
-            node = node.parentNode;
+        do {
             if (node === maybeparent) {
                 return true;
             }
-        }
+            var tagName = node.tagName;
+            node = node.parentNode;
+            if (!tagName) {
+                break;
+            }
+            tagName = tagName.toUpperCase();
+        } while (tagName != "BODY" && tagName != "HTML");
         return false;
     },
 
@@ -1186,6 +1194,12 @@ MochiKit.Base.update(MochiKit.DOM, {
         this.OL = createDOMFunc("ol");
         /** @id MochiKit.DOM.LI */
         this.LI = createDOMFunc("li");
+		/** @id MochiKit.DOM.DL */
+        this.DL = createDOMFunc("dl");
+		/** @id MochiKit.DOM.DT */
+        this.DT = createDOMFunc("dt");
+		/** @id MochiKit.DOM.DD */
+        this.DD = createDOMFunc("dd");
         /** @id MochiKit.DOM.TD */
         this.TD = createDOMFunc("td");
         /** @id MochiKit.DOM.TR */
diff --git a/javascript/libs/MochiKit/DragAndDrop.js b/javascript/libs/MochiKit/DragAndDrop.js
index c471ffe..6213ddc 100644
--- a/javascript/libs/MochiKit/DragAndDrop.js
+++ b/javascript/libs/MochiKit/DragAndDrop.js
@@ -216,7 +216,7 @@ MochiKit.DragAndDrop.Droppable.prototype = {
             /** @id MochiKit.DragAndDrop.containment */
             containment: [],
             tree: false
-        }, options || {});
+        }, options);
 
         // cache containers
         this.options._containers = [];
@@ -452,7 +452,7 @@ MochiKit.DragAndDrop.Draggable.prototype = {
 
             /** @id MochiKit.DragAndDrop.snap */
             snap: false
-        }, options || {});
+        }, options);
 
         var d = MochiKit.DOM;
         this.element = d.getElement(element);
@@ -605,7 +605,7 @@ MochiKit.DragAndDrop.Draggable.prototype = {
         }
 
         // fix AppleWebKit rendering
-        if (/AppleWebKit'/.test(navigator.appVersion)) {
+        if (/AppleWebKit/.test(navigator.appVersion)) {
             window.scrollBy(0, 0);
         }
         event.stop();
@@ -800,7 +800,7 @@ MochiKit.DragAndDrop.Draggable.prototype = {
             w = win.document.body.offsetWidth;
             h = win.document.body.offsetHeight;
         }
-        return {top: vp.x, left: vp.y, width: w, height: h};
+        return {top: vp.y, left: vp.x, width: w, height: h};
     },
 
     /** @id MochiKit.DragAndDrop.repr */
diff --git a/javascript/libs/MochiKit/Format.js b/javascript/libs/MochiKit/Format.js
index 937b681..27c2f6f 100644
--- a/javascript/libs/MochiKit/Format.js
+++ b/javascript/libs/MochiKit/Format.js
@@ -167,6 +167,9 @@ MochiKit.Format.twoDigitFloat = function (someFloat) {
         return s;
     }
     if (s.length < 3) {
+        if (s.length == 1) {
+            s = '0' + s;
+        }
         while (s.charAt(s.length - 1) == '0') {
             s = s.substring(0, s.length - 1);
         }
@@ -254,6 +257,7 @@ MochiKit.Format.EXPORT = [
 MochiKit.Format.LOCALE = {
     en_US: {separator: ",", decimal: ".", percent: "%"},
     de_DE: {separator: ".", decimal: ",", percent: "%"},
+    pt_BR: {separator: ".", decimal: ",", percent: "%"},
     fr_FR: {separator: " ", decimal: ",", percent: "%"},
     "default": "en_US"
 };
diff --git a/javascript/libs/MochiKit/Iter.js b/javascript/libs/MochiKit/Iter.js
index c2fcbee..3b8e095 100644
--- a/javascript/libs/MochiKit/Iter.js
+++ b/javascript/libs/MochiKit/Iter.js
@@ -771,7 +771,7 @@ MochiKit.Iter.EXPORT_OK = [
     "iteratorRegistry",
     "arrayLikeIter",
     "hasIterateNext",
-    "iterateNextIter",
+    "iterateNextIter"
 ];
 
 MochiKit.Iter.EXPORT = [
diff --git a/javascript/libs/MochiKit/Signal.js b/javascript/libs/MochiKit/Signal.js
index 8835958..de50240 100644
--- a/javascript/libs/MochiKit/Signal.js
+++ b/javascript/libs/MochiKit/Signal.js
@@ -568,7 +568,6 @@ MochiKit.Base.update(MochiKit.Signal, {
             if (sig === 'onload' || sig === 'onunload') {
                 return function (nativeEvent) {
                     func.apply(obj, [new E(src, nativeEvent)]);
-                    MochiKit.Signal.disconnect(src, sig, func);
                     
                     var ident = new MochiKit.Signal.Ident({
                         source: src, signal: sig, objOrFunc: func});
diff --git a/javascript/libs/MochiKit/Style.js b/javascript/libs/MochiKit/Style.js
index 93e7786..a7d62f8 100644
--- a/javascript/libs/MochiKit/Style.js
+++ b/javascript/libs/MochiKit/Style.js
@@ -244,6 +244,8 @@ MochiKit.Base.update(MochiKit.Style, {
                 (de.scrollTop || b.scrollTop) -
                 (de.clientTop || 0);
 
+            // Don't pass through next steps
+            return c;
         } else if (elem.offsetParent) {
             c.x += elem.offsetLeft;
             c.y += elem.offsetTop;
@@ -296,7 +298,7 @@ MochiKit.Base.update(MochiKit.Style, {
             }
             var disp = self.getStyle(parent, 'display');
             // Handle strange Opera bug for some display
-            if (disp != 'inline' && disp != 'table-row') {
+            if (disp.search(/^inline|table-row.*$/i)) {
                 c.x -= parent.scrollLeft;
                 c.y -= parent.scrollTop;
             }
diff --git a/javascript/libs/MochiKit/Visual.js b/javascript/libs/MochiKit/Visual.js
index b7d8d87..e9924c8 100644
--- a/javascript/libs/MochiKit/Visual.js
+++ b/javascript/libs/MochiKit/Visual.js
@@ -427,7 +427,7 @@ MochiKit.Visual.multiple = function (elements, effect, /* optional */options) {
     ***/
     options = MochiKit.Base.update({
         speed: 0.1, delay: 0.0
-    }, options || {});
+    }, options);
     var masterDelay = options.delay;
     var index = 0;
     MochiKit.Base.map(function (innerelement) {
@@ -457,7 +457,7 @@ MochiKit.Visual.toggle = function (element, /* optional */effect, /* optional */
     effect = (effect || 'appear').toLowerCase();
     options = MochiKit.Base.update({
         queue: {position: 'end', scope: (element.id || 'global'), limit: 1}
-    }, options || {});
+    }, options);
     var v = MochiKit.Visual;
     v[MochiKit.Style.getStyle(element, 'display') != 'none' ?
       v.PAIRS[effect][1] : v.PAIRS[effect][0]](element, options);
@@ -659,7 +659,7 @@ MochiKit.Visual.Base.prototype = {
     /** @id MochiKit.Visual.Base.prototype.start */
     start: function (options) {
         var v = MochiKit.Visual;
-        this.options = MochiKit.Base.setdefault(options || {},
+        this.options = MochiKit.Base.setdefault(options,
                                                 v.DefaultOptions);
         this.currentFrame = 0;
         this.state = 'idle';
@@ -828,7 +828,7 @@ MochiKit.Base.update(MochiKit.Visual.Opacity.prototype, {
         options = b.update({
             from: s.getStyle(this.element, 'opacity') || 0.0,
             to: 1.0
-        }, options || {});
+        }, options);
         this.start(options);
     },
 
@@ -866,7 +866,7 @@ MochiKit.Base.update(MochiKit.Visual.Move.prototype, {
             x: 0,
             y: 0,
             mode: 'relative'
-        }, options || {});
+        }, options);
         this.start(options);
     },
 
@@ -943,7 +943,7 @@ MochiKit.Base.update(MochiKit.Visual.Scale.prototype, {
             scaleMode: 'box',  // 'box' or 'contents' or {} with provided values
             scaleFrom: 100.0,
             scaleTo: percent
-        }, options || {});
+        }, options);
         this.start(options);
     },
 
@@ -1067,7 +1067,7 @@ MochiKit.Base.update(MochiKit.Visual.Highlight.prototype, {
         this.element = MochiKit.DOM.getElement(element);
         options = MochiKit.Base.update({
             startcolor: '#ffff99'
-        }, options || {});
+        }, options);
         this.start(options);
     },
 
@@ -1150,7 +1150,7 @@ MochiKit.Base.update(MochiKit.Visual.ScrollTo.prototype, {
 
     __init__: function (element, /* optional */options) {
         this.element = MochiKit.DOM.getElement(element);
-        this.start(options || {});
+        this.start(options);
     },
 
     /** @id MochiKit.Visual.ScrollTo.prototype.setup */
@@ -1207,7 +1207,7 @@ MochiKit.Base.update(MochiKit.Visual.Morph.prototype, {
 
     __init__: function (element, /* optional */options) {
         this.element = MochiKit.DOM.getElement(element);
-        this.start(options || {});
+        this.start(options);
     },
 
     /** @id MochiKit.Visual.Morph.prototype.setup */
@@ -1301,7 +1301,7 @@ MochiKit.Visual.fade = function (element, /* optional */ options) {
             s.hideElement(effect.element);
             s.setStyle(effect.element, {'opacity': oldOpacity});
         }
-    }, options || {});
+    }, options);
     return new MochiKit.Visual.Opacity(element, options);
 };
 
@@ -1328,7 +1328,7 @@ MochiKit.Visual.appear = function (element, /* optional */ options) {
             s.setStyle(effect.element, {'opacity': effect.options.from});
             s.showElement(effect.element);
         }
-    }, options || {});
+    }, options);
     return new v.Opacity(element, options);
 };
 
@@ -1360,7 +1360,7 @@ MochiKit.Visual.puff = function (element, /* optional */ options) {
         },
         scaleContent: true,
         scaleFromCenter: true
-    }, options || {});
+    }, options);
     return new v.Parallel(
         [new v.Scale(element, 200,
             {sync: true, scaleFromCenter: options.scaleFromCenter,
@@ -1387,7 +1387,7 @@ MochiKit.Visual.blindUp = function (element, /* optional */ options) {
             MochiKit.Style.hideElement(effect.element);
             d.undoClipping(effect.element, elemClip);
         }
-    }, options || {});
+    }, options);
 
     return new MochiKit.Visual.Scale(element, 0, options);
 };
@@ -1419,7 +1419,7 @@ MochiKit.Visual.blindDown = function (element, /* optional */ options) {
         afterFinishInternal: function (effect) {
             d.undoClipping(effect.element, elemClip);
         }
-    }, options || {});
+    }, options);
     return new MochiKit.Visual.Scale(element, 100, options);
 };
 
@@ -1450,7 +1450,7 @@ MochiKit.Visual.switchOff = function (element, /* optional */ options) {
             d.undoPositioned(effect.element);
             MochiKit.Style.setStyle(effect.element, {'opacity': oldOpacity});
         }
-    }, options || {});
+    }, options);
     var v = MochiKit.Visual;
     return new v.appear(element, {
         duration: 0.4,
@@ -1489,7 +1489,7 @@ MochiKit.Visual.dropOut = function (element, /* optional */ options) {
             d.undoPositioned(effect.effects[0].element);
             s.setStyle(effect.effects[0].element, oldStyle);
         }
-    }, options || {});
+    }, options);
     var v = MochiKit.Visual;
     return new v.Parallel(
         [new v.Move(element, {x: 0, y: options.distance, sync: true}),
@@ -1516,7 +1516,7 @@ MochiKit.Visual.shake = function (element, /* optional */ options) {
             d.undoPositioned(effect.element);
             s.setStyle(effect.element, oldStyle);
         }
-    }, options || {});
+    }, options);
     var oldStyle = {
         top: s.getStyle(element, 'top'),
         left: s.getStyle(element, 'left') };
@@ -1588,7 +1588,7 @@ MochiKit.Visual.slideDown = function (element, /* optional */ options) {
             s.setStyle(effect.element.firstChild,
                                   {bottom: oldInnerBottom});
         }
-    }, options || {});
+    }, options);
 
     return new MochiKit.Visual.Scale(element, 100, options);
 };
@@ -1638,7 +1638,7 @@ MochiKit.Visual.slideUp = function (element, /* optional */ options) {
             d.undoPositioned(effect.element);
             s.setStyle(effect.element.firstChild, {bottom: oldInnerBottom});
         }
-    }, options || {});
+    }, options);
     return new MochiKit.Visual.Scale(element, 0, options);
 };
 
@@ -1663,7 +1663,7 @@ MochiKit.Visual.squish = function (element, /* optional */ options) {
             MochiKit.Style.hideElement(effect.element);
             d.undoClipping(effect.element, elemClip);
         }
-    }, options || {});
+    }, options);
 
     return new MochiKit.Visual.Scale(element, /Opera/.test(navigator.userAgent) ? 1 : 0, options);
 };
@@ -1687,7 +1687,7 @@ MochiKit.Visual.grow = function (element, /* optional */ options) {
         opacityTransition: v.Transitions.full,
         scaleContent: true,
         scaleFromCenter: false
-    }, options || {});
+    }, options);
     var oldStyle = {
         top: element.style.top,
         left: element.style.left,
@@ -1738,7 +1738,7 @@ MochiKit.Visual.grow = function (element, /* optional */ options) {
             d.undoPositioned(effect.effects[0].element);
             s.setStyle(effect.effects[0].element, oldStyle);
         }
-    }, options || {});
+    }, options);
 
     return new v.Move(element, {
         x: initialMoveX,
@@ -1793,7 +1793,7 @@ MochiKit.Visual.shrink = function (element, /* optional */ options) {
         opacityTransition: v.Transitions.none,
         scaleContent: true,
         scaleFromCenter: false
-    }, options || {});
+    }, options);
     var oldStyle = {
         top: element.style.top,
         left: element.style.left,
@@ -1839,7 +1839,7 @@ MochiKit.Visual.shrink = function (element, /* optional */ options) {
             d.undoPositioned(effect.effects[0].element);
             s.setStyle(effect.effects[0].element, oldStyle);
         }
-    }, options || {});
+    }, options);
 
     return new v.Parallel(
         [new v.Opacity(element, {
@@ -1876,7 +1876,7 @@ MochiKit.Visual.pulsate = function (element, /* optional */ options) {
         afterFinishInternal: function (effect) {
             MochiKit.Style.setStyle(effect.element, {'opacity': oldOpacity});
         }
-    }, options || {});
+    }, options);
     var transition = options.transition || v.Transitions.sinoidal;
     var reverser = b.bind(function (pos) {
         return transition(1 - v.Transitions.pulse(pos, options.pulses));
@@ -1918,7 +1918,7 @@ MochiKit.Visual.fold = function (element, /* optional */ options) {
                 }
             });
         }
-    }, options || {});
+    }, options);
     return new v.Scale(element, 5, options);
 };