Changeset 12525 for trunk/themes/default/js/ui/jquery.ui.slider.js

Timestamp:

Oct 28, 2011, 3:25:54 PM (12 years ago)

Author:

patdenice

Message:

feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• trunk/themes/default/js/ui/jquery.ui.slider.js (modified) (10 diffs)

trunk/themes/default/js/ui/jquery.ui.slider.js

@@ -1 +1 @@
 /*
- * jQuery UI Slider 1.8.10
+ * jQuery UI Slider 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -37 +37 @@
         _create: function() {
                 var self = this,
-                        o = this.options;
+                        o = this.options,
+                        existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+                        handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+                        handleCount = ( o.values && o.values.length ) || 1,
+                        handles = [];
 
                 this._keySliding = false;
@@ -51 +55 @@
                                 " ui-widget" +
                                 " ui-widget-content" +
-                                " ui-corner-all" );
-                
-                if ( o.disabled ) {
-                        this.element.addClass( "ui-slider-disabled ui-disabled" );
-                }
+                                " ui-corner-all" +
+                                ( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) );
 
                 this.range = $([]);
@@ -61 +62 @@
                 if ( o.range ) {
                         if ( o.range === true ) {
-                                this.range = $( "<div></div>" );
                                 if ( !o.values ) {
                                         o.values = [ this._valueMin(), this._valueMin() ];
@@ -68 +68 @@
                                         o.values = [ o.values[0], o.values[0] ];
                                 }
-                        } else {
-                                this.range = $( "<div></div>" );
-                        }
-
-                        this.range
+                        }
+
+                        this.range = $( "<div></div>" )
                                 .appendTo( this.element )
-                                .addClass( "ui-slider-range" );
-
-                        if ( o.range === "min" || o.range === "max" ) {
-                                this.range.addClass( "ui-slider-range-" + o.range );
-                        }
-
-                        // note: this isn't the most fittingly semantic framework class for this element,
-                        // but worked best visually with a variety of themes
-                        this.range.addClass( "ui-widget-header" );
-                }
-
-                if ( $( ".ui-slider-handle", this.element ).length === 0 ) {
-                        $( "<a href='#'></a>" )
-                                .appendTo( this.element )
-                                .addClass( "ui-slider-handle" );
-                }
-
-                if ( o.values && o.values.length ) {
-                        while ( $(".ui-slider-handle", this.element).length < o.values.length ) {
-                                $( "<a href='#'></a>" )
-                                        .appendTo( this.element )
-                                        .addClass( "ui-slider-handle" );
-                        }
-                }
-
-                this.handles = $( ".ui-slider-handle", this.element )
-                        .addClass( "ui-state-default" +
-                                " ui-corner-all" );
+                                .addClass( "ui-slider-range" +
+                                // note: this isn't the most fittingly semantic framework class for this element,
+                                // but worked best visually with a variety of themes
+                                " ui-widget-header" + 
+                                ( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
+                }
+
+                for ( var i = existingHandles.length; i < handleCount; i += 1 ) {
+                        handles.push( handle );
+                }
+
+                this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( self.element ) );
 
                 this.handle = this.handles.eq( 0 );
@@ -467 +449 @@
                         this._refreshValue();
                         this._change( null, 0 );
+                        return;
                 }
 
@@ -481 +464 @@
                         this._refreshValue();
                         this._change( null, index );
+                        return;
                 }
 
@@ -519 +503 @@
                                         this.handles.filter( ".ui-state-focus" ).blur();
                                         this.handles.removeClass( "ui-state-hover" );
-                                        this.handles.attr( "disabled", "disabled" );
+                                        this.handles.propAttr( "disabled", true );
                                         this.element.addClass( "ui-disabled" );
                                 } else {
-                                        this.handles.removeAttr( "disabled" );
+                                        this.handles.propAttr( "disabled", false );
                                         this.element.removeClass( "ui-disabled" );
                                 }
@@ -593 +577 @@
                 }
                 var step = ( this.options.step > 0 ) ? this.options.step : 1,
-                        valModStep = (val - this._valueMin()) % step;
+                        valModStep = (val - this._valueMin()) % step,
                         alignValue = val - valModStep;
 
@@ -677 +661 @@
 
 $.extend( $.ui.slider, {
-        version: "1.8.10"
+        version: "1.8.16"
 });