From c0ab71056b936627e8a7821f03c044aec6280a40 Mon Sep 17 00:00:00 2001 From: Alexander Schmitz Date: Wed, 31 Jul 2013 15:56:04 -0400 Subject: Widget Factory: Make $.widget return the constructor. Fixes #9467 - Widget factory: Return the constructor from $.widget(). --- tests/unit/widget/widget_core.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index 3268b756d..aff07cc35 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -615,12 +615,13 @@ test( ".disable()", function() { }); test( ".widget() - base", function() { - expect( 1 ); - $.widget( "ui.testWidget", { + expect( 2 ); + var constructor = $.widget( "ui.testWidget", { _create: function() {} }); var div = $( "
" ).testWidget(); deepEqual( div[0], div.testWidget( "widget" )[0]); + deepEqual( constructor, $.ui.testWidget, "$.widget returns the constructor" ); }); test( ".widget() - overriden", function() { -- cgit v1.2.3 From 787d607f8efebcfc5323a7c47a7a2cc4565327c6 Mon Sep 17 00:00:00 2001 From: Alexander Schmitz Date: Wed, 31 Jul 2013 17:08:30 -0400 Subject: Widget Factory: Fix multiple var statements in test --- tests/unit/widget/widget_core.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index aff07cc35..3db79ec06 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -617,9 +617,9 @@ test( ".disable()", function() { test( ".widget() - base", function() { expect( 2 ); var constructor = $.widget( "ui.testWidget", { - _create: function() {} - }); - var div = $( "
" ).testWidget(); + _create: function() {} + }), + div = $( "
" ).testWidget(); deepEqual( div[0], div.testWidget( "widget" )[0]); deepEqual( constructor, $.ui.testWidget, "$.widget returns the constructor" ); }); -- cgit v1.2.3 From 484e382259f1c1c56b151a97ddf8a894f94d17ea Mon Sep 17 00:00:00 2001 From: TJ VanToll Date: Fri, 2 Aug 2013 06:51:04 -0400 Subject: Menu: Only set the mouseHandled flag if the event is going to bubble. Fixes #9469: on( "menuselect" ) not firing every time. --- tests/unit/menu/menu_events.js | 15 +++++++++++++++ ui/jquery.ui.menu.js | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js index 554c4c516..4b152dcf4 100644 --- a/tests/unit/menu/menu_events.js +++ b/tests/unit/menu/menu_events.js @@ -619,4 +619,19 @@ test( "ensure default is prevented when clicking on anchors in disabled menus ", equal( logOutput(), "click,1,afterclick,disable,enable,3", "Click order not valid." ); }); +test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() { + expect( 1 ); + var element = $( "#menu1" ).menu({ + select: function( event, ui ) { + log(); + event.stopPropagation(); + } + }); + + click( element, "1" ); + click( element, "2" ); + + equal( logOutput(), "1,2", "Both select events were not triggered." ); +}); + })( jQuery ); diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index c0222629d..b4f0d48c1 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -75,9 +75,13 @@ $.widget( "ui.menu", { "click .ui-menu-item:has(a)": function( event ) { var target = $( event.target ).closest( ".ui-menu-item" ); if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) { - this.mouseHandled = true; - this.select( event ); + + // Only set the mouseHandled flag if the event will bubble, see #9469. + if ( !event.isPropagationStopped() ) { + this.mouseHandled = true; + } + // Open submenu on click if ( target.has( ".ui-menu" ).length ) { this.expand( event ); -- cgit v1.2.3 From afdf8986591e19404a9b67d1053ce292d754d841 Mon Sep 17 00:00:00 2001 From: TJ VanToll Date: Sat, 3 Aug 2013 17:52:11 -0400 Subject: Menu tests: jshint cleanup of unused argument --- tests/unit/menu/menu_events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/unit') diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js index 4b152dcf4..405300c46 100644 --- a/tests/unit/menu/menu_events.js +++ b/tests/unit/menu/menu_events.js @@ -622,7 +622,7 @@ test( "ensure default is prevented when clicking on anchors in disabled menus ", test( "#9469: Stopping propagation in a select event should not suppress subsequent select events.", function() { expect( 1 ); var element = $( "#menu1" ).menu({ - select: function( event, ui ) { + select: function( event ) { log(); event.stopPropagation(); } -- cgit v1.2.3 From c9815f13b487d027ef9b6095588dbb73141c9a09 Mon Sep 17 00:00:00 2001 From: Scott González Date: Tue, 6 Aug 2013 15:06:08 -0400 Subject: Dialog: Search the correct document for focus trapping. Fixes #9439 - Dialog: Context is not respected for modals. --- tests/unit/dialog/dialog_methods.js | 10 +++---- ui/jquery.ui.dialog.js | 55 +++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 28 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js index 2bb06ab46..60a7aa4d8 100644 --- a/tests/unit/dialog/dialog_methods.js +++ b/tests/unit/dialog/dialog_methods.js @@ -63,21 +63,21 @@ test("destroy", function() { // Don't throw errors when destroying a never opened modal dialog (#9004) $( "#dialog1" ).dialog({ autoOpen: false, modal: true }).dialog( "destroy" ); equal( $( ".ui-widget-overlay" ).length, 0, "overlay does not exist" ); - equal( $.ui.dialog.overlayInstances, 0, "overlayInstances equals the number of open overlays"); + equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays"); element = $( "#dialog1" ).dialog({ modal: true }), element2 = $( "#dialog2" ).dialog({ modal: true }); equal( $( ".ui-widget-overlay" ).length, 2, "overlays created when dialogs are open" ); - equal( $.ui.dialog.overlayInstances, 2, "overlayInstances equals the number of open overlays" ); + equal( $( document ).data( "ui-dialog-overlays" ), 2, "ui-dialog-overlays equals the number of open overlays" ); element.dialog( "close" ); equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after closing one dialog" ); - equal( $.ui.dialog.overlayInstances, 1, "overlayInstances equals the number of open overlays" ); + equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" ); element.dialog( "destroy" ); equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after destroying one dialog" ); - equal( $.ui.dialog.overlayInstances, 1, "overlayInstances equals the number of open overlays" ); + equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" ); element2.dialog( "destroy" ); equal( $( ".ui-widget-overlay" ).length, 0, "overlays removed when all dialogs are destoryed" ); - equal( $.ui.dialog.overlayInstances, 0, "overlayInstances equals the number of open overlays" ); + equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays" ); }); asyncTest("#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() { diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index b94757505..4279d357c 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -724,22 +724,27 @@ $.widget( "ui.dialog", { return; } - var that = this, - widgetFullName = this.widgetFullName; - if ( !$.ui.dialog.overlayInstances ) { - // Prevent use of anchors and inputs. - // We use a delay in case the overlay is created from an - // event that we're going to be cancelling. (#2804) - this._delay(function() { - // Handle .dialog().dialog("close") (#4065) - if ( $.ui.dialog.overlayInstances ) { - this.document.bind( "focusin.dialog", function( event ) { - if ( !that._allowInteraction( event ) ) { - event.preventDefault(); - $(".ui-dialog:visible:last .ui-dialog-content") - .data( widgetFullName )._focusTabbable(); - } - }); + // We use a delay in case the overlay is created from an + // event that we're going to be cancelling (#2804) + var isOpening = true; + this._delay(function() { + isOpening = false; + }); + + if ( !this.document.data( "ui-dialog-overlays" ) ) { + + // Prevent use of anchors and inputs + this._on( this.document, { + focusin: function( event ) { + if ( isOpening ) { + return; + } + + if ( !this._allowInteraction( event ) ) { + event.preventDefault(); + this.document.find( ".ui-dialog:visible:last .ui-dialog-content" ) + .data( this.widgetFullName )._focusTabbable(); + } } }); } @@ -750,7 +755,8 @@ $.widget( "ui.dialog", { this._on( this.overlay, { mousedown: "_keepFocus" }); - $.ui.dialog.overlayInstances++; + this.document.data( "ui-dialog-overlays", + (this.document.data( "ui-dialog-overlays" ) || 0) + 1 ); }, _destroyOverlay: function() { @@ -759,17 +765,20 @@ $.widget( "ui.dialog", { } if ( this.overlay ) { - $.ui.dialog.overlayInstances--; - - if ( !$.ui.dialog.overlayInstances ) { - this.document.unbind( "focusin.dialog" ); + var overlays = this.document.data( "ui-dialog-overlays" ) - 1; + + if ( !overlays ) { + this.document + .off( "focusin" ) + .removeData( "ui-dialog-overlays" ); + } else { + this.document.data( "ui-dialog-overlays", overlays ); } + this.overlay.remove(); this.overlay = null; } } }); -$.ui.dialog.overlayInstances = 0; - }( jQuery ) ); -- cgit v1.2.3