diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2012-10-06 13:42:17 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2012-10-06 13:42:17 -0400 |
| commit | 033696b0b6723dd24615ae109a3eb6f6154c8847 (patch) | |
| tree | cbcd2be37041bc178a956502f7d6f4aaf182d0dd /jquery-ui-sliderAccess.js | |
| parent | 23a7a882b7c3158b88a7f9e48313088f6e051fa5 (diff) | |
| parent | d57204c8a39a94d7b2e4c8a218d8c5325ac3ffea (diff) | |
| download | jQuery-Timepicker-Addon-033696b0b6723dd24615ae109a3eb6f6154c8847.zip jQuery-Timepicker-Addon-033696b0b6723dd24615ae109a3eb6f6154c8847.tar.gz jQuery-Timepicker-Addon-033696b0b6723dd24615ae109a3eb6f6154c8847.tar.bz2 | |
Fix merge conflict
Diffstat (limited to 'jquery-ui-sliderAccess.js')
| -rw-r--r-- | jquery-ui-sliderAccess.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/jquery-ui-sliderAccess.js b/jquery-ui-sliderAccess.js index 4c96bd5..be514d1 100644 --- a/jquery-ui-sliderAccess.js +++ b/jquery-ui-sliderAccess.js @@ -31,11 +31,12 @@ upText: '+', downText: '-', buttonset: true, - buttonsetTag: 'span' + buttonsetTag: 'span', + isRTL: false }, options), $buttons = $('<'+ o.buttonsetTag +' class="ui-slider-access">'+ - '<button data-icon="'+ o.downIcon +'" data-step="-'+ o.step +'">'+ o.downText +'</button>'+ - '<button data-icon="'+ o.upIcon +'" data-step="'+ o.step +'">'+ o.upText +'</button>'+ + '<button data-icon="'+ o.downIcon +'" data-step="'+ (o.isRTL? o.step : o.step*-1) +'">'+ o.downText +'</button>'+ + '<button data-icon="'+ o.upIcon +'" data-step="'+ (o.isRTL? o.step*-1 : o.step) +'">'+ o.upText +'</button>'+ '</'+ o.buttonsetTag +'>'); $buttons.children('button').each(function(j, jobj){ @@ -73,8 +74,8 @@ // adjust the width so we don't break the original layout var bOuterWidth = $buttons.css({ - marginLeft: (o.where == 'after'? 10:0), - marginRight: (o.where == 'before'? 10:0) + marginLeft: ((o.where == 'after' && !o.isRTL) || (o.where == 'before' && o.isRTL)? 10:0), + marginRight: ((o.where == 'before' && !o.isRTL) || (o.where == 'after' && o.isRTL)? 10:0) }).outerWidth(true) + 5; var tOuterWidth = $t.outerWidth(true); $t.css('display','inline-block').width(tOuterWidth-bOuterWidth); |