Skip to content

Commit

Permalink
Release v0.6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
vodkabears committed Apr 7, 2015
1 parent 5fcd89d commit a371a5f
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 20 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.6.3",
"version": "0.6.4",
"homepage": "http://vodkabears.github.io/remodal/",
"authors": [
"Ilya Makarov <[email protected]>"
Expand Down
6 changes: 3 additions & 3 deletions dist/jquery.remodal.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* Remodal - v0.6.3
* Remodal - v0.6.4
* Flat, responsive, lightweight, easy customizable modal window plugin with declarative state notation and hash tracking.
* http://vodkabears.github.io/remodal/
*
* Made by Ilya Makarov
* Under MIT License
*/
@import url(http://fonts.googleapis.com/css?family=Exo+2:700,400&subset=latin,cyrillic);
@import url(//fonts.googleapis.com/css?family=Exo+2:700,400&subset=latin,cyrillic);

/* ==========================================================================
Remodal necessary styles
Expand Down Expand Up @@ -280,7 +280,7 @@ body.remodal-is-active .remodal {
/* Media queries
========================================================================== */

@media only screen and (min-width: 40.063em) /* min-width 641px */ {
@media only screen and (min-width: 641px) {
.remodal {
max-width: 700px;
min-height: 0;
Expand Down
39 changes: 26 additions & 13 deletions dist/jquery.remodal.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
/*
* Remodal - v0.6.3
* Remodal - v0.6.4
* Flat, responsive, lightweight, easy customizable modal window plugin with declarative state notation and hash tracking.
* http://vodkabears.github.io/remodal/
*
* Made by Ilya Makarov
* Under MIT License
*/
!(function($) {
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery'], function($) {
return factory(root, $);
});
} else if (typeof exports === 'object') {
factory(root, require('jquery'));
} else {
factory(root, root.jQuery || root.Zepto);
}
})(this, function(global, $) {

'use strict';

/**
Expand All @@ -21,7 +32,7 @@
* @private
* @type {String}
*/
var namespace = window.remodalGlobals && window.remodalGlobals.namespace || pluginName;
var namespace = global.remodalGlobals && global.remodalGlobals.namespace || pluginName;

/**
* Default settings
Expand All @@ -34,7 +45,7 @@
closeOnCancel: true,
closeOnEscape: true,
closeOnAnyClick: true
}, window.remodalGlobals && window.remodalGlobals.defaults);
}, global.remodalGlobals && global.remodalGlobals.defaults);

/**
* Current modal
Expand Down Expand Up @@ -247,8 +258,7 @@
tdOverlay = getTransitionDuration(remodal.$overlay);
tdModal = getTransitionDuration(remodal.$modal);
tdBg = getTransitionDuration(remodal.$bg);
remodal.td = tdModal > tdOverlay ? tdModal : tdOverlay;
remodal.td = tdBg > remodal.td ? tdBg : remodal.td;
remodal.td = Math.max(tdOverlay, tdModal, tdBg);

// Add the close button event listener
remodal.$wrapper.on('click.' + namespace, '.' + namespace + '-close', function(e) {
Expand Down Expand Up @@ -341,6 +351,7 @@

setTimeout(function() {
remodal.$body.addClass(namespace + '-is-active');
remodal.$wrapper.scrollTop(0);

setTimeout(function() {
remodal.busy = false;
Expand Down Expand Up @@ -369,9 +380,10 @@
reason: reason
});

if (remodal.settings.hashTracking &&
remodal.$modal.attr('data-' + pluginName + '-id') === location.hash.substr(1)) {

if (
remodal.settings.hashTracking &&
remodal.$modal.attr('data-' + pluginName + '-id') === location.hash.substr(1)
) {
location.hash = '';
$(window).scrollTop(scrollTop);
}
Expand Down Expand Up @@ -417,9 +429,10 @@
instance = new Remodal($elem, opts);
$elem.data(pluginName, instance.index);

if (instance.settings.hashTracking &&
$elem.attr('data-' + pluginName + '-id') === location.hash.substr(1)) {

if (
instance.settings.hashTracking &&
$elem.attr('data-' + pluginName + '-id') === location.hash.substr(1)
) {
instance.open();
}
} else {
Expand Down Expand Up @@ -506,4 +519,4 @@

$(window).bind('hashchange.' + namespace, hashHandler);

})(window.jQuery || window.Zepto);
});
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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "remodal",
"version": "0.6.3",
"version": "0.6.4",
"description": "Flat, responsive, lightweight, easy customizable modal window plugin with declarative state notation and hash tracking.",
"keywords": [
"jquery-plugin",
Expand Down

0 comments on commit a371a5f

Please sign in to comment.