Changeset 4242

Timestamp:

12/19/07 21:46:56 (1 year ago)

Author:

joern.zaefferer

Message:

perfected focusin event, thanks to Aaron and Brandon

Location:

trunk/plugins/validate

Files:

• lib/jquery.js (modified) (8 diffs)
• test/events.html (modified) (1 diff)
• test/jquery.delegate.js (added)

trunk/plugins/validate/lib/jquery.js

@@ -1 +1 @@
 (function(){
 /*
- * jQuery 1.2.2-pre - New Wave Javascript
+ * jQuery 1.2.2pre - New Wave Javascript
  *
  * Copyright (c) 2007 John Resig (jquery.com)
@@ -7 +7 @@
  * and GPL (GPL-LICENSE.txt) licenses.
  *
- * $Date: 2007-12-18 18:19:33 +0100 (Di, 18 Dez 2007) $
- * $Rev: 4220 $
+ * $Date: 2007-12-19 19:23:46 +0100 (Mi, 19 Dez 2007) $
+ * $Rev: 4236 $
  */
 
@@ -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 
@@ -3281 +3289 @@
         
             // 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 +3320 @@
 
     function border(elem) {
-        add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+        add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
     }
 

trunk/plugins/validate/test/events.html

@@ -7 +7 @@
 <link rel="stylesheet" type="text/css" media="screen" href="css/screen.css" />
 <script src="../lib/jquery.js" type="text/javascript"></script>
+<script src="jquery.delegate.js" type="text/javascript"></script>
 <script src="firebug/firebug.js" type="text/javascript"></script>
 
 <script type="text/javascript">
 $().ready(function() {
-    jQuery.event.special.focusin = {
-        setup: function() {
-            if ($.browser.msie)
-                return false;
-            this.addEventListener("focus", jQuery.event.special.focusin.handler, true);
-        },
-        teardown: function() {
-            if ($.browser.msie)
-                return false;
-            this.removeEventListener("focus", jQuery.event.special.focusin.handler, true);
-        },
-        handler: function(event) {
-            var args = Array.prototype.slice.call( arguments, 1 );
-            args.unshift(jQuery.extend({}, event, { type: "focusin" }));
-            return jQuery.event.handle.apply(this, args);
-        }
-    }
-    
-    function handler(event) {
-        var target = $(event.target);
-        if (target.is(":text, textarea")) {
-            target.addClass("focus").one("blur", function() {
-                $(this).removeClass("focus");
-            });
-        }
-    }
-    $("#commentForm").bind("focusin", handler);
+    $("#commentForm").delegate("focusin", ":text, textarea", function() {
+        this.addClass("focus").one("blur", function() {
+            $(this).removeClass("focus");
+        });
+    });
     $("#remove").click(function() {
         $("#commentForm").unbind("focusin");