Skip to content

Commit

Permalink
build & version up
Browse files Browse the repository at this point in the history
  • Loading branch information
dimsemenov committed Dec 12, 2014
1 parent 480499b commit f5c57af
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ __article/
node_modules
_production
all.min.css
.sublime-*
*.sublime-*
website/dist/
*.idea
/.idea
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.9",
"version": "1.0.0",
"main": [
"dist/jquery.magnific-popup.js",
"dist/magnific-popup.css"
Expand Down
20 changes: 17 additions & 3 deletions dist/jquery.magnific-popup.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
/*! Magnific Popup - v0.9.9 - 2014-09-06
/*! Magnific Popup - v1.0.0 - 2014-12-12
* http://dimsemenov.com/plugins/magnific-popup/
* Copyright (c) 2014 Dmitry Semenov; */
;(function($) {
;(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS
factory(require('jquery'));
} else {
// Browser globals
factory(window.jQuery || window.Zepto);
}
}(function($) {

/*>>core*/
/**
Expand Down Expand Up @@ -1325,6 +1336,9 @@ $.magnificPopup.registerModule('image', {
if(el.length) {
var img = document.createElement('img');
img.className = 'mfp-img';
if(item.el && item.el.find('img').length) {
img.alt = item.el.find('img').attr('alt');
}
item.img = $(img).on('load.mfploader', onLoadComplete).on('error.mfploader', onLoadError);
img.src = item.src;

Expand Down Expand Up @@ -2045,4 +2059,4 @@ $.magnificPopup.registerModule(RETINA_NS, {
})();

/*>>fastclick*/
_checkInstance(); })(window.jQuery || window.Zepto);
_checkInstance(); }));
4 changes: 2 additions & 2 deletions dist/jquery.magnific-popup.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/magnific-popup.css
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ button::-moz-focus-inner {
right: 0;
color: #cccccc;
font-size: 12px;
line-height: 18px; }
line-height: 18px;
white-space: nowrap; }

.mfp-arrow {
position: absolute;
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. Animation effects added with CSS3 transitions. For jQuery or Zepto.",
"version": "0.9.9",
"version": "1.0.0",
"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 package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "magnific-popup",

"version": "0.9.9",
"version": "1.0.0",
"title": "Magnific Popup",
"description": "Lightbox and modal dialog plugin. Can display inline HTML, iframes (YouTube video, Vimeo, Google Maps), or an image gallery. Animation effects are added with CSS3 transitions. For jQuery or Zepto.",
"keywords": ["lightbox","popup","modal","window","dialog","gallery","jquery","photo","responsive","mobile"],
Expand Down

0 comments on commit f5c57af

Please sign in to comment.