Merge branch 'master' into selectmenu

3 files changed, 26 insertions, 10 deletions

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/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index 554c4c516..405300c46 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 ) {
+			log();
+			event.stopPropagation();
+		}
+	});
+
+	click( element, "1" );
+	click( element, "2" );
+
+	equal( logOutput(), "1,2", "Both select events were not triggered." );
+});
+
 })( jQuery );
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 3268b756d..3db79ec06 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", {
-		_create: function() {}
-	});
-	var div = $( "<div>" ).testWidget();
+	expect( 2 );
+	var constructor = $.widget( "ui.testWidget", {
+			_create: function() {}
+		}),
+		div = $( "<div>" ).testWidget();
 	deepEqual( div[0], div.testWidget( "widget" )[0]);
+	deepEqual( constructor, $.ui.testWidget, "$.widget returns the constructor" );
 });
 
 test( ".widget() - overriden", function() {