diff --git a/COPYING b/COPYING index 715ba35..ec4f768 100644 --- a/COPYING +++ b/COPYING @@ -50,9 +50,9 @@ Files: Files: inc/jquery*.js, inc/jquery-ui*.js License: MIT License (http://opensource.org/licenses/MIT) Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/ -Files: inc/jquery-lazyload*.js +Files: inc/blazy*.js License: MIT License (http://opensource.org/licenses/MIT) -Copyright: (C) Mika Tuupola, https://github.com/tuupola +Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy Files: inc/qr.js License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) diff --git a/inc/blazy-1.3.1.js b/inc/blazy-1.3.1.js new file mode 100644 index 0000000..cfc2dbd --- /dev/null +++ b/inc/blazy-1.3.1.js @@ -0,0 +1,232 @@ +/*! + hey, [be]Lazy.js - v1.3.1 - 2015.02.01 + A lazy loading and multi-serving image script + (c) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy +*/ +;(function(root, blazy) { + if (typeof define === 'function' && define.amd) { + // AMD. Register bLazy as an anonymous module + define(blazy); + } 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 = blazy(); + } else { + // Browser globals. Register bLazy on window + root.Blazy = blazy(); + } +})(this, function () { + 'use strict'; + + //vars + var source, options, viewport, images, count, isRetina, destroyed; + //throttle vars + var validateT, saveViewportOffsetT; + + // constructor + function Blazy(settings) { + //IE7- fallback for missing querySelectorAll support + if (!document.querySelectorAll) { + var s=document.createStyleSheet(); + document.querySelectorAll = function(r, c, i, j, a) { + a=document.all, c=[], r = r.replace(/\[for\b/gi, '[htmlFor').split(','); + for (i=r.length; i--;) { + s.addRule(r[i], 'k:v'); + for (j=a.length; j--;) a[j].currentStyle.k && c.push(a[j]); + s.removeRule(0); + } + return c; + }; + } + //init vars + destroyed = true; + images = []; + viewport = {}; + //options + options = settings || {}; + options.error = options.error || false; + options.offset = options.offset || 100; + options.success = options.success || false; + options.selector = options.selector || '.b-lazy'; + options.separator = options.separator || '|'; + options.container = options.container ? document.querySelectorAll(options.container) : false; + options.errorClass = options.errorClass || 'b-error'; + options.breakpoints = options.breakpoints || false; + options.successClass = options.successClass || 'b-loaded'; + options.src = source = options.src || 'data-src'; + isRetina = window.devicePixelRatio > 1; + viewport.top = 0 - options.offset; + viewport.left = 0 - options.offset; + //throttle, ensures that we don't call the functions too often + validateT = throttle(validate, 25); + saveViewportOffsetT = throttle(saveViewportOffset, 50); + + saveViewportOffset(); + + //handle multi-served image src + each(options.breakpoints, function(object){ + if(object.width >= window.screen.width) { + source = object.src; + return false; + } + }); + + // start lazy load + initialize(); + } + + /* public functions + ************************************/ + Blazy.prototype.revalidate = function() { + initialize(); + }; + Blazy.prototype.load = function(element, force){ + if(!isElementLoaded(element)) loadImage(element, force); + }; + Blazy.prototype.destroy = function(){ + if(options.container){ + each(options.container, function(object){ + unbindEvent(object, 'scroll', validateT); + }); + } + unbindEvent(window, 'scroll', validateT); + unbindEvent(window, 'resize', validateT); + unbindEvent(window, 'resize', saveViewportOffsetT); + count = 0; + images.length = 0; + destroyed = true; + }; + + /* private helper functions + ************************************/ + function initialize(){ + // First we create an array of images to lazy load + createImageArray(options.selector); + // Then we bind resize and scroll events if not already binded + if(destroyed) { + destroyed = false; + if(options.container) { + each(options.container, function(object){ + bindEvent(object, 'scroll', validateT); + }); + } + bindEvent(window, 'resize', saveViewportOffsetT); + bindEvent(window, 'resize', validateT); + bindEvent(window, 'scroll', validateT); + } + // And finally, we start to lazy load. Should bLazy ensure domready? + validate(); + } + + function validate() { + for(var i = 0; i 0 && ele.offsetHeight > 0)) { + var dataSrc = ele.getAttribute(source) || ele.getAttribute(options.src); // fallback to default data-src + if(dataSrc) { + var dataSrcSplitted = dataSrc.split(options.separator); + var src = dataSrcSplitted[isRetina && dataSrcSplitted.length > 1 ? 1 : 0]; + var img = new Image(); + // cleanup markup, remove data source attributes + each(options.breakpoints, function(object){ + ele.removeAttribute(object.src); + }); + ele.removeAttribute(options.src); + img.onerror = function() { + if(options.error) options.error(ele, "invalid"); + ele.className = ele.className + ' ' + options.errorClass; + }; + img.onload = function() { + // Is element an image or should we add the src as a background image? + ele.nodeName.toLowerCase() === 'img' ? ele.src = src : ele.style.backgroundImage = 'url("' + src + '")'; + ele.className = ele.className + ' ' + options.successClass; + if(options.success) options.success(ele); + }; + img.src = src; //preload image + } else { + if(options.error) options.error(ele, "missing"); + ele.className = ele.className + ' ' + options.errorClass; + } + } + } + + function elementInView(ele) { + var rect = ele.getBoundingClientRect(); + + return ( + // Intersection + rect.right >= viewport.left + && rect.bottom >= viewport.top + && rect.left <= viewport.right + && rect.top <= viewport.bottom + ); + } + + function isElementLoaded(ele) { + return (' ' + ele.className + ' ').indexOf(' ' + options.successClass + ' ') !== -1; + } + + function createImageArray(selector) { + var nodelist = document.querySelectorAll(selector); + count = nodelist.length; + //converting nodelist to array + for(var i = count; i--; images.unshift(nodelist[i])){} + } + + function saveViewportOffset(){ + viewport.bottom = (window.innerHeight || document.documentElement.clientHeight) + options.offset; + viewport.right = (window.innerWidth || document.documentElement.clientWidth) + options.offset; + } + + function bindEvent(ele, type, fn) { + if (ele.attachEvent) { + ele.attachEvent && ele.attachEvent('on' + type, fn); + } else { + ele.addEventListener(type, fn, false); + } + } + + function unbindEvent(ele, type, fn) { + if (ele.detachEvent) { + ele.detachEvent && ele.detachEvent('on' + type, fn); + } else { + ele.removeEventListener(type, fn, false); + } + } + + function each(object, fn){ + if(object && fn) { + var l = object.length; + for(var i = 0; i=window.screen.width)return r=b.src,!1});h()}function h(){y(a.selector);m&&(m=!1,a.container&&n(a.container,function(b){p(b,"scroll",f)}),p(window,"resize",t),p(window,"resize",f),p(window,"scroll",f));w()}function w(){for(var b=0;b=e.left&&c.bottom>=e.top&&c.left<=e.right&&c.top<=e.bottom||-1!==(" "+g.className+" ").indexOf(" "+a.successClass+" "))d.prototype.load(g),k.splice(b,1),l--,b--}0===l&&d.prototype.destroy()}function z(b,g){if(g||0 settings.failure_limit) { - return false; - } - } - }); - - } - - if(options) { - /* Maintain BC for a couple of versions. */ - if (undefined !== options.failurelimit) { - options.failure_limit = options.failurelimit; - delete options.failurelimit; - } - if (undefined !== options.effectspeed) { - options.effect_speed = options.effectspeed; - delete options.effectspeed; - } - - $.extend(settings, options); - } - - /* Cache container as jQuery as object. */ - $container = (settings.container === undefined || - settings.container === window) ? $window : $(settings.container); - - /* Fire one scroll event per scroll. Not one scroll event per image. */ - if (0 === settings.event.indexOf("scroll")) { - $container.bind(settings.event, function() { - return update(); - }); - } - - this.each(function() { - var self = this; - var $self = $(self); - - self.loaded = false; - - /* If no src attribute given use data:uri. */ - if ($self.attr("src") === undefined || $self.attr("src") === false) { - if ($self.is("img")) { - $self.attr("src", settings.placeholder); - } - } - - /* When appear is triggered load original image. */ - $self.one("appear", function() { - if (!this.loaded) { - if (settings.appear) { - var elements_left = elements.length; - settings.appear.call(self, elements_left, settings); - } - $("") - .bind("load", function() { - - var original = $self.attr("data-" + settings.data_attribute); - $self.hide(); - if ($self.is("img")) { - $self.attr("src", original); - } else { - $self.css("background-image", "url('" + original + "')"); - } - $self[settings.effect](settings.effect_speed); - - self.loaded = true; - - /* Remove image from array so it is not looped next time. */ - var temp = $.grep(elements, function(element) { - return !element.loaded; - }); - elements = $(temp); - - if (settings.load) { - var elements_left = elements.length; - settings.load.call(self, elements_left, settings); - } - }) - .attr("src", $self.attr("data-" + settings.data_attribute)); - } - }); - - /* When wanted event is triggered load original image */ - /* by triggering appear. */ - if (0 !== settings.event.indexOf("scroll")) { - $self.bind(settings.event, function() { - if (!self.loaded) { - $self.trigger("appear"); - } - }); - } - }); - - /* Check if something appears when window is resized. */ - $window.bind("resize", function() { - update(); - }); - - /* With IOS5 force loading images when navigating with back button. */ - /* Non optimal workaround. */ - if ((/(?:iphone|ipod|ipad).*os 5/gi).test(navigator.appVersion)) { - $window.bind("pageshow", function(event) { - if (event.originalEvent && event.originalEvent.persisted) { - elements.each(function() { - $(this).trigger("appear"); - }); - } - }); - } - - /* Force initial check if images should appear. */ - $(document).ready(function() { - update(); - }); - - return this; - }; - - /* Convenience methods in jQuery namespace. */ - /* Use as $.belowthefold(element, {threshold : 100, container : window}) */ - - $.belowthefold = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = (window.innerHeight ? window.innerHeight : $window.height()) + $window.scrollTop(); - } else { - fold = $(settings.container).offset().top + $(settings.container).height(); - } - - return fold <= $(element).offset().top - settings.threshold; - }; - - $.rightoffold = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.width() + $window.scrollLeft(); - } else { - fold = $(settings.container).offset().left + $(settings.container).width(); - } - - return fold <= $(element).offset().left - settings.threshold; - }; - - $.abovethetop = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.scrollTop(); - } else { - fold = $(settings.container).offset().top; - } - - return fold >= $(element).offset().top + settings.threshold + $(element).height(); - }; - - $.leftofbegin = function(element, settings) { - var fold; - - if (settings.container === undefined || settings.container === window) { - fold = $window.scrollLeft(); - } else { - fold = $(settings.container).offset().left; - } - - return fold >= $(element).offset().left + settings.threshold + $(element).width(); - }; - - $.inviewport = function(element, settings) { - return !$.rightoffold(element, settings) && !$.leftofbegin(element, settings) && - !$.belowthefold(element, settings) && !$.abovethetop(element, settings); - }; - - /* Custom selectors for your convenience. */ - /* Use as $("img:below-the-fold").something() or */ - /* $("img").filter(":below-the-fold").something() which is faster */ - - $.extend($.expr[":"], { - "below-the-fold" : function(a) { return $.belowthefold(a, {threshold : 0}); }, - "above-the-top" : function(a) { return !$.belowthefold(a, {threshold : 0}); }, - "right-of-screen": function(a) { return $.rightoffold(a, {threshold : 0}); }, - "left-of-screen" : function(a) { return !$.rightoffold(a, {threshold : 0}); }, - "in-viewport" : function(a) { return $.inviewport(a, {threshold : 0}); }, - /* Maintain BC for couple of versions. */ - "above-the-fold" : function(a) { return !$.belowthefold(a, {threshold : 0}); }, - "right-of-fold" : function(a) { return $.rightoffold(a, {threshold : 0}); }, - "left-of-fold" : function(a) { return !$.rightoffold(a, {threshold : 0}); } - }); - -})(jQuery, window, document); diff --git a/inc/jquery.lazyload-1.9.3.min.js b/inc/jquery.lazyload-1.9.3.min.js deleted file mode 100644 index 615b90e..0000000 --- a/inc/jquery.lazyload-1.9.3.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! Lazy Load 1.9.3 - MIT license - Copyright 2010-2013 Mika Tuupola */ -!function(a,b,c,d){var e=a(b);a.fn.lazyload=function(f){function g(){var b=0;i.each(function(){var c=a(this);if(!j.skip_invisible||c.is(":visible"))if(a.abovethetop(this,j)||a.leftofbegin(this,j));else if(a.belowthefold(this,j)||a.rightoffold(this,j)){if(++b>j.failure_limit)return!1}else c.trigger("appear"),b=0})}var h,i=this,j={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null,placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"};return f&&(d!==f.failurelimit&&(f.failure_limit=f.failurelimit,delete f.failurelimit),d!==f.effectspeed&&(f.effect_speed=f.effectspeed,delete f.effectspeed),a.extend(j,f)),h=j.container===d||j.container===b?e:a(j.container),0===j.event.indexOf("scroll")&&h.bind(j.event,function(){return g()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,(c.attr("src")===d||c.attr("src")===!1)&&c.is("img")&&c.attr("src",j.placeholder),c.one("appear",function(){if(!this.loaded){if(j.appear){var d=i.length;j.appear.call(b,d,j)}a("").bind("load",function(){var d=c.attr("data-"+j.data_attribute);c.hide(),c.is("img")?c.attr("src",d):c.css("background-image","url('"+d+"')"),c[j.effect](j.effect_speed),b.loaded=!0;var e=a.grep(i,function(a){return!a.loaded});if(i=a(e),j.load){var f=i.length;j.load.call(b,f,j)}}).attr("src",c.attr("data-"+j.data_attribute))}}),0!==j.event.indexOf("scroll")&&c.bind(j.event,function(){b.loaded||c.trigger("appear")})}),e.bind("resize",function(){g()}),/(?:iphone|ipod|ipad).*os 5/gi.test(navigator.appVersion)&&e.bind("pageshow",function(b){b.originalEvent&&b.originalEvent.persisted&&i.each(function(){a(this).trigger("appear")})}),a(c).ready(function(){g()}),this},a.belowthefold=function(c,f){var g;return g=f.container===d||f.container===b?(b.innerHeight?b.innerHeight:e.height())+e.scrollTop():a(f.container).offset().top+a(f.container).height(),g<=a(c).offset().top-f.threshold},a.rightoffold=function(c,f){var g;return g=f.container===d||f.container===b?e.width()+e.scrollLeft():a(f.container).offset().left+a(f.container).width(),g<=a(c).offset().left-f.threshold},a.abovethetop=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollTop():a(f.container).offset().top,g>=a(c).offset().top+f.threshold+a(c).height()},a.leftofbegin=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollLeft():a(f.container).offset().left,g>=a(c).offset().left+f.threshold+a(c).width()},a.inviewport=function(b,c){return!(a.rightoffold(b,c)||a.leftofbegin(b,c)||a.belowthefold(b,c)||a.abovethetop(b,c))},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})}(jQuery,window,document); \ No newline at end of file diff --git a/inc/shaarli.css b/inc/shaarli.css index bb564e9..a88143c 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css @@ -647,9 +647,21 @@ a.qrcode img { float: left; } +.b-lazy { + -webkit-transition: opacity 500ms ease-in-out; + -moz-transition: opacity 500ms ease-in-out; + -o-transition: opacity 500ms ease-in-out; + transition: opacity 500ms ease-in-out; + opacity: 0; +} +.b-lazy.b-loaded { + opacity: 1; +} + .picwall_pictureframe img { max-width: 100%; height: auto; + color: transparent; } /* Adapt the width of the image */ .picwall_pictureframe a { diff --git a/index.php b/index.php index 99c3765..890eb58 100644 --- a/index.php +++ b/index.php @@ -2125,11 +2125,8 @@ function lazyThumbnail($url,$href=false) $html=''; - // Lazy image (only loaded by JavaScript when in the viewport). - if (!empty($GLOBALS['disablejquery'])) // (except if jQuery is disabled) - $html.=' {include="includes"} -{if="empty($GLOBALS['disablejquery'])"} - - - -{/if} + @@ -20,12 +16,8 @@ {include="page.footer"} -{if="empty($GLOBALS['disablejquery'])"} -{/if} \ No newline at end of file diff --git a/tpl/picwall2.html b/tpl/picwall2.html deleted file mode 100644 index 44d08b0..0000000 --- a/tpl/picwall2.html +++ /dev/null @@ -1,19 +0,0 @@ - - -{include="includes"} - - -
- {loop="linksToDisplay"} -
-
{$value.thumbnail}
- {$value.title|htmlspecialchars}
- {$value.description|htmlspecialchars} -
-

- {/loop} -
- -{include="page.footer"} - - \ No newline at end of file