Skip to content

Commit

Permalink
0.9.6 version bump, see changelog for more info
Browse files Browse the repository at this point in the history
  • Loading branch information
dimsemenov committed Sep 29, 2013
1 parent c48ede2 commit 7636022
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 13 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ Optionally:

## Changelog

### 0.9.6 (Sep 29, 2013)

- Fixed bug: options object that you pass to popup gets modified after the initialization (#217, #203).
- Fixed bug: zoom module creates global variable (#226).
- Fixed bug: gallery from AJAX popups stacks content if it's switched before loading has finished.
- Indented and combined SCSS classes (thanks to @nschonni).
- `$.magnificPopup.close()` now doesn't throw an exception if there's no instance (#221, thanks to @mjlescano).

### 0.9.5 (Aug 21, 2013)

- Fixed bug: built-in tab focus in popup works incorrectly (caused by 0.9.3 update).
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "magnific-popup",
"version": "0.9.5",
"version": "0.9.6",
"main": [
"dist/jquery.magnific-popup.js",
"dist/magnific-popup.css"
Expand Down
22 changes: 16 additions & 6 deletions dist/jquery.magnific-popup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Magnific Popup - v0.9.5 - 2013-08-21
/*! Magnific Popup - v0.9.6 - 2013-09-29
* http://dimsemenov.com/plugins/magnific-popup/
* Copyright (c) 2013 Dmitry Semenov; */
;(function($) {
Expand Down Expand Up @@ -414,6 +414,8 @@ MagnificPopup.prototype = {
mfp.isOpen = true;
mfp.updateSize(windowHeight);
_mfpTrigger(OPEN_EVENT);

return data;
},

/**
Expand Down Expand Up @@ -827,16 +829,20 @@ $.magnificPopup = {
open: function(options, index) {
_checkInstance();

if(!options)
if(!options) {
options = {};
} else {
options = $.extend(true, {}, options);
}


options.isObj = true;
options.index = index || 0;
return this.instance.open(options);
},

close: function() {
return $.magnificPopup.instance.close();
return $.magnificPopup.instance && $.magnificPopup.instance.close();
},

registerModule: function(name, module) {
Expand Down Expand Up @@ -926,7 +932,9 @@ $.fn.magnificPopup = function(options) {
}

} else {

// clone options obj
options = $.extend(true, {}, options);

/*
* As Zepto doesn't support .data() method for objects
* and it works only in normal browsers
Expand Down Expand Up @@ -1058,7 +1066,7 @@ $.magnificPopup.registerModule(AJAX_NS, {
mfp.types.push(AJAX_NS);
_ajaxCur = mfp.st.ajax.cursor;

_mfpOn(CLOSE_EVENT+'.'+AJAX_NS, function() {
_mfpOn(CLOSE_EVENT+'.'+AJAX_NS + ' BeforeChange.' + AJAX_NS, function() {
_removeAjaxCursor();
if(mfp.req) {
mfp.req.abort();
Expand Down Expand Up @@ -1384,7 +1392,8 @@ $.magnificPopup.registerModule('zoom', {

initZoom: function() {
var zoomSt = mfp.st.zoom,
ns = '.zoom';
ns = '.zoom',
image;

if(!zoomSt.enabled || !mfp.supportsTransition) {
return;
Expand Down Expand Up @@ -1488,6 +1497,7 @@ $.magnificPopup.registerModule('zoom', {
if(animatedImg) {
animatedImg.remove();
}
image = null;
}
});
},
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.magnific-popup.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/magnific-popup.css
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ button::-moz-focus-inner {
left: 0; }
.mfp-arrow-left:after,
.mfp-arrow-left .mfp-a {
border-right: 17px solid #FFF;
border-right: 17px solid white;
margin-left: 31px; }
.mfp-arrow-left:before,
.mfp-arrow-left .mfp-b {
Expand All @@ -213,7 +213,7 @@ button::-moz-focus-inner {
right: 0; }
.mfp-arrow-right:after,
.mfp-arrow-right .mfp-a {
border-left: 17px solid #FFF;
border-left: 17px solid white;
margin-left: 39px; }
.mfp-arrow-right:before,
.mfp-arrow-right .mfp-b {
Expand Down
2 changes: 1 addition & 1 deletion magnific-popup.jquery.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magnific-popup",
"title": "Magnific Popup",
"description": "Fast, light, mobile-friendly and responsive lightbox and modal dialog plugin. Open inline HTML, ajax loaded content, image, form, iframe (YouTube video, Vimeo, Google Maps), photo gallery. In/out animation effects are added with CSS3 transitions.",
"version": "0.9.5",
"version": "0.9.6",
"homepage": "http://dimsemenov.com/plugins/magnific-popup/",
"demo": "http://dimsemenov.com/plugins/magnific-popup/",
"docs": "http://dimsemenov.com/plugins/magnific-popup/documentation.html",
Expand Down
2 changes: 1 addition & 1 deletion website/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ exclude: [".json", ".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changel
auto: true
pygments: true

mfpversion: 0.9.5
mfpversion: 0.9.6

0 comments on commit 7636022

Please sign in to comment.