Changeset 4187

Timestamp:

12/16/07 17:15:27 (1 year ago)

Author:

joern.zaefferer

Message:

fix for strict warnings

Location:

trunk/plugins

Files:

• ajaxQueue/jquery.ajaxQueue.js (modified) (1 diff)
• ajaxQueue/test/index.html (modified) (1 diff)
• ajaxQueue/test/jquery.js (added)
• ajaxQueue/test/testrunner.js (modified) (4 diffs)
• metadata/jquery.metadata.js (modified) (1 diff)
• metadata/test/jquery.js (modified) (87 diffs)

trunk/plugins/ajaxQueue/jquery.ajaxQueue.js

@@ -77 +77 @@
                 ajax( settings );
             });
-            return;
+            return undefined;
         case "sync":
             var pos = synced.length;

trunk/plugins/ajaxQueue/test/index.html

@@ -6 +6 @@
     
     <link rel="stylesheet" href="testsuite.css"/>
-    <script type="text/javascript" src="../../../jquery/dist/jquery.js"></script>
+    <script type="text/javascript" src="jquery.js"></script>
     <script type="text/javascript" src="../jquery.ajaxQueue.js"></script>
-    <script type="text/javascript" src="../../../jquery/test/data/testrunner.js"></script>
+    <script type="text/javascript" src="testrunner.js"></script>
     <script type="text/javascript" src="test.js"></script>
     <style type="text/css">

trunk/plugins/ajaxQueue/test/testrunner.js

@@ -75 +75 @@
         
     var filter = location.search.slice(1);
-    if ( filter && encodeURIComponent(name) != filter )
+    if ( filter && encodeURIComponent(name).indexOf(filter) == -1 )
         return;
         
@@ -89 +89 @@
             }
             _config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e ] );
-            throw e;
         }
     });
@@ -163 +162 @@
  */
 function reset() {
-    document.getElementById('main').innerHTML = _config.fixture;
+    $("#main").html( _config.fixture );
 }
 
@@ -275 +274 @@
  * @example equals( "Expected 2 characters.", v.formatMessage("Expected {0} characters.", 2) );
  *
+ * @param Object actual
  * @param Object expected
- * @param Object actual
  * @param String message (optional)
  */

trunk/plugins/metadata/jquery.metadata.js

