Skip to content

Commit

Permalink
Merge branch 'master' of github.com:liferay/alloy-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
brianchandotcom committed Jul 29, 2011
2 parents c7ffc63 + 7988219 commit 39aa3be
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 3 additions & 1 deletion build/aui-dialog/aui-dialog-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,9 @@ Dialog.prototype = {
A.DialogMask.hide();
}
}
}
},

_uiHandles: []
};

A.Dialog = A.Component.create(
Expand Down
2 changes: 1 addition & 1 deletion build/aui-dialog/aui-dialog-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion build/aui-dialog/aui-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,9 @@ Dialog.prototype = {
A.DialogMask.hide();
}
}
}
},

_uiHandles: []
};

A.Dialog = A.Component.create(
Expand Down
4 changes: 3 additions & 1 deletion src/aui-dialog/js/aui-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,9 @@ Dialog.prototype = {
A.DialogMask.hide();
}
}
}
},

_uiHandles: []
};

A.Dialog = A.Component.create(
Expand Down

0 comments on commit 39aa3be

Please sign in to comment.