From 48d7d53f7b04e202e32a47aa0665f83a1179b723 Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Sat, 22 Dec 2012 12:56:19 -0500 Subject: Dev: stop loading *_tickets.js in the test suite. --- tests/unit/button/button.html | 1 - tests/unit/dialog/dialog.html | 1 - tests/unit/dialog/dialog_deprecated.html | 1 - tests/unit/sortable/sortable.html | 1 - 4 files changed, 4 deletions(-) diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html index ebdc76470..eeb568686 100644 --- a/tests/unit/button/button.html +++ b/tests/unit/button/button.html @@ -25,7 +25,6 @@ - diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index 8f2583ce1..57017b1b9 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -36,7 +36,6 @@ - diff --git a/tests/unit/dialog/dialog_deprecated.html b/tests/unit/dialog/dialog_deprecated.html index 3360e6ef7..063769c62 100644 --- a/tests/unit/dialog/dialog_deprecated.html +++ b/tests/unit/dialog/dialog_deprecated.html @@ -31,7 +31,6 @@ - diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html index b7b7b0007..9736cf9ee 100644 --- a/tests/unit/sortable/sortable.html +++ b/tests/unit/sortable/sortable.html @@ -27,7 +27,6 @@ - -- cgit v1.2.3 From 6da708ef8ef15b9f0b18b75214385f8e06585708 Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Fri, 28 Dec 2012 12:32:30 -0200 Subject: Theme: Split opacityOverlay from opacityFilterOverlay on theme styles. --- themes/base/jquery.ui.theme.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css index 47aedb0d3..cd52fc786 100644 --- a/themes/base/jquery.ui.theme.css +++ b/themes/base/jquery.ui.theme.css @@ -393,14 +393,14 @@ /* Overlays */ .ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; - /* no space between ".3;" and "filter" because themeRoller looks back to the first space for replacement */ - opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; + opacity: .3/*{opacityOverlay}*/; + filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; } .ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; - /* no space between ".3;" and "filter" because themeRoller looks back to the first space for replacement */ - opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; + opacity: .3/*{opacityShadow}*/; + filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; } -- cgit v1.2.3 From 55ebc958793e5a3e5c6ce7e232aa502b320d23ca Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Fri, 28 Dec 2012 10:07:02 +0100 Subject: Tabs: Update manipulation demo - use delegate instead of live (can't use on until we drop core 1.6 support), reuse selected element --- demos/tabs/manipulation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/tabs/manipulation.html b/demos/tabs/manipulation.html index 78859e5c0..9a66076e7 100644 --- a/demos/tabs/manipulation.html +++ b/demos/tabs/manipulation.html @@ -75,7 +75,7 @@ }); // close icon: removing the tab on click - $( "#tabs span.ui-icon-close" ).live( "click", function() { + tabs.delegate( "span.ui-icon-close", "click", function() { var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" ); $( "#" + panelId ).remove(); tabs.tabs( "refresh" ); -- cgit v1.2.3 From e3ab5f811a97c9fd79038c550aa86dcff0465d40 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Fri, 28 Dec 2012 10:15:38 +0100 Subject: Tabs: Update manipulation demo - implement alt+del shortcut to remove active tab. Fixes #7847 - Tabs: simple manipulation accessibility --- demos/tabs/manipulation.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/demos/tabs/manipulation.html b/demos/tabs/manipulation.html index 9a66076e7..0e0af365a 100644 --- a/demos/tabs/manipulation.html +++ b/demos/tabs/manipulation.html @@ -24,7 +24,7 @@ $(function() { var tabTitle = $( "#tab_title" ), tabContent = $( "#tab_content" ), - tabTemplate = "
  • #{label} Remove Tab
  • ", + tabTemplate = "
  • #{label} Remove Tab
  • ", tabCounter = 2; var tabs = $( "#tabs" ).tabs(); @@ -80,6 +80,14 @@ $( "#" + panelId ).remove(); tabs.tabs( "refresh" ); }); + + tabs.bind( "keyup", function( event ) { + if ( event.altKey && event.keyCode === $.ui.keyCode.BACKSPACE ) { + var panelId = tabs.find( ".ui-tabs-active" ).remove().attr( "aria-controls" ); + $( "#" + panelId ).remove(); + tabs.tabs( "refresh" ); + } + }); }); @@ -100,7 +108,7 @@

    Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.

    -- cgit v1.2.3 From 5561f5db1206b3c8d00f480b1b1ea7d6aa2fa84a Mon Sep 17 00:00:00 2001 From: Kris Borchers Date: Sat, 29 Dec 2012 20:08:05 -0600 Subject: Add comment explaining the mouseHandled flag --- ui/jquery.ui.menu.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 3c445eca1..a666e934d 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -38,6 +38,8 @@ $.widget( "ui.menu", { _create: function() { this.activeMenu = this.element; + // flag used to prevent firing of the click handler + // as the event bubbles up through nested menus this.mouseHandled = false; this.element .uniqueId() -- cgit v1.2.3 From 2620be85e97d638554ad1cc0fba376848abb205b Mon Sep 17 00:00:00 2001 From: TJ VanToll Date: Sat, 29 Dec 2012 21:58:25 -0500 Subject: Selectable tests: Removed a non-existent script tag causing a 404 in the tests. --- tests/unit/selectable/selectable.html | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html index 13718e1f3..18ffc6ef7 100644 --- a/tests/unit/selectable/selectable.html +++ b/tests/unit/selectable/selectable.html @@ -26,7 +26,6 @@ - -- cgit v1.2.3 From 695358983e58c9f3d0c6b755ce89fa92adbea0ea Mon Sep 17 00:00:00 2001 From: TJ VanToll Date: Fri, 28 Dec 2012 22:17:50 -0500 Subject: Selectable: Account for scrolling on the helper's initial position. Fixed #8915 - Selectable: Lasso offset issue with scrolling. --- tests/unit/selectable/selectable_events.js | 28 ++++++++++++++++++++++++++++ ui/jquery.ui.selectable.js | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js index 984fd1862..f933d3890 100644 --- a/tests/unit/selectable/selectable_events.js +++ b/tests/unit/selectable/selectable_events.js @@ -35,4 +35,32 @@ test( "stop", function() { }); }); +test( "mousedown: initial position of helper", function() { + expect( 2 ); + + var contentToForceScroll, helper, + element = $("#selectable1").selectable(); + + contentToForceScroll = $("
    ").css({ + height: "10000px", + width: "10000px" + }); + + contentToForceScroll.appendTo("body"); + $( window ).scrollTop( 1 ).scrollLeft( 1 ); + element.simulate( "mousedown", { + clientX: 10, + clientY: 10 + }); + + helper = $(".ui-selectable-helper"); + equal( helper.css("top"), "11px", "Scroll top should be accounted for." ); + equal( helper.css("left"), "11px", "Scroll left should be accounted for." ); + + // Cleanup + element.simulate("mouseup"); + contentToForceScroll.remove(); + $( window ).scrollTop( 0 ).scrollLeft( 0 ); +}); + })( jQuery ); diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js index 32152291b..8e6d03c1f 100644 --- a/ui/jquery.ui.selectable.js +++ b/ui/jquery.ui.selectable.js @@ -88,8 +88,8 @@ $.widget("ui.selectable", $.ui.mouse, { $(options.appendTo).append(this.helper); // position helper (lasso) this.helper.css({ - "left": event.clientX, - "top": event.clientY, + "left": event.pageX, + "top": event.pageY, "width": 0, "height": 0 }); -- cgit v1.2.3 From 18b8ffd796ba557a7c939d67a1551b54402a7eb9 Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Tue, 1 Jan 2013 23:16:12 -0500 Subject: Draggable Tests: Cover all cursorAt option formats. --- tests/unit/draggable/draggable_options.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index 36fcb731d..a3f7169f2 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -270,22 +270,16 @@ test("{ cursor: 'move' }", function() { }); -/* -test("{ cursorAt: false}, default", function() { - expect( 1 ); - - ok(false, "missing test - untested code is broken code"); -}); -*/ - -test( "{ cursorAt: left, top }", function() { - expect( 16 ); +test( "cursorAt", function() { + expect( 24 ); var deltaX = -3, deltaY = -3, tests = { + "false": { cursorAt : false }, "{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt : { left: -5, top: -5 } }, "[ 10, 20 ]": { x: 10, y: 20, cursorAt : [ 10, 20 ] }, + "'10 20'": { x: 10, y: 20, cursorAt : "10 20" }, "{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt : { left: 20, top: 40 } }, "{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt : { right: 10, bottom: 20 } } }; @@ -295,9 +289,12 @@ test( "{ cursorAt: left, top }", function() { var el = $( "#draggable" + ( i + 1 ) ).draggable({ cursorAt: testData.cursorAt, drag: function( event, ui ) { - if( testData.cursorAt.right ) { + if( !testData.cursorAt ) { + equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" ); + equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" ); + } else if( testData.cursorAt.right ) { equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - TestHelpers.draggable.unreliableOffset, testName + " " + position + " left" ); - equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - TestHelpers.draggable.unreliableOffset, testName + position + " top" ); + equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - TestHelpers.draggable.unreliableOffset, testName + " " +position + " top" ); } else { equal( event.clientX - ui.offset.left, testData.x + TestHelpers.draggable.unreliableOffset, testName + " " + position + " left" ); equal( event.clientY - ui.offset.top, testData.y + TestHelpers.draggable.unreliableOffset, testName + " " + position + " top" ); -- cgit v1.2.3