Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Followup updates to #4581 and #4598 #4629

Merged
merged 3 commits into from
Sep 4, 2013
Merged

Followup updates to #4581 and #4598 #4629

merged 3 commits into from
Sep 4, 2013

Conversation

TomMalbran
Copy link
Contributor

@jasonsanjose Want to review this? No rush thought, since the changes are just minor updates.

@ghost ghost assigned jasonsanjose Aug 1, 2013
@jasonsanjose
Copy link
Member

Nominating sprint 30

@jasonsanjose
Copy link
Member

Moving to sprint 31

@jasonsanjose
Copy link
Member

@TomMalbran can you merge with master?

@TomMalbran
Copy link
Contributor Author

Yes I can... 1 min

@TomMalbran
Copy link
Contributor Author

@jasonsanjose Done

*/
function cancelModalDialogIfOpen(dlgClass) {
function cancelModalDialogIfOpen(dlgClass, buttonId) {
$("." + dlgClass + ".instance").each(function () {
if ($(this).is(":visible")) { // Bootstrap breaks if try to hide dialog that's already hidden
_dismissDialog($(this), DIALOG_CANCELED);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a bad merge. This was buttonId || DIALOG_CANCELED.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yeah... good catch!

@jasonsanjose
Copy link
Member

@TomMalbran just 2 minor comments.

@TomMalbran
Copy link
Contributor Author

@jasonsanjose Fixed.

@jasonsanjose
Copy link
Member

Looks good and tests are passing. Merging.

jasonsanjose added a commit that referenced this pull request Sep 4, 2013
@jasonsanjose jasonsanjose merged commit aa8a0c4 into adobe:master Sep 4, 2013
@TomMalbran TomMalbran deleted the tom/tests-utils-updates branch September 4, 2013 18:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants