From 46327804350874d21c564bc72d7d3c541bef9378 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Fri, 9 Nov 2012 17:17:32 +0100
Subject: [PATCH] Dialog: Fix yoda-if, remove unnecessary TODOs; add missing
 callbacks to commons test

---
 tests/unit/dialog/dialog_common.js | 12 +++++++++++-
 ui/jquery.ui.dialog.js             |  5 +----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/unit/dialog/dialog_common.js b/tests/unit/dialog/dialog_common.js
index 2c0e86b46..fb29838b7 100644
--- a/tests/unit/dialog/dialog_common.js
+++ b/tests/unit/dialog/dialog_common.js
@@ -27,6 +27,16 @@ TestHelpers.commonWidgetTests( "dialog", {
 		width: 300,
 
 		// callbacks
-		create: null
+		beforeClose: null,
+		close: null,
+		create: null,
+		drag: null,
+		dragStart: null,
+		dragStop: null,
+		focus: null,
+		open: null,
+		resize: null,
+		resizeStart: null,
+		resizeStop: null
 	}
 });
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 7545a8adf..04b23f2a1 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -94,7 +94,6 @@ $.widget("ui.dialog", {
 			parent: this.element.parent(),
 			index: this.element.parent().children().index( this.element )
 		};
-		// TODO don't overwrite options
 		this.options.title = this.options.title || this.originalTitle;
 		var that = this,
 			options = this.options,
@@ -276,8 +275,7 @@ $.widget("ui.dialog", {
 			return;
 		}
 
-		// TODO fix yoda-if
-		if ( false === this._trigger( "beforeClose", event ) ) {
+		if ( this._trigger( "beforeClose", event ) === false ) {
 			return;
 		}
 
@@ -294,7 +292,6 @@ $.widget("ui.dialog", {
 			$( this.document[ 0 ].activeElement ).blur();
 		}
 
-		// TODO shouldn't _hide restore `this` to the instance? would also help tooltip
 		this._hide( this.uiDialog, this.options.hide, function() {
 			that._trigger( "close", event );
 		});
-- 
2.39.5