@@ -85 +85 @@
                     data = m[1];
             } else if ( settings.type == "elem" ) {
-                if( !elem.getElementsByTagName ) return;
+                if( !elem.getElementsByTagName )
+                    return undefined;
                 var e = elem.getElementsByTagName(settings.name);
                 if ( e.length )

trunk/plugins/metadata/test/jquery.js

@@ -1 +1 @@
 (function(){
 /*
- * jQuery @VERSION - 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-10-01 22:15:20 +0200 (Mo, 01 Okt 2007) $
- * $Rev: 3501 $
+ * $Date: 2007-12-16 02:03:50 +0100 (Son, 16 Dez 2007) $
+ * $Rev: 4171 $
  */
 
 // Map over jQuery in case of overwrite
-if ( typeof jQuery != "undefined" )
-    var _jQuery = jQuery;
+if ( window.jQuery )
+    var _jQuery = window.jQuery;
 
 var jQuery = window.jQuery = function( selector, context ) {
-    // If the context is a namespace object, return a new object
-    return this instanceof jQuery ?
-        this.init( selector, context ) :
-        new jQuery( selector, context );
+    // The jQuery object is actually just the init constructor 'enhanced'
+    return new jQuery.prototype.init( selector, context );
 };
 
 // Map over the $ in case of overwrite
-if ( typeof $ != "undefined" )
-    var _$ = $;
+if ( window.$ )
+    var _$ = window.$;
     
 // Map the jQuery namespace to the '$' one
@@ -32 +30 @@
 // (both of which we optimize for)
 var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
+
+// Is it a simple selector
+var isSimple = /^.[^:#\[\.]*$/;
 
 jQuery.fn = jQuery.prototype = {
@@ -38 +39 @@
         selector = selector || document;
 
+        // Handle $(DOMElement)
+        if ( selector.nodeType ) {
+            this[0] = selector;
+            this.length = 1;
+            return this;
+
         // Handle HTML strings
-        if ( typeof selector  == "string" ) {
+        } else if ( typeof selector == "string" ) {
             // Are we dealing with HTML string or an ID?
             var match = quickExpr.exec( selector );
@@ -190 +197 @@
 
     css: function( key, value ) {
+        // ignore negative width and height values
+        if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+            value = undefined;
         return this.attr( key, value, "curCSS" );
     },
@@ -195 +205 @@
     text: function( text ) {
         if ( typeof text != "object" && text != null )
-            return this.empty().append( document.createTextNode( text ) );
+            return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
 
         var ret = "";
@@ -244 +254 @@
     append: function() {
         return this.domManip(arguments, true, false, function(elem){
-            this.appendChild( elem );
+            if (this.nodeType == 1)
+                this.appendChild( elem );
         });
     },
@@ -250 +261 @@
     prepend: function() {
         return this.domManip(arguments, true, true, function(elem){
-            this.insertBefore( elem, this.firstChild );
+            if (this.nodeType == 1)
+                this.insertBefore( elem, this.firstChild );
         });
     },
@@ -283 +295 @@
         // Do the clone
         var ret = this.map(function(){
-            return this.outerHTML ?
-                jQuery( this.outerHTML )[0] :
-                this.cloneNode( true );
+            if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
+                // IE copies events bound via attachEvent when
+                // using cloneNode. Calling detachEvent on the
+                // clone will also remove the events from the orignal
+                // In order to get around this, we use innerHTML.
+                // Unfortunately, this means some modifications to 
+                // attributes in IE that are actually only stored 
+                // as properties will not be copied (such as the
+                // the name attribute on an input).
+                var clone = this.cloneNode(true),
+                    container = document.createElement("div"),
+                    container2 = document.createElement("div");
+                container.appendChild(clone);
+                container2.innerHTML = container.innerHTML;
+                return container2.firstChild;
+            } else
+                return this.cloneNode(true);
         });
 
@@ -321 +347 @@
 
     not: function( selector ) {
-        return this.pushStack(
-            selector.constructor == String &&
-            jQuery.multiFilter( selector, this, true ) ||
-
-            jQuery.grep(this, function(elem) {
-                return selector.constructor == Array || selector.jquery ?
-                    jQuery.inArray( elem, selector ) < 0 :
-                    elem != selector;
-            }) );
+        if ( selector.constructor == String )
+            // test special case where just one selector is passed in
+            if ( isSimple.test( selector ) )
+                return this.pushStack( jQuery.multiFilter( selector, this, true ) );
+            else
+                selector = jQuery.multiFilter( selector, this );
+
+        return this.filter(function() {
+            return jQuery.inArray( this, selector ) < 0;
+        });
     },
 
     add: function( selector ) {
-        return this.pushStack( jQuery.merge( this.get(), jQuery( selector ) ) );
+        return !selector ? this : this.pushStack( jQuery.merge( 
+            this.get(),
+            selector.constructor == String ? 
+                jQuery( selector ).get() :
+                selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ?
+                    selector : [selector] ) );
     },
 
@@ -351 +383 @@
             if ( this.length ) {
                 var elem = this[0];
-                
+
                 // We need to handle select boxes special
                 if ( jQuery.nodeName( elem, "select" ) ) {
@@ -384 +416 @@
                 // Everything else, we just grab the value
                 } else
-                    return this[0].value.replace(/\r/g, "");
-
-            }
-
-        } else
-            return this.each(function(){
-                if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
-                    this.checked = (jQuery.inArray(this.value, value) >= 0 ||
-                        jQuery.inArray(this.name, value) >= 0);
-
-                else if ( jQuery.nodeName( this, "select" ) ) {
-                    var values = value.constructor == Array ?
-                        value :
-                        [ value ];
-
-                    jQuery( "option", this ).each(function(){
-                        this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
-                            jQuery.inArray( this.text, values ) >= 0);
-                    });
-
-                    if ( !tmp.length )
-                        this.selectedIndex = -1;
-
-                } else
-                    this.value = value;
-            });
+                    return (this[0].value || "").replace(/\r/g, "");
+
+            }
+
+        }
+
+        return this.each(function(){
+            if ( this.nodeType != 1 )
+                return;
+
+            if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
+                this.checked = (jQuery.inArray(this.value, value) >= 0 ||
+                    jQuery.inArray(this.name, value) >= 0);
+
+            else if ( jQuery.nodeName( this, "select" ) ) {
+                var values = value.constructor == Array ?
+                    value :
+                    [ value ];
+
+                jQuery( "option", this ).each(function(){
+                    this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
+                        jQuery.inArray( this.text, values ) >= 0);
+                });
+
+                if ( !values.length )
+                    this.selectedIndex = -1;
+
+            } else
+                this.value = value;
+        });
     },
     
@@ -456 +492 @@
 
             if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
-                obj = this.getElementsByTagName("tbody")[0] || this.appendChild( document.createElement("tbody") );
+                obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
+
+            var scripts = jQuery( [] );
 
             jQuery.each(elems, function(){
@@ -463 +501 @@
                     this;
 
-                if ( !evalScript( 0, elem ) )
+                // execute all scripts after the elements have been injected
+                if ( jQuery.nodeName( elem, "script" ) ) {
+                    scripts = scripts.add( elem );
+                } else {
+                    // Remove any inner scripts for later evaluation
+                    if ( elem.nodeType == 1 )
+                        scripts = scripts.add( jQuery( "script", elem ).remove() );
+
+                    // Inject the elements into the document
                     callback.call( obj, elem );
+                }
             });
+
+            scripts.each( evalScript );
         });
     }
 };
 
+// Give the init function the jQuery prototype for later instantiation
+jQuery.prototype.init.prototype = jQuery.prototype;
+
 function evalScript( i, elem ) {
-    var script = jQuery.nodeName( elem, "script" );
-
-    if ( script ) {
-        if ( elem.src )
-            jQuery.ajax({
-                url: elem.src,
-                async: false,
-                dataType: "script"
-            });
-
-        else
-            jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-    
-        if ( elem.parentNode )
-            elem.parentNode.removeChild( elem );
-
-    } else if ( elem.nodeType == 1 )
-        jQuery( "script", elem ).each( evalScript );
-
-    return script;
+    if ( elem.src )
+        jQuery.ajax({
+            url: elem.src,
+            async: false,
+            dataType: "script"
+        });
+
+    else
+        jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+
+    if ( elem.parentNode )
+        elem.parentNode.removeChild( elem );
 }
 
@@ -501 +545 @@
         deep = target;
         target = arguments[1] || {};
+        // skip the boolean and the target
+        i = 2;
     }
+
+    // Handle case when target is a string or something (possible in deep copy)
+    if ( typeof target != "object" && typeof target != "function" )
+        target = {};
 
     // extend jQuery itself if only one argument is passed
@@ -515 +565 @@
             for ( var name in options ) {
                 // Prevent never-ending loop
-                if ( target == options[ name ] )
+                if ( target === options[ name ] )
                     continue;
 
                 // Recurse if we're merging object values
-                if ( deep && typeof options[ name ] == "object" && target[ name ] )
-                    jQuery.extend( target[ name ], options[ name ] );
+                if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
+                    target[ name ] = jQuery.extend( target[ name ], options[ name ] );
 
                 // Don't bring in undefined values
@@ -561 +611 @@
 
     // Evalulates a script in a global context
-    // Evaluates Async. in Safari 2 :-(
     globalEval: function( data ) {
         data = jQuery.trim( data );
@@ -693 +742 @@
         add: function( elem, classNames ) {
             jQuery.each((classNames || "").split(/\s+/), function(i, className){
-                if ( !jQuery.className.has( elem.className, className ) )
+                if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
                     elem.className += (elem.className ? " " : "") + className;
             });
@@ -700 +749 @@
         // internal only, use removeClass("class")
         remove: function( elem, classNames ) {
-            elem.className = classNames != undefined ?
-                jQuery.grep(elem.className.split(/\s+/), function(className){
-                    return !jQuery.className.has( classNames, className );  
-                }).join(" ") :
-                "";
+            if (elem.nodeType == 1)
+                elem.className = classNames != undefined ?
+                    jQuery.grep(elem.className.split(/\s+/), function(className){
+                        return !jQuery.className.has( classNames, className );  
+                    }).join(" ") :
+                    "";
         },
 
@@ -728 +778 @@
     },
 
-    css: function( elem, name ) {
-        if ( name == "height" || name == "width" ) {
-            var old = {}, height, width;
-
-            // Revert the padding and border widths to get the
-            // correct height/width values
-            jQuery.each([ "Top", "Bottom", "Right", "Left" ], function(){
-                old[ "padding" + this ] = 0;
-                old[ "border" + this + "Width" ] = 0;
-            });
-
-            // Swap out the padding/border values temporarily
-            jQuery.swap( elem, old, function() {
-
-                // If the element is visible, then the calculation is easy
-                if ( jQuery( elem ).is(":visible") ) {
-                    height = elem.offsetHeight;
-                    width = elem.offsetWidth;
-
-                // Otherwise, we need to flip out more values
-                } else {
-                    elem = jQuery( elem.cloneNode(true) )
-                        .find(":radio").removeAttr("checked").end()
-                        .css({
-                            visibility: "hidden",
-                            position: "absolute",
-                            display: "block",
-                            right: "0",
-                            left: "0"
-                        }).appendTo( elem.parentNode )[0];
-
-                    var position = jQuery.css( elem.parentNode, "position" ) || "static";
-                    if ( position == "static" )
-                        elem.parentNode.style.position = "relative";
-
-                    height = elem.clientHeight;
-                    width = elem.clientWidth;
-
-                    if ( position == "static" )
-                        elem.parentNode.style.position = "static";
-
-                    elem.parentNode.removeChild( elem );
-                }
-            });
-
-            return name == "height" ?
-                height :
-                width;
-        }
-
-        return jQuery.curCSS( elem, name );
+    css: function( elem, name, force ) {
+        if ( name == "width" || name == "height" ) {
+            var width, height, props = { position: "absolute", visibility: "hidden", display:"block" };
+        
+            function getWH() {
+                width = elem.clientWidth;
+                height = elem.clientHeight;
+            }
+        
+            if ( jQuery(elem).is(":visible") )
+                getWH();
+            else
+                jQuery.swap( elem, props, getWH );
+
+            return name == "width" ? width : height;
+        }
+        
+        return jQuery.curCSS( elem, name, force );
     },
 
@@ -843 +860 @@
                 ret = name == "display" && swap[ stack.length - 1 ] != null ?
                     "none" :
-                    document.defaultView.getComputedStyle( elem, null ).getPropertyValue( name ) || "";
+                    ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || "";
 
                 // Finally, revert the display styles back
@@ -888 +905 @@
         var ret = [];
         context = context || document;
+        // !context.createElement fails in IE with an error but returns typeof 'object'
+        if (typeof context.createElement == 'undefined') 
+            context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 
         jQuery.each(elems, function(i, elem){
@@ -911 +931 @@
                     // option or optgroup
                     !tags.indexOf("<opt") &&
-                    [ 1, "<select>", "</select>" ] ||
+                    [ 1, "<select multiple='multiple'>", "</select>" ] ||
                     
                     !tags.indexOf("<leg") &&
@@ -950 +970 @@
                         
                         // String was a bare <thead> or <tfoot>
-                        wrap[1] == "<table>" && s.indexOf("<tbody") < 0 ?
+                        wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
                             div.childNodes :
                             [];
-
-                    for ( var i = tbody.length - 1; i >= 0 ; --i )
-                        if ( jQuery.nodeName( tbody[ i ], "tbody" ) && !tbody[ i ].childNodes.length )
-                            tbody[ i ].parentNode.removeChild( tbody[ i ] );
-    
+                
+                    for ( var j = tbody.length - 1; j >= 0 ; --j )
+                        if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
+                            tbody[ j ].parentNode.removeChild( tbody[ j ] );
+                    
                     // IE completely kills leading whitespace when innerHTML is used    
                     if ( /^\s/.test( elem ) )   
                         div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-
+                
                 }
                 
@@ -982 +1002 @@
     
     attr: function( elem, name, value ) {
+        // don't set attributes on text and comment nodes
+        if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
+            return undefined;
+
         var fix = jQuery.isXMLDoc( elem ) ?
             {} :
@@ -1012 +1036 @@
                     throw "type property can't be changed";
 
-                elem.setAttribute( name, value );
+                // convert the value to a string (all browsers do this but IE) see #1070
+                elem.setAttribute( name, "" + value );
             }
 
@@ -1034 +1059 @@
                 }
     
-                return elem.filter ? 
+                return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
                     (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
                     "";
@@ -1184 +1209 @@
         selected: "selected",
         maxlength: "maxLength",
-        selectedIndex: "selectedIndex"
+        selectedIndex: "selectedIndex",
+        defaultValue: "defaultValue",
+        tagName: "tagName",
+        nodeName: "nodeName"
     }
 });
@@ -1231 +1259 @@
     removeAttr: function( name ) {
         jQuery.attr( this, name, "" );
-        this.removeAttribute( name );
+        if (this.nodeType == 1) 
+            this.removeAttribute( name );
     },
 
@@ -1248 +1277 @@
     remove: function( selector ) {
         if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {