Skip to content

Commit

Permalink
Refs #56
Browse files Browse the repository at this point in the history
  • Loading branch information
nakupanda committed Aug 19, 2014
1 parent 3085585 commit 8b7b82c
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap3-dialog",
"description": "Make use of Bootstrap Modal more monkey-friendly. http://nakupanda.github.io/bootstrap3-dialog/",
"version": "1.33.3",
"version": "1.33.4",
"keywords": [
"css",
"js",
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ LASTEST NOT RELEASED
------------------------------
* NONE so far *

V1.33.4
------------------------------
* RE-FIXED #56 *

V1.33.3
------------------------------
Expand Down
6 changes: 2 additions & 4 deletions dist/js/bootstrap-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,11 @@
var dialog = event.data.dialog;
typeof dialog.options.onhidden === 'function' && dialog.options.onhidden(dialog);
dialog.isAutodestroy() && $(this).remove();
BootstrapDialog.moveFocus();
});

// Backdrop, I did't find a way to change bs3 backdrop option after the dialog is popped up, so here's a new wheel.
this.getModal().on('mouseup', {dialog: this}, function(event) {
this.getModal().on('click', {dialog: this}, function(event) {
event.target === this && event.data.dialog.isClosable() && event.data.dialog.canCloseByBackdrop() && event.data.dialog.close();
});

Expand Down Expand Up @@ -872,9 +873,6 @@
}
this.setOpened(false);

// Move focus to the last visible dialog.
BootstrapDialog.moveFocus();

// Show scrollbar if the last visible dialog needs one.
BootstrapDialog.showScrollbar();

Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap-dialog.min.js

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions examples/assets/bootstrap-dialog/js/bootstrap-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,11 @@
var dialog = event.data.dialog;
typeof dialog.options.onhidden === 'function' && dialog.options.onhidden(dialog);
dialog.isAutodestroy() && $(this).remove();
BootstrapDialog.moveFocus();
});

// Backdrop, I did't find a way to change bs3 backdrop option after the dialog is popped up, so here's a new wheel.
this.getModal().on('mouseup', {dialog: this}, function(event) {
this.getModal().on('click', {dialog: this}, function(event) {
event.target === this && event.data.dialog.isClosable() && event.data.dialog.canCloseByBackdrop() && event.data.dialog.close();
});

Expand Down Expand Up @@ -872,9 +873,6 @@
}
this.setOpened(false);

// Move focus to the last visible dialog.
BootstrapDialog.moveFocus();

// Show scrollbar if the last visible dialog needs one.
BootstrapDialog.showScrollbar();

Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap3-dialog",
"version": "1.33.3",
"version": "1.33.4",
"description": "Make use of Bootstrap Modal more monkey-friendly.",
"private": true,
"directories": {
Expand Down
6 changes: 2 additions & 4 deletions src/js/bootstrap-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,11 @@
var dialog = event.data.dialog;
typeof dialog.options.onhidden === 'function' && dialog.options.onhidden(dialog);
dialog.isAutodestroy() && $(this).remove();
BootstrapDialog.moveFocus();
});

// Backdrop, I did't find a way to change bs3 backdrop option after the dialog is popped up, so here's a new wheel.
this.getModal().on('mouseup', {dialog: this}, function(event) {
this.getModal().on('click', {dialog: this}, function(event) {
event.target === this && event.data.dialog.isClosable() && event.data.dialog.canCloseByBackdrop() && event.data.dialog.close();
});

Expand Down Expand Up @@ -872,9 +873,6 @@
}
this.setOpened(false);

// Move focus to the last visible dialog.
BootstrapDialog.moveFocus();

// Show scrollbar if the last visible dialog needs one.
BootstrapDialog.showScrollbar();

Expand Down

0 comments on commit 8b7b82c

Please sign in to comment.