Skip to content

Commit

Permalink
Fix errors with jQuery No Conflict Mode, Fix backdropDuration bug.
Browse files Browse the repository at this point in the history
  • Loading branch information
sachinchoolur committed Sep 28, 2016
1 parent d7bedb0 commit 99bf7ca
Show file tree
Hide file tree
Showing 13 changed files with 53 additions and 19 deletions.
27 changes: 25 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,31 @@ module.exports = function(grunt) {
src: 'src/js/<%= pkg.name %>.js',
dest: 'dist/js/<%= pkg.name %>.js',
deps: {
default: ['jquery'],
global: ['jQuery']
args : ['$'],
'default': ['$'],
amd: {
indent: 6,
items: ['jquery'],
prefix: '\'',
separator: ',\n',
suffix: '\''
},
cjs: {
indent: 6,
items: ['jquery'],
prefix: 'require(\'',
separator: ',\n',
suffix: '\')'
},
global: {
items: ['jQuery'],
},
pipeline: {
indent: 0,
items : ['jquery'],
prefix: '//= require ',
separator: '\n',
}
}
}
}
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": "lightgallery",
"version": "1.3.3",
"version": "1.3.4",
"description": "A lightweight, customizable, modular, responsive, lightbox gallery plugin for jQuery.",
"main": [
"dist/js/lightgallery.min.js",
Expand Down
2 changes: 1 addition & 1 deletion dist/css/lg-fb-comment-box.css

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

2 changes: 1 addition & 1 deletion dist/css/lg-transitions.css

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

2 changes: 1 addition & 1 deletion dist/css/lightgallery.css

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

Binary file modified dist/fonts/lg.eot
Binary file not shown.
5 changes: 5 additions & 0 deletions dist/fonts/lg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/fonts/lg.ttf
Binary file not shown.
Binary file modified dist/fonts/lg.woff
Binary file not shown.
17 changes: 10 additions & 7 deletions dist/js/lightgallery.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
/*! lightgallery - v1.3.3 - 2016-09-24
/*! lightgallery - v1.3.4 - 2016-09-28
* http://sachinchoolur.github.io/lightGallery/
* Copyright (c) 2016 Sachin N; Licensed Apache 2.0 */

(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module unless amdModuleId is set
define(["jquery"], function (a0) {
define(['jquery'], function (a0) {
return (factory(a0));
});
} else if (typeof exports === 'object') {
// Node. Does not work with strict CommonJS, but
// only CommonJS-like environments that support module.exports,
// like Node.
module.exports = factory(require("jquery"));
module.exports = factory(require('jquery'));
} else {
factory(jQuery);
}
}(this, function (jquery) {
}(this, function ($) {


(function(){
(function($, window, document, undefined) {
'use strict';

var defaults = {
Expand Down Expand Up @@ -361,7 +361,10 @@
$inner.css('transition-duration', this.s.speed + 'ms');
}

$('.lg-backdrop').addClass('in');

setTimeout(function() {
$('.lg-backdrop').addClass('in');
});

setTimeout(function() {
_this.$outer.addClass('lg-visible');
Expand Down Expand Up @@ -1331,7 +1334,7 @@

$.fn.lightGallery.modules = {};

})();
})(jQuery, window, document);


}));
4 changes: 2 additions & 2 deletions dist/js/lightgallery.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lightgallery",
"version": "1.3.3",
"version": "1.3.4",
"description": "A lightweight, customizable, modular, responsive, lightbox gallery plugin for jQuery.",
"keywords": [
"jquery-plugin",
Expand Down
9 changes: 6 additions & 3 deletions src/js/lightgallery.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

(function(){
(function($, window, document, undefined) {
'use strict';

var defaults = {
Expand Down Expand Up @@ -341,7 +341,10 @@
$inner.css('transition-duration', this.s.speed + 'ms');
}

$('.lg-backdrop').addClass('in');

setTimeout(function() {
$('.lg-backdrop').addClass('in');
});

setTimeout(function() {
_this.$outer.addClass('lg-visible');
Expand Down Expand Up @@ -1311,4 +1314,4 @@

$.fn.lightGallery.modules = {};

})();
})(jQuery, window, document);

0 comments on commit 99bf7ca

Please sign in to comment.