Skip to content

Commit

Permalink
Release v0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vodkabears committed Jan 22, 2015
1 parent b2dc4a4 commit 586718a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 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.4.1",
"version": "0.5.0",
"homepage": "http://vodkabears.github.io/remodal/",
"authors": [
"Ilya Makarov <[email protected]>"
Expand Down
5 changes: 2 additions & 3 deletions dist/jquery.remodal.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Remodal - v0.4.1
* Remodal - v0.5.0
* Flat, responsive, lightweight, easy customizable modal window plugin with declarative state notation and hash tracking.
* http://vodkabears.github.io/remodal/
*
Expand All @@ -14,8 +14,7 @@

/* Hide scroll bar */

html.remodal-is-locked,
body.remodal-is-locked {
html.remodal-is-locked {
overflow: hidden;
}

Expand Down
26 changes: 17 additions & 9 deletions dist/jquery.remodal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Remodal - v0.4.1
* Remodal - v0.5.0
* Flat, responsive, lightweight, easy customizable modal window plugin with declarative state notation and hash tracking.
* http://vodkabears.github.io/remodal/
*
Expand Down Expand Up @@ -111,7 +111,7 @@
paddingRight = parseInt($body.css("padding-right"), 10) + getScrollbarWidth();

$body.css("padding-right", paddingRight + "px");
$("html, body").addClass(pluginName + "-is-locked");
$("html").addClass(pluginName + "-is-locked");
}

/**
Expand All @@ -125,7 +125,7 @@
paddingRight = parseInt($body.css("padding-right"), 10) - getScrollbarWidth();

$body.css("padding-right", paddingRight + "px");
$("html, body").removeClass(pluginName + "-is-locked");
$("html").removeClass(pluginName + "-is-locked");
}

/**
Expand Down Expand Up @@ -220,7 +220,7 @@
remodal.$modal.trigger("cancel");

if (remodal.settings.closeOnCancel) {
remodal.close();
remodal.close("cancellation");
}
});

Expand All @@ -231,7 +231,7 @@
remodal.$modal.trigger("confirm");

if (remodal.settings.closeOnConfirm) {
remodal.close();
remodal.close("confirmation");
}
});

Expand Down Expand Up @@ -307,15 +307,20 @@
/**
* Close the modal window
* @public
* @param {String|undefined} reason A reason to close
*/
Remodal.prototype.close = function() {
// Check if animation is complete
Remodal.prototype.close = function(reason) {

// Check if the animation was completed
if (this.busy) {
return;
}

this.busy = true;
this.$modal.trigger("close");
this.$modal.trigger({
type: "close",
reason: reason
});

var remodal = this;

Expand All @@ -334,7 +339,10 @@
unlockScreen();

remodal.busy = false;
remodal.$modal.trigger("closed");
remodal.$modal.trigger({
type: "closed",
reason: reason
});
}, remodal.td + 50);
};

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.4.1",
"version": "0.5.0",
"author": {
"name": "Ilya Makarov",
"email": "[email protected]",
Expand Down

0 comments on commit 586718a

Please sign in to comment.