imagesLoaded_rails 3.0.4 → 3.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhmNTllZTI0ZDE4ZDk0YzcyZDJkZmFlNzU3ZjRmMzY0ZTg0OTY2MA==
+    YTZmM2JhYWU2MjkxOTY5NzI1YzAwM2VhNjE3ZGYwODc5NGIwZTMyNw==
   data.tar.gz: !binary |-
-    ZTg4N2JjZGExMTBiM2EwMzVkYzc2YTc0MmNlZmE3NDU0MGJhMzc5NQ==
+    YTc2YmQ5MDNlOTQ3MjcxOGM4M2ZlM2ZkOTFmMmE3NDhhMDJkOGQ0OQ==
 SHA512:
   metadata.gz: !binary |-
-    MzQwYWNkOWY5YzczOWVmNWMwZWY5YzVmNmY0ZWU4MjA5YmVmZjQxY2I3Y2Q5
-    NTczZWJhYzQ5YmUyYmE1NTgxZGEwZDExM2VkZGM1ZDYzM2VhOWI5NmM1MDQy
-    OTEzZTYwMWQ3ZTljNjZlODMzOTBkODlmZjQwM2VkYzUzNmUwMjY=
+    NDQ3YWI5ZTU3OGVmOTMzNzIyNjA5ODAzMDgwOTRlNDc0MWIyNTFmNmZiMjNh
+    YjY2N2JmY2RjMTc4MTUyMzA4NjcwYWU5MDJmZTA2NWQwMzJlMjkxZGQzODFj
+    NjcyOTYxOGI1MWY0MjZhNzVmM2ZmMWMwMDA0ZWY0Y2JkMTgyNjg=
   data.tar.gz: !binary |-
-    MzE0ODI4NzdkMzBlMTdmNjZiZmZkZjI3YTc2YmQ0MTY5YjE1OGZhOWNkZGI4
-    ZWUzOTY3MmM5M2NlMjMyODMzOTRiOTA3MjdhNDI1NGQxNDU0NTMxMDQwODNj
-    MjI4ODVkNzllNjcyNDQzNjdlMjA0MDI4M2ZlYmRkMjBiZmRkN2U=
+    NDBkODViMDE4ODVkMzZkMTViM2ZmODkxZTQ1NWY1ZjliMTdhNWJhNDljN2Zm
+    NDVhZThkZjQyMWM0YWNiZTQ1NjBlMGRhZDk3Y2I4ZGYwZmFiNzQwODAwM2E4
+    ZTkxYWRkM2ZlOGE0NThmM2M1YTk3ZjNkZTU1MTE4YTZhNTg5NGE=

data/app/assets/javascripts/imagesloaded.js

@@ -1,10 +1,7 @@
 /*!
- * imagesLoaded.js v3.0.4
+ * imagesLoaded v3.1.1
  * JavaScript is all like "You images are done yet or what?"
- * Tomas Sardyha @Darsain and David DeSandro @desandro.
- * MIT license - http://desandro.mit-license.org/
- * http://desandro.github.io/imagesloaded/
- * source - https://github.com/desandro/imagesloaded
+ * MIT License
  */
 
 ( function( window ) {
@@ -196,8 +193,6 @@ function defineImagesLoaded( EventEmitter, eventie ) {
 
   // --------------------------  -------------------------- //
 
-  var cache = {};
-
   function LoadingImage( img ) {
     this.img = img;
   }
@@ -206,13 +201,11 @@ function defineImagesLoaded( EventEmitter, eventie ) {
 
   LoadingImage.prototype.check = function() {
     // first check cached any previous images that have same src
-    var cached = cache[ this.img.src ];
-    if ( cached ) {
-      this.useCached( cached );
+    var resource = cache[ this.img.src ] || new Resource( this.img.src );
+    if ( resource.isConfirmed ) {
+      this.confirm( resource.isLoaded, 'cached was confirmed' );
       return;
     }
-    // add this to cache
-    cache[ this.img.src ] = this;
 
     // If complete is true and browser supports natural sizes,
     // try to check for image status manually.
@@ -223,51 +216,80 @@ function defineImagesLoaded( EventEmitter, eventie ) {
     }
 
     // If none of the checks above matched, simulate loading on detached element.
-    var proxyImage = this.proxyImage = new Image();
-    eventie.bind( proxyImage, 'load', this );
-    eventie.bind( proxyImage, 'error', this );
-    proxyImage.src = this.img.src;
-  };
+    var _this = this;
+    resource.on( 'confirm', function( resrc, message ) {
+      _this.confirm( resrc.isLoaded, message );
+      return true;
+    });
 
-  LoadingImage.prototype.useCached = function( cached ) {
-    if ( cached.isConfirmed ) {
-      this.confirm( cached.isLoaded, 'cached was confirmed' );
-    } else {
-      var _this = this;
-      cached.on( 'confirm', function( image ) {
-        _this.confirm( image.isLoaded, 'cache emitted confirmed' );
-        return true; // bind once
-      });
-    }
+    resource.check();
   };
 
   LoadingImage.prototype.confirm = function( isLoaded, message ) {
-    this.isConfirmed = true;
     this.isLoaded = isLoaded;
     this.emit( 'confirm', this, message );
   };
 
+  // -------------------------- Resource -------------------------- //
+
+  // Resource checks each src, only once
+  // separate class from LoadingImage to prevent memory leaks. See #115
+
+  var cache = {};
+
+  function Resource( src ) {
+    this.src = src;
+    // add to cache
+    cache[ src ] = this;
+  }
+
+  Resource.prototype = new EventEmitter();
+
+  Resource.prototype.check = function() {
+    // only trigger checking once
+    if ( this.isChecked ) {
+      return;
+    }
+    // simulate loading on detached element
+    var proxyImage = new Image();
+    eventie.bind( proxyImage, 'load', this );
+    eventie.bind( proxyImage, 'error', this );
+    proxyImage.src = this.src;
+    // set flag
+    this.isChecked = true;
+  };
+
+  // ----- events ----- //
+
   // trigger specified handler for event type
-  LoadingImage.prototype.handleEvent = function( event ) {
+  Resource.prototype.handleEvent = function( event ) {
     var method = 'on' + event.type;
     if ( this[ method ] ) {
       this[ method ]( event );
     }
   };
 
-  LoadingImage.prototype.onload = function() {
+  Resource.prototype.onload = function( event ) {
     this.confirm( true, 'onload' );
-    this.unbindProxyEvents();
+    this.unbindProxyEvents( event );
   };
 
-  LoadingImage.prototype.onerror = function() {
+  Resource.prototype.onerror = function( event ) {
     this.confirm( false, 'onerror' );
-    this.unbindProxyEvents();
+    this.unbindProxyEvents( event );
+  };
+
+  // ----- confirm ----- //
+
+  Resource.prototype.confirm = function( isLoaded, message ) {
+    this.isConfirmed = true;
+    this.isLoaded = isLoaded;
+    this.emit( 'confirm', this, message );
   };
 
-  LoadingImage.prototype.unbindProxyEvents = function() {
-    eventie.unbind( this.proxyImage, 'load', this );
-    eventie.unbind( this.proxyImage, 'error', this );
+  Resource.prototype.unbindProxyEvents = function( event ) {
+    eventie.unbind( event.target, 'load', this );
+    eventie.unbind( event.target, 'error', this );
   };
 
   // -----  ----- //

data/lib/imagesLoaded_rails/version.rb

@@ -1,3 +1,3 @@
 module ImagesLoadedRails
-  VERSION = "3.0.4"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagesLoaded_rails
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.1
 platform: ruby
 authors:
 - Guy Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler