Changeset 4252

Timestamp:

12/20/07 14:14:24 (9 months ago)

Author:

brandon.aaron

Message:

Updating live query

Location:

trunk/plugins/livequery

Files:

• ChangeLog.txt (modified) (1 diff)
• test/jquery.js (modified) (11 diffs)

trunk/plugins/livequery/ChangeLog.txt

@@ -1 @@
-== New and Noteworthy ==
+== Live Query ChangeLog ==
+
+== 1.0.2 ==
+
+* Updated to work with jQuery 1.2.2
 
 == 1.0.1 ==

trunk/plugins/livequery/test/jquery.js

@@ -1 +1 @@
 (function(){
 /*
- * jQuery 1.2.2b - New Wave Javascript
+ * jQuery 1.2.2-pre - New Wave Javascript
  *
  * Copyright (c) 2007 John Resig (jquery.com)
@@ -7 +7 @@
  * and GPL (GPL-LICENSE.txt) licenses.
  *
- * $Date: 2007-12-18 11:19:33 -0600 (Tue, 18 Dec 2007) $
- * $Rev: 4220 $
+ * $Date: 2007-12-20 07:36:56 -0600 (Thu, 20 Dec 2007) $
+ * $Rev: 4251 $
  */
 
@@ -102 +102 @@
     
     // The current version of jQuery being used
-    jquery: "1.2.2b",
+    jquery: "@VERSION",
 
     // The number of elements contained in the matched element set
@@ -500 +500 @@
             jQuery.each(elems, function(){
                 var elem = clone ?
-                    this.cloneNode( true ) :
+                    jQuery( this ).clone( true )[0] :
                     this;
 
@@ -800 +800 @@
                 jQuery.swap( elem, props, getWH );
             
-            return val;
+            return Math.max(0, val);
         }
         
@@ -1489 +1489 @@
                     r = [];
 
-                    nodeName = m[2].toUpperCase(), merge = {};
+                    var merge = {};
+                    nodeName = m[2].toUpperCase();
                     m = m[1];
 
@@ -1893 +1894 @@
         if ( events ) {
             // Unbind all events for the element
-            if ( !types )
+            if ( types == undefined )
                 for ( var type in events )
                     this.remove( elem, type );
@@ -2054 +2055 @@
 
     fix: function(event) {
+        // Short-circuit if the event has already been fixed by jQuery.event.fix
+        if ( event[ expando ] )
+            return event;
+            
         // store a copy of the original event object 
         // and clone to set read-only properties
         var originalEvent = event;
         event = jQuery.extend({}, originalEvent);
+        
+        // Mark the event as fixed by jQuery.event.fix
+        event[ expando ] = true;
         
         // add preventDefault and stopPropagation since 
@@ -2273 +2281 @@
     readyBound = true;
 
-    // Mozilla, Opera and webkit nightlies currently support this event
-    if ( document.addEventListener )
+    // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
+    if ( document.addEventListener && !jQuery.browser.opera)
         // Use the handy event callback
         document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
     
-    // If Safari or IE is used
+    // If IE is used and is not in a frame
     // Continually check to see if the document is ready
-    if (jQuery.browser.msie || jQuery.browser.safari ) (function(){
+    if ( jQuery.browser.msie && window == top ) (function(){
+        if (jQuery.isReady) return;
         try {
             // If IE is used, use the trick by Diego Perini
             // http://javascript.nwbox.com/IEContentLoaded/
-            if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" )
-                document.documentElement.doScroll("left");
+            document.documentElement.doScroll("left");
         } catch( error ) {
-            return setTimeout( arguments.callee, 0 );
-        }
-
+            setTimeout( arguments.callee, 0 );
+            return;
+        }
         // and execute any waiting functions
         jQuery.ready();
     })();
+
+    if ( jQuery.browser.opera )
+        document.addEventListener( "DOMContentLoaded", function () {
+            if (jQuery.isReady) return;
+            for (var i = 0; i < document.styleSheets.length; i++)
+                if (document.styleSheets[i].disabled) {
+                    setTimeout( arguments.callee, 0 );
+                    return;
+                }
+            // and execute any waiting functions
+            jQuery.ready();
+        }, false);
+
+    if ( jQuery.browser.safari ) {
+        var numStyles;
+        (function(){
+            if (jQuery.isReady) return;
+            if ( document.readyState != "loaded" && document.readyState != "complete" ) {
+                setTimeout( arguments.callee, 0 );
+                return;
+            }
+            if ( numStyles === undefined )
+                numStyles = jQuery("style, link[rel=stylesheet]").length;
+            if ( document.styleSheets.length != numStyles ) {
+                setTimeout( arguments.callee, 0 );
+                return;
+            }
+            // and execute any waiting functions
+            jQuery.ready();
+        })();
+    }
 
     // A fallback to window.onload, that will always work
@@ -3281 +3320 @@
         
             // Get parent scroll offsets
-            while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
+            while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
                 // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
                 if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
@@ -3312 +3351 @@
 
     function border(elem) {
-        add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+        add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
     }