Ticket #192: oncontent_192.diff

Signal.js

@@ -68 +68 @@
-            ', type(): ' + repr(this.type()) +
-            ', target(): ' + repr(this.target());
-
- 
+
-            this.type().indexOf('key') === 0 ||
-            this.type().indexOf('mouse') === 0 ||
-            this.type().indexOf('click') != -1 ||
@@ -607 +607 @@
-
-    },
-
+    _domContentLoadedCalled: false,
+
+    _onContentLoaded: function (evt) {
+        var self = MochiKit.Signal;
+
+        if (self._domContentLoadedCalled) {
+            return;
+        }
+        self._domContentLoadedCalled = true;
+        var observers = self._observers;
+        for (var i = 0; i < observers.length; i++) {
+            if (observers[i][1] == "ondomcontentloaded") {
+                try {
+                    observers[i][2].apply(observers[i][0], []);
+                } catch (e) {
+                    // pass
+                }
+            }
+        }
+    },
+
+    _domContentLoadedAdded: false,
+
+    _addOnContentLoaded: function () {
+        var self = MochiKit.Signal;
+
+        if (self._domContentLoadedAdded) {
+            return;
+        }
+        self._domContentLoadedAdded = true;
+
+        if (/MSIE/i.test(navigator.userAgent)) {
+            document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
+            var script = document.getElementById("__ie_onload");
+            script.onreadystatechange = function () {
+                if (this.readyState == "complete") {
+                    self._onContentLoaded();
+                }
+            };
+        } else if (/WebKit|Khtml/i.test(navigator.userAgent) || (window.opera && parseInt(window.opera.version()) < 9)) {
+            var _timer = setInterval(function () {
+                if (/loaded|complete/.test(document.readyState)) {
+                    clearInterval(_timer);
+                    self._onContentLoaded();
+                }
+            }, 10);
+        } else {
+            document.addEventListener("DOMContentLoaded", self._onContentLoaded, false);
+        }
+    },
+
-    /** @id MochiKit.Signal.connect */
-    connect: function (src, sig, objOrFunc/* optional */, funcOrStr) {
-        src = MochiKit.DOM.getElement(src);
@@ -636 +687 @@
-            var listener = self._listener(src, func, obj, isDOM);
-        }
-
-
+
+
+
-            src.addEventListener(sig.substr(2), listener, false);
-        } else if (src.attachEvent) {
-            src.attachEvent(sig, listener); // useCapture unsupported