Skip to content
Permalink
Browse files

Dialog: Fix yoda-if, remove unnecessary TODOs; add missing callbacks …

…to commons test
  • Loading branch information...
jzaefferer committed Nov 9, 2012
1 parent 2062a18 commit 46327804350874d21c564bc72d7d3c541bef9378
Showing with 12 additions and 5 deletions.
  1. +11 −1 tests/unit/dialog/dialog_common.js
  2. +1 −4 ui/jquery.ui.dialog.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
}
});
@@ -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 );
});

0 comments on commit 4632780

Please sign in to comment.
You can’t perform that action at this time.