diff options
-rw-r--r-- | jquery/jquery-1.2.6.js (renamed from jquery/jquery-1.2.5.js) | 43 | ||||
-rw-r--r-- | ui/demos/real-world/accordion-drawers/index.html | 2 | ||||
-rw-r--r-- | ui/demos/real-world/image-cropper/index.html | 2 | ||||
-rw-r--r-- | ui/demos/real-world/layout/index.html | 2 | ||||
-rw-r--r-- | ui/demos/real-world/photo-manager/index.html | 2 | ||||
-rw-r--r-- | ui/demos/real-world/product-slider/index.html | 2 | ||||
-rw-r--r-- | ui/demos/real-world/splitpane/index.html | 2 | ||||
-rw-r--r-- | ui/tests/accordion.html | 2 | ||||
-rw-r--r-- | ui/tests/all.html | 2 | ||||
-rw-r--r-- | ui/tests/autodrag.html | 2 | ||||
-rw-r--r-- | ui/tests/draggable.html | 2 | ||||
-rw-r--r-- | ui/tests/resizable.html | 2 | ||||
-rw-r--r-- | ui/tests/slider.html | 2 |
13 files changed, 36 insertions, 31 deletions
diff --git a/jquery/jquery-1.2.5.js b/jquery/jquery-1.2.6.js index f975de2ba..88e661eec 100644 --- a/jquery/jquery-1.2.5.js +++ b/jquery/jquery-1.2.6.js @@ -1,13 +1,13 @@ (function(){ /* - * jQuery 1.2.5 - New Wave Javascript + * jQuery 1.2.6 - New Wave Javascript * * Copyright (c) 2008 John Resig (jquery.com) * Dual licensed under the MIT (MIT-LICENSE.txt) * and GPL (GPL-LICENSE.txt) licenses. * - * $Date: 2008-05-20 23:14:54 -0400 (Tue, 20 May 2008) $ - * $Rev: 5651 $ + * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ + * $Rev: 5685 $ */ // Map over jQuery in case of overwrite @@ -84,7 +84,7 @@ jQuery.fn = jQuery.prototype = { }, // The current version of jQuery being used - jquery: "1.2.5", + jquery: "1.2.6", // The number of elements contained in the matched element set size: function() { @@ -402,6 +402,9 @@ jQuery.fn = jQuery.prototype = { return undefined; } + if( value.constructor == Number ) + value += ''; + return this.each(function(){ if ( this.nodeType != 1 ) return; @@ -428,7 +431,7 @@ jQuery.fn = jQuery.prototype = { html: function( value ) { return value == undefined ? - (this.length ? + (this[0] ? this[0].innerHTML : null) : this.empty().append( value ); @@ -505,9 +508,9 @@ jQuery.fn = jQuery.prototype = { this; // execute all scripts after the elements have been injected - if ( jQuery.nodeName( elem, "script" ) ) { + if ( jQuery.nodeName( elem, "script" ) ) scripts = scripts.add( elem ); - } else { + else { // Remove any inner scripts for later evaluation if ( elem.nodeType == 1 ) scripts = scripts.add( jQuery( "script", elem ).remove() ); @@ -746,14 +749,14 @@ jQuery.extend({ }, prop: function( elem, value, type, i, name ) { - // Handle executable functions - if ( jQuery.isFunction( value ) ) - value = value.call( elem, i ); + // Handle executable functions + if ( jQuery.isFunction( value ) ) + value = value.call( elem, i ); - // Handle passing in a number to a CSS property - return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? - value + "px" : - value; + // Handle passing in a number to a CSS property + return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? + value + "px" : + value; }, className: { @@ -1058,7 +1061,7 @@ jQuery.extend({ elem.parentNode.selectedIndex; // If applicable, access the attribute via the DOM 0 way - if ( notxml && !special && name in elem ) { + if ( name in elem && notxml && !special ) { if ( set ){ // We can't allow the type property to be changed (since it causes problems in IE) if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode ) @@ -1081,11 +1084,13 @@ jQuery.extend({ // convert the value to a string (all browsers do this but IE) see #1070 elem.setAttribute( name, "" + value ); - if ( msie && special && notxml ) - return elem.getAttribute( name, 2 ); - - return elem.getAttribute( name ); + var attr = msie && notxml && special + // Some attributes require a special call on IE + ? elem.getAttribute( name, 2 ) + : elem.getAttribute( name ); + // Non-existent attributes return null, we normalize to undefined + return attr === null ? undefined : attr; } // elem is actually elem.style ... set the style diff --git a/ui/demos/real-world/accordion-drawers/index.html b/ui/demos/real-world/accordion-drawers/index.html index be8a4877d..48a396472 100644 --- a/ui/demos/real-world/accordion-drawers/index.html +++ b/ui/demos/real-world/accordion-drawers/index.html @@ -149,7 +149,7 @@ blockquote, q { -->
</style>
- <script type="text/javascript" src="../../../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../../../source/ui.core.js"></script>
<script type="text/javascript" src="../../../source/ui.accordion.js"></script>
diff --git a/ui/demos/real-world/image-cropper/index.html b/ui/demos/real-world/image-cropper/index.html index af79c5265..6f00035ba 100644 --- a/ui/demos/real-world/image-cropper/index.html +++ b/ui/demos/real-world/image-cropper/index.html @@ -4,7 +4,7 @@ <meta http-equiv="Content-Language" content="en" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Image Cropper: jQuery Real-world Demo</title>
-<script type="text/javascript" src="../../../../jquery/jquery-1.2.5.js"></script>
+<script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../../../source/ui.core.js"></script>
<script type="text/javascript" src="../../../source/ui.resizable.js"></script>
<script type="text/javascript" src="../../../source/ui.draggable.js"></script>
diff --git a/ui/demos/real-world/layout/index.html b/ui/demos/real-world/layout/index.html index df4b8f9d9..c988e9c0a 100644 --- a/ui/demos/real-world/layout/index.html +++ b/ui/demos/real-world/layout/index.html @@ -77,7 +77,7 @@ </div>
<!-- jQuery Core -->
- <script type="text/javascript" src="../../../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script>
<!-- jQuery UI Base -->
<script type="text/javascript" src="../../../source/ui.core.js"></script>
diff --git a/ui/demos/real-world/photo-manager/index.html b/ui/demos/real-world/photo-manager/index.html index c494fad9b..ec6568fe3 100644 --- a/ui/demos/real-world/photo-manager/index.html +++ b/ui/demos/real-world/photo-manager/index.html @@ -8,7 +8,7 @@ <meta name="keywords" content="jquery, ui, droppables, draggables, demo" />
<meta name="description" content="Demonstration of jQuery UI Droppables and Dragables. More to come." />
- <script type="text/javascript" src="../../../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="js/jquery.livequery.js"></script>
<script type="text/javascript" src="js/jquery.blockUI.js"></script>
diff --git a/ui/demos/real-world/product-slider/index.html b/ui/demos/real-world/product-slider/index.html index c21b6f876..a6f855adc 100644 --- a/ui/demos/real-world/product-slider/index.html +++ b/ui/demos/real-world/product-slider/index.html @@ -98,7 +98,7 @@ -->
</style>
- <script type="text/javascript" src="../../../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../../../source/ui.core.js"></script>
<script type="text/javascript" src="../../../source/ui.slider.js"></script>
diff --git a/ui/demos/real-world/splitpane/index.html b/ui/demos/real-world/splitpane/index.html index 37daae631..d2f9e109e 100644 --- a/ui/demos/real-world/splitpane/index.html +++ b/ui/demos/real-world/splitpane/index.html @@ -6,7 +6,7 @@ <title>jQuery UI: SplitPane</title>
<!-- jQuery -->
- <script type="text/javascript" src="../../../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script>
<!-- jQuery UI -->
<script type="text/javascript" src="../../../source/ui.core.js"></script>
diff --git a/ui/tests/accordion.html b/ui/tests/accordion.html index 184e9e892..f2792df81 100644 --- a/ui/tests/accordion.html +++ b/ui/tests/accordion.html @@ -4,7 +4,7 @@ <title>jQuery UI Accordion Test Suite</title>
<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen">
- <script type="text/javascript" src="../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../source/ui.core.js"></script>
<script type="text/javascript" src="../source/ui.accordion.js"></script>
diff --git a/ui/tests/all.html b/ui/tests/all.html index 8c41c4aa4..4ad64b998 100644 --- a/ui/tests/all.html +++ b/ui/tests/all.html @@ -3,7 +3,7 @@ <head>
<title>jQuery UI All Tests</title>
<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen">
- <script type="text/javascript" src="../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../source/ui.core.js"></script>
<script type="text/javascript" src="../source/ui.accordion.js"></script>
diff --git a/ui/tests/autodrag.html b/ui/tests/autodrag.html index 73b92520f..05cbefd99 100644 --- a/ui/tests/autodrag.html +++ b/ui/tests/autodrag.html @@ -2,7 +2,7 @@ <html lang="en">
<head>
<title>Draggable - Automated Test Page</title>
- <script type="text/javascript" src="../../jquery/jquery-1.2.5.js"></script>
+ <script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../../ui/source/ui.core.js"></script>
<script type="text/javascript" src="../../ui/source/ui.draggable.js"></script>
diff --git a/ui/tests/draggable.html b/ui/tests/draggable.html index 629252358..6b2ab5d29 100644 --- a/ui/tests/draggable.html +++ b/ui/tests/draggable.html @@ -6,7 +6,7 @@ <title>Draggable Test Page</title>
<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen">
-<script type="text/javascript" src="../../jquery/jquery-1.2.5.js"></script>
+<script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../source/ui.core.js"></script>
<script type="text/javascript" src="../source/ui.draggable.js"></script>
diff --git a/ui/tests/resizable.html b/ui/tests/resizable.html index 735c7a298..2a97bcb82 100644 --- a/ui/tests/resizable.html +++ b/ui/tests/resizable.html @@ -6,7 +6,7 @@ <title>Resizable Test Page</title> <link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen"> -<script type="text/javascript" src="../../jquery/jquery-1.2.5.js"></script> +<script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> <script type="text/javascript" src="../source/ui.core.js"></script> <script type="text/javascript" src="../source/ui.resizable.js"></script> diff --git a/ui/tests/slider.html b/ui/tests/slider.html index 06faff73d..518a9bd98 100644 --- a/ui/tests/slider.html +++ b/ui/tests/slider.html @@ -6,7 +6,7 @@ <title>Slider Test Page</title>
<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen">
-<script type="text/javascript" src="../../jquery/jquery-1.2.5.js"></script>
+<script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script>
<script type="text/javascript" src="../source/ui.core.js"></script>
<script type="text/javascript" src="../source/ui.slider.js"></script>
|