Item13006: update to upstream jquery.lazyload

foswiki · Aug 28, 2014 · 07d72cf · 07d72cf
1 parent 3ea6e3e
commit 07d72cf
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+*.gz
+*.swp
+pub/System/LazyLoadPlugin/git
+pub/System/LazyLoadPlugin/jquery.lazyload.init.js
+pub/System/LazyLoadPlugin/jquery.lazyload.js
+LazyLoadPlugin.md5
+LazyLoadPlugin.sha1
+LazyLoadPlugin.tgz
+LazyLoadPlugin.txt
+LazyLoadPlugin.zip
+LazyLoadPlugin_installer
+LazyLoadPlugin_installer.pl
diff --git a/data/System/LazyLoadPlugin.txt b/data/System/LazyLoadPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="BaseUserMapping_999" comment="autosave" date="1356278775" format="1.1" version="3"}%
+%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1356278775" format="1.1" version="3"}%
 ---+!! %TOPIC%
 %TOC%
 

diff --git a/lib/Foswiki/Plugins/LazyLoadPlugin.pm b/lib/Foswiki/Plugins/LazyLoadPlugin.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# MyEmptyPlugin is Copyright (C) 2011 Michael Daum http://michaeldaumconsulting.com
+# MyEmptyPlugin is Copyright (C) 2011-2014 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,8 +21,8 @@ use warnings;
 use Foswiki::Func ();
 use Foswiki::Plugins::JQueryPlugin ();
 
-our $VERSION = '1.20';
-our $RELEASE = '1.20';
+our $VERSION = '1.21';
+our $RELEASE = '1.21';
 our $SHORTDESCRIPTION = 'deferred loading of images';
 our $NO_PREFS_IN_TOPIC = 1;
 our $doneInit;

diff --git a/lib/Foswiki/Plugins/LazyLoadPlugin/Core.pm b/lib/Foswiki/Plugins/LazyLoadPlugin/Core.pm
@@ -14,7 +14,7 @@ sub new {
     $class->SUPER::new(
       $session,
       name => 'LazyLoad',
-      version => '1.8.2',
+      version => '1.9.3',
       author => 'Mika Tuupola',
       homepage => 'http://www.appelsiini.net/projects/lazyload',
       javascript => ['jquery.lazyload.js', 'jquery.lazyload.init.js'], 

diff --git a/pub/System/LazyLoadPlugin/Makefile b/pub/System/LazyLoadPlugin/Makefile
@@ -1,6 +1,14 @@
-FOSWIKI_ROOT?=~/foswiki/trunk/core
+FOSWIKI_ROOT?=~/foswiki/core
+CP=cp
 TARGET=\
   jquery.lazyload.js \
   jquery.lazyload.init.js
 
 -include $(FOSWIKI_ROOT)/pub/System/JQueryPlugin/Makefile.include
+
+jquery.lazyload.uncompressed.js: git/jquery.lazyload.js
+	@echo copying $< to $@ 
+	@$(CP) $< $@
+
+clean:
+	rm jquery.lazyload.uncompressed.js $(TARGET) *.gz
diff --git a/pub/System/LazyLoadPlugin/jquery.lazyload.uncompressed.js b/pub/System/LazyLoadPlugin/jquery.lazyload.uncompressed.js
@@ -1,17 +1,18 @@
 /*
  * Lazy Load - jQuery plugin for lazy loading images
  *
- * Copyright (c) 2007-2012 Mika Tuupola
+ * Copyright (c) 2007-2013 Mika Tuupola
  *
  * Licensed under the MIT license:
  *   http://www.opensource.org/licenses/mit-license.php
  *
  * Project home:
  *   http://www.appelsiini.net/projects/lazyload
  *
- * Version:  1.8.2
+ * Version:  1.9.3
  *
  */
+
 (function($, window, document, undefined) {
     var $window = $(window);
 
@@ -27,12 +28,13 @@
             data_attribute  : "original",
             skip_invisible  : true,
             appear          : null,
-            load            : null
+            load            : null,
+            placeholder     : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"
         };
 
         function update() {
             var counter = 0;
-      
+
             elements.each(function() {
                 var $this = $(this);
                 if (settings.skip_invisible && !$this.is(":visible")) {
@@ -58,11 +60,11 @@
         if(options) {
             /* Maintain BC for a couple of versions. */
             if (undefined !== options.failurelimit) {
-                options.failure_limit = options.failurelimit; 
+                options.failure_limit = options.failurelimit;
                 delete options.failurelimit;
             }
             if (undefined !== options.effectspeed) {
-                options.effect_speed = options.effectspeed; 
+                options.effect_speed = options.effectspeed;
                 delete options.effectspeed;
             }
 
@@ -75,7 +77,7 @@
 
         /* Fire one scroll event per scroll. Not one scroll event per image. */
         if (0 === settings.event.indexOf("scroll")) {
-            $container.bind(settings.event, function(event) {
+            $container.bind(settings.event, function() {
                 return update();
             });
         }
@@ -86,6 +88,13 @@
 
             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) {
@@ -95,10 +104,16 @@
                     }
                     $("<img />")
                         .bind("load", function() {
-                            $self
-                                .hide()
-                                .attr("src", $self.data(settings.data_attribute))
-                                [settings.effect](settings.effect_speed);
+
+                            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. */
@@ -112,14 +127,14 @@
                                 settings.load.call(self, elements_left, settings);
                             }
                         })
-                        .attr("src", $self.data(settings.data_attribute));
+                        .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(event) {
+                $self.bind(settings.event, function() {
                     if (!self.loaded) {
                         $self.trigger("appear");
                     }
@@ -128,15 +143,15 @@
         });
 
         /* Check if something appears when window is resized. */
-        $window.bind("resize", function(event) {
+        $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)) {
+        if ((/(?:iphone|ipod|ipad).*os 5/gi).test(navigator.appVersion)) {
             $window.bind("pageshow", function(event) {
-                if (event.originalEvent.persisted) {
+                if (event.originalEvent && event.originalEvent.persisted) {
                     elements.each(function() {
                         $(this).trigger("appear");
                     });
@@ -148,7 +163,7 @@
         $(document).ready(function() {
             update();
         });
-        
+
         return this;
     };
 
@@ -157,16 +172,16 @@
 
     $.belowthefold = function(element, settings) {
         var fold;
-        
+
         if (settings.container === undefined || settings.container === window) {
-            fold = $window.height() + $window.scrollTop();
+            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;
 
@@ -178,10 +193,10 @@
 
         return fold <= $(element).offset().left - settings.threshold;
     };
-        
+
     $.abovethetop = function(element, settings) {
         var fold;
-        
+
         if (settings.container === undefined || settings.container === window) {
             fold = $window.scrollTop();
         } else {
@@ -190,10 +205,10 @@
 
         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 {
@@ -212,7 +227,7 @@
     /* Use as $("img:below-the-fold").something() or */
     /* $("img").filter(":below-the-fold").something() which is faster */
 
-    $.extend($.expr[':'], {
+    $.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}); },