Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
litson committed Apr 3, 2015
1 parent 55cad83 commit 0f7af60
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 36 deletions.
58 changes: 27 additions & 31 deletions dist/jDialog.js

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

2 changes: 1 addition & 1 deletion dist/jDialog.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jDialog.fn = jDialog.prototype = {
// iframe
url: null
};
this.actions = {};
// this.actions = {};
this.buttons = [];
jDialog.event.root = this;
// 只存活一个dialog
Expand Down
5 changes: 2 additions & 3 deletions src/operations.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,8 @@ jDialog.fn.extend({
clearTimeout(this.autoHideTimer);
}

this.actions = [];
jDialog.event.root
= jDialog.currentDialog
// this.actions = [];
jDialog.currentDialog
= this.buttons
= this.container
= this.footer
Expand Down

0 comments on commit 0f7af60

Please sign in to comment.