diff --git a/js/jquery.mobile.forms.slider.js b/js/jquery.mobile.forms.slider.js old mode 100644 new mode 100755 index 9195fca14a1..b4a20eb6fdd --- a/js/jquery.mobile.forms.slider.js +++ b/js/jquery.mobile.forms.slider.js @@ -11,6 +11,7 @@ $.widget( "mobile.slider", $.mobile.widget, { options: { theme: null, trackTheme: null, + rangeTheme: null, disabled: false, initSelector: "input[type='range'], :jqmData(type='range'), :jqmData(role='slider')" }, @@ -28,8 +29,12 @@ $.widget( "mobile.slider", $.mobile.widget, { theme = this.options.theme ? this.options.theme : parentTheme, + // theme of the outer track-bar trackTheme = this.options.trackTheme ? this.options.trackTheme : parentTheme, + // theme for the part between start & current slider position + rangeTheme = this.options.rangeTheme ? this.options.rangeTheme : trackTheme, + cType = control[ 0 ].nodeName.toLowerCase(), selectClass = ( cType == "select" ) ? "ui-slider-switch" : "", @@ -95,6 +100,9 @@ $.widget( "mobile.slider", $.mobile.widget, { }); } + else if (trackTheme != rangeTheme) { + slider.wrapInner( "
" ); + } label.addClass( "ui-slider" ); @@ -265,6 +273,8 @@ $.widget( "mobile.slider", $.mobile.widget, { if ( percent > 60 && cType === "select" ) { // TODO: Dead path? } + + this.slider.find('div.ui-slider-range-background').css('width', percent + "%"); this.handle.css( "left", percent + "%" ); this.handle.attr( { "aria-valuenow": cType === "input" ? newval : control.find( "option" ).eq( newval ).attr( "value" ), diff --git a/js/jquery.mobile.listview.filter.js b/js/jquery.mobile.listview.filter.js old mode 100644 new mode 100755 index ebbcc2bdad4..2d89f5f95b1 --- a/js/jquery.mobile.listview.filter.js +++ b/js/jquery.mobile.listview.filter.js @@ -44,8 +44,7 @@ $( ":jqmData(role='listview')" ).live( "listviewcreate", function() { // Change val as lastval for next execution $this.jqmData( "lastval" , val ); - - change = val.replace( new RegExp( "^" + lastval ) , "" ); + change = val.substr( 0 , lastval.length + 1 ).replace( lastval , "" ); if ( val.length < lastval.length || change.length != ( val.length - lastval.length ) ) { diff --git a/tests/unit/slider/index.html b/tests/unit/slider/index.html old mode 100644 new mode 100755 index ed3ea86e307..cc7f7e529dc --- a/tests/unit/slider/index.html +++ b/tests/unit/slider/index.html @@ -47,6 +47,10 @@

+
+ +
+