retina_tag 1.1.1 → 1.1.2

data/README.md

@@ -37,9 +37,8 @@ Be sure to also specify the base dimensions in your `image_tag` calls:
 
 Awesome right?
 
-## Lazy Loading Images (EXPIREMENTAL)
-if you set `:lazy => true` on an image_tag, the src attribute is moved to a lodpi_src attribute. A seperate attribuet `data-lazy-load` is live updated with the devicePixelRatio state, and the src attribute is not automatically updated.
-When you are ready to load the image, you can simply remove the image elements `data-lazy-load` attribute, and retina_tag will automatically insert the src attribute properly.
+## Lazy Loading Images
+if you set `:lazy => true` on an image_tag, the src attribute is moved to a lodpi_src attribute. You will need to manually instruct the image to load. To do this use `RetinaTag.refreshImage(img)` where img is the image element.
 
 
 ## Contributing

data/app/assets/javascripts/retina_tag.js

@@ -1,7 +1,6 @@
 var RetinaTag = RetinaTag || {};
 
 RetinaTag.init = function() {
-  RetinaTag.updateImages();
   window.matchMedia('(-webkit-device-pixel-ratio:1)').addListener(RetinaTag.updateImages);
   document.addEventListener("page:load", RetinaTag.updateImages);
   document.addEventListener("retina_tag:refresh", RetinaTag.updateImages);
@@ -10,7 +9,9 @@ RetinaTag.init = function() {
 RetinaTag.updateImages = function() {
   var images = document.getElementsByTagName('img');
   for(var counter=0; counter < images.length; counter++) {
-    RetinaTag.refreshImage(images[counter]);
+    if(!images[counter].getAttribute('data-lazy-load')) {
+      RetinaTag.refreshImage(images[counter]);
+    }
   }
 };
 
@@ -22,27 +23,20 @@ RetinaTag.refreshImage = function(image) {
   if(!hiDpiSrc) {
     return;
   }
-
+  if(lazyLoad)
+  {
+    image.removeAttribute('data-lazy-load');
+  }
   if(window.devicePixelRatio > 1 && imageSrc != hiDpiSrc) {
     if(!lowDpiSrc) {
       image.setAttribute('lowdpi_src',imageSrc);
     }
-    if(lazyLoad) {
-      image.setAttribute('data-lazy-load','2x');
-    }
-    else {
-      image.src = hiDpiSrc;
-    }
-
+    image.src = hiDpiSrc;
   }
   else if(window.devicePixelRatio <= 1 && (imageSrc == hiDpiSrc || (lowDpiSrc && imageSrc != lowDpiSrc))) {
-    if(lazyLoad) {
-      image.setAttribute('data-lazy-load','1x');
-    }
-    else {
-      image.src = lowDpiSrc;
-    }
+    image.src = lowDpiSrc;
   }
 };
 
-$(document).ready(RetinaTag.init);
+RetinaTag.init();
+$(document).ready(RetinaTag.updateImages);

data/lib/retina_tag/image_tag_helper.rb

@@ -19,13 +19,21 @@ module ActionView
       def image_tag_with_retina(source,options={})
         options_default = { :hidpi_src => hidpi_asset_path(source) }
 
-        if options[:lazy]
-          options.delete(:lazy)
-          options["data-lazy-load"] = "1x"
-          options[:lowdpi_src] = source
-          source = ''
+        if lazy = options.delete(:lazy)
+          options["data-lazy-load"] = lazy
         end
-        image_tag_without_retina(source,options_default.merge(options))
+
+        options_default.merge!(options)
+
+        image_tag_without_retina(source,options_default)
+
+        if options_default[:"data-lazy-load"]
+          puts "Lazy load detected"
+          options_default[:lowdpi_src] = options_default.delete(:src)
+        end
+        puts "Using custom image Tag!"
+        puts options_default
+        tag("img", options_default)
       end
 
       alias_method_chain :image_tag, :retina

data/lib/retina_tag/version.rb

@@ -1,3 +1,3 @@
 module RetinaTag
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_tag
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -803285465304008810
+      hash: -755295882179579949
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -803285465304008810
+      hash: -755295882179579949
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24