diff options
author | Scott Jehl <scott@scottjehl.com> | 2009-02-18 17:13:37 +0000 |
---|---|---|
committer | Scott Jehl <scott@scottjehl.com> | 2009-02-18 17:13:37 +0000 |
commit | 5f1eb4fb7306a6890f396eb1cde25cd83a7a631b (patch) | |
tree | ae442fc8d6ef00ae64033c4450c5f3d5f5d24336 /tests | |
parent | f27ea160805dc2984191ecb63c2ad6d830ad37f4 (diff) | |
download | jquery-ui-5f1eb4fb7306a6890f396eb1cde25cd83a7a631b.tar.gz jquery-ui-5f1eb4fb7306a6890f396eb1cde25cd83a7a631b.zip |
reverted my slider collision changes - will submit as a patch
Diffstat (limited to 'tests')
4 files changed, 0 insertions, 154 deletions
diff --git a/tests/static/slider/slider_horizontal_range_collision.html b/tests/static/slider/slider_horizontal_range_collision.html deleted file mode 100644 index b10dd43b6..000000000 --- a/tests/static/slider/slider_horizontal_range_collision.html +++ /dev/null @@ -1,20 +0,0 @@ -<!doctype html> -<html> -<head> - <title>Slider Static Test : Slider horizontal range</title> - <link rel="stylesheet" href="../static.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/ui.base.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" /> - <script type="text/javascript" src="../../../jquery-1.3.1.js"></script> - <script type="text/javascript" src="../static.js"></script> -</head> -<body> - -<div id="slider-horizontal-range" class="ui-slider ui-slider-horizontal ui-slider-horizontal-collision ui-widget ui-widget-content ui-corner-all"> - <div class="ui-slider-range ui-widget-header" style="width:0%; left: 75%;"></div> - <a href="#" class="ui-slider-handle ui-state-default ui-corner-left" style="left: 75%;"></a> - <a href="#" class="ui-slider-handle ui-state-default ui-corner-right" style="left: 75%;"></a> -</div> - -</body> -</html> diff --git a/tests/static/slider/slider_vertical_range_collision.html b/tests/static/slider/slider_vertical_range_collision.html deleted file mode 100644 index a9d95c079..000000000 --- a/tests/static/slider/slider_vertical_range_collision.html +++ /dev/null @@ -1,20 +0,0 @@ -<!doctype html> -<html> -<head> - <title>Slider Static Test : Slider vertical range</title> - <link rel="stylesheet" href="../static.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/ui.base.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" /> - <script type="text/javascript" src="../../../jquery-1.3.1.js"></script> - <script type="text/javascript" src="../static.js"></script> -</head> -<body> - -<div id="slider-vertical-range" class="ui-slider ui-slider-vertical ui-slider-vertical-collision ui-widget ui-widget-content ui-corner-all"> - <div class="ui-slider-range ui-widget-header" style="bottom: 75%; height:0%;"></div> - <a href="#" class="ui-slider-handle ui-state-default ui-corner-bottom" style="bottom: 75%;"></a> - <a href="#" class="ui-slider-handle ui-state-default ui-corner-top" style="bottom: 75%;"></a> -</div> - -</body> -</html> diff --git a/tests/visual/slider/slider_horizontal_range_collision.html b/tests/visual/slider/slider_horizontal_range_collision.html deleted file mode 100644 index 4751c2807..000000000 --- a/tests/visual/slider/slider_horizontal_range_collision.html +++ /dev/null @@ -1,57 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title>Slider Visual Test : Slider horizontal range with collision</title> - <link rel="stylesheet" href="../visual.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> - <script type="text/javascript" src="../../../jquery-1.3.1.js"></script> - <script type="text/javascript" src="../../../ui/ui.core.js"></script> - <script type="text/javascript" src="../../../ui/ui.slider.js"></script> - <script type="text/javascript"> - $(function() { - //this function checks the slider handles and applies classes to make them visually split a value if they're equal - $.fn.checkCollision = function(){ - if( $(this).slider('values', 0) == $(this).slider('values', 1) ){ - if( $(this).is('.ui-slider-horizontal') ){ - $(this).addClass('ui-slider-horizontal-collision'); - $('.ui-slider-handle:eq(0)',this).removeClass('ui-corner-all').addClass('ui-corner-left'); - $('.ui-slider-handle:eq(1)',this).removeClass('ui-corner-all').addClass('ui-corner-right'); - } - else { - $(this).addClass('ui-slider-vertical-collision'); - $('.ui-slider-handle:eq(0)',this).removeClass('ui-corner-all').addClass('ui-corner-bottom'); - $('.ui-slider-handle:eq(1)',this).removeClass('ui-corner-all').addClass('ui-corner-top'); - } - } - else if( $(this).is('.ui-slider-horizontal-collision, .ui-slider-vertical-collision') ) { - if( $(this).is('.ui-slider-horizontal') ){ - $(this).removeClass('ui-slider-horizontal-collision'); - $('.ui-slider-handle:eq(0)',this).addClass('ui-corner-all').removeClass('ui-corner-left'); - $('.ui-slider-handle:eq(1)',this).addClass('ui-corner-all').removeClass('ui-corner-right'); - } - else { - $(this).removeClass('ui-slider-vertical-collision'); - $('.ui-slider-handle:eq(0)',this).addClass('ui-corner-all').removeClass('ui-corner-bottom'); - $('.ui-slider-handle:eq(1)',this).addClass('ui-corner-all').removeClass('ui-corner-top'); - } - } - }; - - - $("#slider-horizontal-range").slider({ - orientation: 'horizontal', - range: true, - values: [25, 75], - slide: $(this).checkCollision - }) - .checkCollision(); - - }); - </script> -</head> -<body> - -<div id="slider-horizontal-range"></div> - -</body> -</html> diff --git a/tests/visual/slider/slider_vertical_range_collision.html b/tests/visual/slider/slider_vertical_range_collision.html deleted file mode 100644 index 9195f7cc1..000000000 --- a/tests/visual/slider/slider_vertical_range_collision.html +++ /dev/null @@ -1,57 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title>Slider Visual Test : Slider vertical range with collision</title> - <link rel="stylesheet" href="../visual.css" type="text/css" /> - <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> - <script type="text/javascript" src="../../../jquery-1.3.1.js"></script> - <script type="text/javascript" src="../../../ui/ui.core.js"></script> - <script type="text/javascript" src="../../../ui/ui.slider.js"></script> - <script type="text/javascript"> - $(function() { - //this function checks the slider handles and applies classes to make them visually split a value if they're equal - $.fn.checkCollision = function(){ - if( $(this).slider('values', 0) == $(this).slider('values', 1) ){ - if( $(this).is('.ui-slider-horizontal') ){ - $(this).addClass('ui-slider-horizontal-collision'); - $('.ui-slider-handle:eq(0)',this).removeClass('ui-corner-all').addClass('ui-corner-left'); - $('.ui-slider-handle:eq(1)',this).removeClass('ui-corner-all').addClass('ui-corner-right'); - } - else { - $(this).addClass('ui-slider-vertical-collision'); - $('.ui-slider-handle:eq(0)',this).removeClass('ui-corner-all').addClass('ui-corner-bottom'); - $('.ui-slider-handle:eq(1)',this).removeClass('ui-corner-all').addClass('ui-corner-top'); - } - } - else if( $(this).is('.ui-slider-horizontal-collision, .ui-slider-vertical-collision') ) { - if( $(this).is('.ui-slider-horizontal') ){ - $(this).removeClass('ui-slider-horizontal-collision'); - $('.ui-slider-handle:eq(0)',this).addClass('ui-corner-all').removeClass('ui-corner-left'); - $('.ui-slider-handle:eq(1)',this).addClass('ui-corner-all').removeClass('ui-corner-right'); - } - else { - $(this).removeClass('ui-slider-vertical-collision'); - $('.ui-slider-handle:eq(0)',this).addClass('ui-corner-all').removeClass('ui-corner-bottom'); - $('.ui-slider-handle:eq(1)',this).addClass('ui-corner-all').removeClass('ui-corner-top'); - } - } - }; - - - $("#slider-vertical-range").slider({ - orientation: 'vertical', - range: true, - values: [25, 75], - slide: $(this).checkCollision - }) - .checkCollision(); - - }); - </script> -</head> -<body> - -<div id="slider-vertical-range"></div> - -</body> -</html> |