Dialog: Don't hard-code widget data key. Fixes #9097 - UI dialog inheritance.

scottgonzalez · scottgonzalez · commit 5e1b8dc71a72 · 2013-02-18T16:07:15.000-05:00
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
@@ -697,6 +697,7 @@ $.widget( "ui.dialog", {
 			return;
 		}
 
+		var 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
@@ -711,7 +712,7 @@ $.widget( "ui.dialog", {
 								!$( event.target ).closest(".ui-datepicker").length ) {
 							event.preventDefault();
 							$(".ui-dialog:visible:last .ui-dialog-content")
-								.data("ui-dialog")._focusTabbable();
+								.data( widgetFullName )._focusTabbable();
 						}
 					});
 				}

Original file line number	Diff line number	Diff line change
`@@ -697,6 +697,7 @@ $.widget( "ui.dialog", {`
`697`	`697`	`return;`
`698`	`698`	`}`
`699`	`699`
	`700`	`+ var widgetFullName = this.widgetFullName;`
`700`	`701`	`if ( !$.ui.dialog.overlayInstances ) {`
`701`	`702`	`// Prevent use of anchors and inputs.`
`702`	`703`	`// We use a delay in case the overlay is created from an`
`@@ -711,7 +712,7 @@ $.widget( "ui.dialog", {`
`711`	`712`	`!$( event.target ).closest(".ui-datepicker").length ) {`
`712`	`713`	`event.preventDefault();`
`713`	`714`	`$(".ui-dialog:visible:last .ui-dialog-content")`
`714`		`- .data("ui-dialog")._focusTabbable();`
	`715`	`+ .data( widgetFullName )._focusTabbable();`
`715`	`716`	`}`
`716`	`717`	`});`
`717`	`718`	`}`