Fix for #3838 - Components should use this.widgetName on internally

1 files changed, 10 insertions, 3 deletions

diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
index 38c24c596..9d8d26044 100644
--- a/ui/ui.dialog.js
+++ b/ui/ui.dialog.js
@@ -14,6 +14,9 @@
  */
 (function($) {
 
+var widgetName = "dialog";
+var classWidgetName = ".dialog";
+
 var setDataSwitch = {
 	dragStart: "start.draggable",
 	drag: "drag.draggable",
@@ -30,6 +33,10 @@ var setDataSwitch = {
 $.widget("ui.dialog", {
 
 	_init: function() {
+		// update widgetName with the name given by the widget factory
+		widgetName = this.widgetName;
+		classWidgetName = '.' + widgetName;
+
 		this.originalTitle = this.element.attr('title');
 		this.options.title = this.options.title || this.originalTitle;
 
@@ -61,7 +68,7 @@ $.widget("ui.dialog", {
 						&& ev.keyCode == $.ui.keyCode.ESCAPE && self.close());
 				})
 				.attr({
-					role: 'dialog',
+					role: widgetName,
 					'aria-labelledby': titleId
 				})
 				.mousedown(function() {
@@ -152,8 +159,8 @@ $.widget("ui.dialog", {
 		(this.overlay && this.overlay.destroy());
 		this.uiDialog.hide();
 		this.element
-			.unbind('.dialog')
-			.removeData('dialog')
+			.unbind(classWidgetName)
+			.removeData(widgetName)
 			.removeClass('ui-dialog-content ui-widget-content')
 			.hide().appendTo('body');
 		this.uiDialog.remove();