diff --git a/Gruntfile.js b/Gruntfile.js index a8a97caa..6f79e4f8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -38,9 +38,6 @@ module.exports = function(grunt) { // Directories (dist changed in init()) dirs: { src: 'src', dist: 'dist', libs: 'libs' }, - // Dependancies - dependancies: [ 'imagesloaded' ], - // Core files in order core: { js: [ @@ -107,12 +104,10 @@ module.exports = function(grunt) { }, files: { '<%=dirs.dist%>/jquery.qtip.js': [ - '<%=dirs.dist%>/jquery.qtip.js', - '<%=dirs.libs%>/imagesloaded/jquery.imagesloaded.js' + '<%=dirs.dist%>/jquery.qtip.js' ], '<%=dirs.dist%>/jquery.qtip.min.js': [ - '<%=dirs.dist%>/jquery.qtip.min.js', - '<%=dirs.libs%>/imagesloaded/jquery.imagesloaded.min.js' + '<%=dirs.dist%>/jquery.qtip.min.js' ] } } @@ -126,7 +121,8 @@ module.exports = function(grunt) { }, dist: { files: { - '<%=dirs.dist%>/jquery.qtip.min.js': ['<%=dirs.dist%>/jquery.qtip.js'] + '<%=dirs.dist%>/jquery.qtip.min.js': ['<%=dirs.dist%>/jquery.qtip.js'], + '<%=dirs.dist%>/imagesloaded.min.js': ['<%=dirs.libs%>/imagesloaded/imagesloaded.js'] } } }, diff --git a/libs/imagesloaded b/libs/imagesloaded index eb363e0d..905d6952 160000 --- a/libs/imagesloaded +++ b/libs/imagesloaded @@ -1 +1 @@ -Subproject commit eb363e0db53da02fc180323ba8fe8a320937221e +Subproject commit 905d69526bf1565b1abb931fb2a2c11d181dd72f diff --git a/src/core/content.js b/src/core/content.js index c5190d99..8ca4fa3d 100644 --- a/src/core/content.js +++ b/src/core/content.js @@ -32,9 +32,9 @@ PROTOTYPE._update = function(content, element, reposition) { // Content is a regular string, insert the new content else { element.html(content); } - // Ensure images have loaded... + // If imagesLoaded is included, ensure images have loaded and return promise cache.waiting = TRUE; - return element.imagesLoaded() + return ( $.fn.imagesLoaded ? element.imagesLoaded() : $.Deferred().resolve($()).promise() ) .done(function(images) { cache.waiting = FALSE; diff --git a/src/core/intro.js b/src/core/intro.js index 33672bfb..645ab720 100644 --- a/src/core/intro.js +++ b/src/core/intro.js @@ -8,7 +8,7 @@ (function( factory ) { "use strict"; if(typeof define === 'function' && define.amd) { - define(['jquery'], factory); + define(['jquery', 'imagesloaded'], factory); } else if(jQuery && !jQuery.fn.qtip) { factory(jQuery);