Skip to content

Commit

Permalink
Update version
Browse files Browse the repository at this point in the history
  • Loading branch information
vodkabears committed Apr 5, 2014
1 parent d969dcf commit 28bacf1
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 29 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "remodal",
"version": "0.1.3",
"version": "0.1.4",
"homepage": "http://vodkabears.github.io/remodal/",
"authors": [
"Ilya Makarov <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.remodal.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Remodal - v0.1.3 - 2014-03-31
/*! Remodal - v0.1.4 - 2014-04-06
* https://github.com/VodkaBears/remodal
* Copyright (c) 2014 VodkaBears; */

Expand Down
49 changes: 27 additions & 22 deletions dist/jquery.remodal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Remodal - v0.1.3 - 2014-03-31
/*! Remodal - v0.1.4 - 2014-04-06
* https://github.com/VodkaBears/remodal
* Copyright (c) 2014 VodkaBears; */
;(function ($) {
Expand Down Expand Up @@ -130,37 +130,39 @@
* Add event listeners to the current modal window
*/
Remodal.prototype.addEventListeners = function () {
var self = this;

this.modalClose.bind("click." + pluginName, function (e) {
e.preventDefault();
this.close();
}.bind(this));
self.close();
});

this.cancel.bind("click." + pluginName, function (e) {
e.preventDefault();
this.modal.trigger("cancel");
this.close();
}.bind(this));
self.modal.trigger("cancel");
self.close();
});

this.confirm.bind("click." + pluginName, function (e) {
e.preventDefault();
this.modal.trigger("confirm");
this.close();
}.bind(this));
self.modal.trigger("confirm");
self.close();
});

$(document).bind('keyup.' + pluginName, function (e) {
if (e.keyCode === 27) {
this.close();
self.close();
}
}.bind(this));
});

this.overlay.bind("click." + pluginName, function (e) {
var $target = $(e.target);
if (!$target.hasClass(pluginName + "-overlay")) {
return;
}

this.close();
}.bind(this));
self.close();
});
};

/**
Expand Down Expand Up @@ -189,14 +191,16 @@

lockScreen();
this.overlay.show();

var self = this;
setTimeout(function () {
this.body.addClass(pluginName + "_active");
self.body.addClass(pluginName + "_active");

setTimeout(function () {
this.busy = false;
this.modal.trigger("opened");
}.bind(this), this.td + 50);
}.bind(this), 25);
self.busy = false;
self.modal.trigger("opened");
}, self.td + 50);
}, 25);
};

/**
Expand All @@ -219,13 +223,14 @@

this.body.removeClass(pluginName + "_active");

var self = this;
setTimeout(function () {
this.overlay.hide();
self.overlay.hide();
unlockScreen();

this.busy = false;
this.modal.trigger("closed");
}.bind(this), this.td + 50);
self.busy = false;
self.modal.trigger("closed");
}, self.td + 50);
};

if ($) {
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.remodal.min.js

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

2 changes: 1 addition & 1 deletion remodal.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ui",
"zepto"
],
"version": "0.1.3",
"version": "0.1.4",
"author": {
"name": "Ilya Makarov",
"email": "[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion src/jquery.remodal.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Remodal - v0.1.3 - 2014-03-31
/*! Remodal - v0.1.4 - 2014-04-06
* https://github.com/VodkaBears/remodal
* Copyright (c) 2014 VodkaBears; */

Expand Down
2 changes: 1 addition & 1 deletion src/jquery.remodal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Remodal - v0.1.3 - 2014-03-31
/*! Remodal - v0.1.4 - 2014-04-06
* https://github.com/VodkaBears/remodal
* Copyright (c) 2014 VodkaBears; */
;(function ($) {
Expand Down

0 comments on commit 28bacf1

Please sign in to comment.