holder_rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d02d01436ba84ee6c50bc35b0644f606abc33ed
-  data.tar.gz: f6554f74633cff281227b93bfb21a47c8659b204
+  metadata.gz: 00cf2580599d5337218784c8efbcec34e86e3acc
+  data.tar.gz: aa74c9d961f3566c10d3889303a102656103e066
 SHA512:
-  metadata.gz: 50202367d53117e067c6903ced20cd1b7770c8716b58e4cd6a9212a4d6eb3f36fc82f2c3393047853fe800e1de4465eb3023aadb18ae6243f143ae909fc14bed
-  data.tar.gz: bb32c417f69957e418875f2a54d02ab77b87eae23156e5bd5afab17c7e7aa3347fc8c87786016625982956aabbc4691185dfe2e7ea80ad138ae266e074ffb44c
+  metadata.gz: d02496241c1759caab3976f6f848b166bccf32b39f1f17d5f5a287f8e0fcf56fc612156ee4bc99925a0e7b286cab60ad4c7130a757782a39339e2d83434d1eee
+  data.tar.gz: 611b7fbea28db0b8a1944b598a0386330f2a3538c7134f17bfb0689574390db6a97f83375ba730b8d421e182c1dac72a7bfbfddbcc53cd4f10a4016a56c0d203

data/lib/holder_rails/version.rb

@@ -1,3 +1,3 @@
 module HolderRails
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/vendor/assets/javascripts/holder.js

@@ -1,6 +1,6 @@
 /*
 
-Holder - 2.1 - client side image placeholders
+Holder - 2.2 - client side image placeholders
 (c) 2012-2013 Ivan Malopinsky / http://imsky.co
 
 Provided under the MIT License.
@@ -14,6 +14,8 @@ var Holder = Holder || {};
 var preempted = false,
 fallback = false,
 canvas = document.createElement('canvas');
+var dpr = 1, bsr = 1;
+var resizable_images = [];
 
 if (!canvas.getContext) {
 	fallback = true;
@@ -27,8 +29,6 @@ if (!canvas.getContext) {
 	}
 }
 
-var dpr = 1, bsr = 1;
-	
 if(!fallback){
     dpr = window.devicePixelRatio || 1,
     bsr = ctx.webkitBackingStorePixelRatio || ctx.mozBackingStorePixelRatio || ctx.msBackingStorePixelRatio || ctx.oBackingStorePixelRatio || ctx.backingStorePixelRatio || 1;
@@ -36,6 +36,99 @@ if(!fallback){
 
 var ratio = dpr / bsr;
 
+var settings = {
+	domain: "holder.js",
+	images: "img",
+	bgnodes: ".holderjs",
+	themes: {
+		"gray": {
+			background: "#eee",
+			foreground: "#aaa",
+			size: 12
+		},
+		"social": {
+			background: "#3a5a97",
+			foreground: "#fff",
+			size: 12
+		},
+		"industrial": {
+			background: "#434A52",
+			foreground: "#C2F200",
+			size: 12
+		},
+		"sky": {
+			background: "#0D8FDB",
+			foreground: "#fff",
+			size: 12
+		},
+		"vine": {
+			background: "#39DBAC",
+			foreground: "#1E292C",
+			size: 12
+		},
+		"lava": {
+			background: "#F8591A",
+			foreground: "#1C2846",
+			size: 12
+		}
+	},
+	stylesheet: ""
+};
+app.flags = {
+	dimensions: {
+		regex: /^(\d+)x(\d+)$/,
+		output: function (val) {
+			var exec = this.regex.exec(val);
+			return {
+				width: +exec[1],
+				height: +exec[2]
+			}
+		}
+	},
+	fluid: {
+		regex: /^([0-9%]+)x([0-9%]+)$/,
+		output: function (val) {
+			var exec = this.regex.exec(val);
+			return {
+				width: exec[1],
+				height: exec[2]
+			}
+		}
+	},
+	colors: {
+		regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i,
+		output: function (val) {
+			var exec = this.regex.exec(val);
+			return {
+				size: settings.themes.gray.size,
+				foreground: "#" + exec[2],
+				background: "#" + exec[1]
+			}
+		}
+	},
+	text: {
+		regex: /text\:(.*)/,
+		output: function (val) {
+			return this.regex.exec(val)[1];
+		}
+	},
+	font: {
+		regex: /font\:(.*)/,
+		output: function (val) {
+			return this.regex.exec(val)[1];
+		}
+	},
+	auto: {
+		regex: /^auto$/
+	},
+	textmode: {
+		regex: /textmode\:(.*)/,
+		output: function(val){
+			return this.regex.exec(val)[1];
+		}
+	}
+}
+
 //getElementsByClassName polyfill
 document.getElementsByClassName||(document.getElementsByClassName=function(e){var t=document,n,r,i,s=[];if(t.querySelectorAll)return t.querySelectorAll("."+e);if(t.evaluate){r=".//*[contains(concat(' ', @class, ' '), ' "+e+" ')]",n=t.evaluate(r,t,null,0,null);while(i=n.iterateNext())s.push(i)}else{n=t.getElementsByTagName("*"),r=new RegExp("(^|\\s)"+e+"(\\s|$)");for(i=0;i<n.length;i++)r.test(n[i].className)&&s.push(n[i])}return s})
 
@@ -52,7 +145,20 @@ function selector(a){
 }
 
 //shallow object property extend
-function extend(a,b){var c={};for(var d in a)c[d]=a[d];for(var e in b)c[e]=b[e];return c}
+function extend(a,b){
+	var c={};
+	for(var i in a){
+		if(a.hasOwnProperty(i)){
+			c[i]=a[i];
+		}
+	}
+	for(var i in b){
+		if(b.hasOwnProperty(i)){
+			c[i]=b[i];
+		}
+	}
+	return c
+}
 
 //hasOwnProperty polyfill
 if (!Object.prototype.hasOwnProperty)
@@ -75,7 +181,15 @@ function text_size(width, height, template) {
 	}
 }
 
-function draw(ctx, dimensions, template, ratio, literal) {
+function draw(args) {
+	var ctx = args.ctx;
+	var dimensions = args.dimensions;
+	var template = args.template;
+	var ratio = args.ratio;
+	var holder = args.holder;
+	var literal = holder.textmode == "literal";
+	var exact = holder.textmode == "exact";
+
 	var ts = text_size(dimensions.width, dimensions.height, template);
 	var text_height = ts.height;
 	var width = dimensions.width * ratio,
@@ -91,7 +205,12 @@ function draw(ctx, dimensions, template, ratio, literal) {
 	ctx.font = "bold " + text_height + "px " + font;
 	var text = template.text ? template.text : (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
 	if (literal) {
-		text = template.literalText;
+		var dimensions = holder.dimensions;
+		text = dimensions.width + "x" + dimensions.height;
+	}
+	else if(exact && holder.exact_dimensions){
+		var dimensions = holder.exact_dimensions;
+		text = (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
 	}
 	var text_width = ctx.measureText(text).width;
 	if (text_width / width >= 0.75) {
@@ -104,6 +223,7 @@ function draw(ctx, dimensions, template, ratio, literal) {
 }
 
 function render(mode, el, holder, src) {
+	
 	var dimensions = holder.dimensions,
 		theme = holder.theme,
 		text = holder.text ? decodeURIComponent(holder.text) : holder.text;
@@ -115,10 +235,9 @@ function render(mode, el, holder, src) {
 		font: holder.font
 	}) : theme);
 	el.setAttribute("data-src", src);
-	theme.literalText = dimensions_caption;
-	holder.originalTheme = holder.theme;
 	holder.theme = theme;
-
+	el.holder_data = holder;
+	
 	if (mode == "image") {
 		el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
 		if (fallback || !holder.auto) {
@@ -128,11 +247,17 @@ function render(mode, el, holder, src) {
 		if (fallback) {
 			el.style.backgroundColor = theme.background;
 		} else {
-			el.setAttribute("src", draw(ctx, dimensions, theme, ratio));
+			el.setAttribute("src", draw({ctx: ctx, dimensions: dimensions, template: theme, ratio:ratio, holder: holder}));
+			
+			if(holder.textmode && holder.textmode == "exact"){
+				resizable_images.push(el);
+				resizable_update(el);
+			}
+			
 		}
 	} else if (mode == "background") {
 		if (!fallback) {
-			el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")";
+			el.style.backgroundImage = "url(" + draw({ctx:ctx, dimensions: dimensions, template: theme, ratio: ratio, holder: holder}) + ")";
 			el.style.backgroundSize = dimensions.width + "px " + dimensions.height + "px";
 		}
 	} else if (mode == "fluid") {
@@ -147,41 +272,82 @@ function render(mode, el, holder, src) {
 		} else {
 			el.style.width = dimensions.width + "px"
 		}
-		if (el.style.display == "inline" || el.style.display === "") {
+		if (el.style.display == "inline" || el.style.display === "" || el.style.display == "none") {
 			el.style.display = "block";
 		}
 		if (fallback) {
 			el.style.backgroundColor = theme.background;
 		} else {
-			el.holderData = holder;
-			fluid_images.push(el);
-			fluid_update(el);
+			resizable_images.push(el);
+			resizable_update(el);
+		}
+	}
+}
+
+function dimension_check(el, callback) {
+	var dimensions = {
+		height: el.clientHeight,
+		width: el.clientWidth
+	};
+	if (!dimensions.height && !dimensions.width) {
+		if (el.hasAttribute("data-holder-invisible")) {
+			throw new Error("Holder: placeholder is not visible");
+		} else {
+			el.setAttribute("data-holder-invisible", true)
+			setTimeout(function () {
+				callback.call(this, el)
+			}, 1)
+			return null;
 		}
+	} else {
+		el.removeAttribute("data-holder-invisible")
 	}
+	return dimensions;
 }
 
-function fluid_update(element) {
+function resizable_update(element) {
 	var images;
 	if (element.nodeType == null) {
-		images = fluid_images;
+		images = resizable_images;
 	} else {
 		images = [element]
 	}
 	for (var i in images) {
+		if (!images.hasOwnProperty(i)) {
+			continue;
+		}
 		var el = images[i]
-		if (el.holderData) {
-			var holder = el.holderData;
-			el.setAttribute("src", draw(ctx, {
-				height: el.clientHeight,
-				width: el.clientWidth
-			}, holder.theme, ratio, !! holder.literal));
+		if (el.holder_data) {
+			var holder = el.holder_data;
+			var dimensions = dimension_check(el, resizable_update)
+			if(dimensions){
+				if(holder.fluid){
+					el.setAttribute("src", draw({
+						ctx: ctx,
+						dimensions: dimensions,
+						template: holder.theme,
+						ratio: ratio,
+						holder: holder
+					}))
+				}
+				if(holder.textmode && holder.textmode == "exact"){
+					holder.exact_dimensions = dimensions;
+					el.setAttribute("src", draw({
+						ctx: ctx,
+						dimensions: holder.dimensions,
+						template: holder.theme,
+						ratio: ratio,
+						holder: holder
+					}))
+				}
+			}
 		}
 	}
 }
 
 function parse_flags(flags, options) {
 	var ret = {
-		theme: settings.themes.gray
+		theme: extend(settings.themes.gray, {})
 	};
 	var render = false;
 	for (sl = flags.length, j = 0; j < sl; j++) {
@@ -193,13 +359,15 @@ function parse_flags(flags, options) {
 			render = true;
 			ret.dimensions = app.flags.fluid.output(flag);
 			ret.fluid = true;
-		} else if (app.flags.literal.match(flag)) {
-			ret.literal = true;
+		} else if (app.flags.textmode.match(flag)) {
+			ret.textmode = app.flags.textmode.output(flag)
 		} else if (app.flags.colors.match(flag)) {
 			ret.theme = app.flags.colors.output(flag);
 		} else if (options.themes[flag]) {
 			//If a theme is specified, it will override custom colors
-			ret.theme = options.themes[flag];
+			if(options.themes.hasOwnProperty(flag)){
+				ret.theme = extend(options.themes[flag], {});
+			}
 		} else if (app.flags.font.match(flag)) {
 			ret.font = app.flags.font.output(flag);
 		} else if (app.flags.auto.match(flag)) {
@@ -210,81 +378,7 @@ function parse_flags(flags, options) {
 	}
 	return render ? ret : false;
 }
-var fluid_images = [];
-var settings = {
-	domain: "holder.js",
-	images: "img",
-	bgnodes: ".holderjs",
-	themes: {
-		"gray": {
-			background: "#eee",
-			foreground: "#aaa",
-			size: 12
-		},
-		"social": {
-			background: "#3a5a97",
-			foreground: "#fff",
-			size: 12
-		},
-		"industrial": {
-			background: "#434A52",
-			foreground: "#C2F200",
-			size: 12
-		}
-	},
-	stylesheet: ""
-};
-app.flags = {
-	dimensions: {
-		regex: /^(\d+)x(\d+)$/,
-		output: function (val) {
-			var exec = this.regex.exec(val);
-			return {
-				width: +exec[1],
-				height: +exec[2]
-			}
-		}
-	},
-	fluid: {
-		regex: /^([0-9%]+)x([0-9%]+)$/,
-		output: function (val) {
-			var exec = this.regex.exec(val);
-			return {
-				width: exec[1],
-				height: exec[2]
-			}
-		}
-	},
-	colors: {
-		regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i,
-		output: function (val) {
-			var exec = this.regex.exec(val);
-			return {
-				size: settings.themes.gray.size,
-				foreground: "#" + exec[2],
-				background: "#" + exec[1]
-			}
-		}
-	},
-	text: {
-		regex: /text\:(.*)/,
-		output: function (val) {
-			return this.regex.exec(val)[1];
-		}
-	},
-	font: {
-		regex: /font\:(.*)/,
-		output: function (val) {
-			return this.regex.exec(val)[1];
-		}
-	},
-	auto: {
-		regex: /^auto$/
-	},
-	literal: {
-		regex: /^literal$/
-	}
-}
+
 for (var flag in app.flags) {
 	if (!app.flags.hasOwnProperty(flag)) continue;
 	app.flags[flag].match = function (val) {
@@ -307,6 +401,8 @@ app.add_image = function (src, el) {
 	return app;
 };
 app.run = function (o) {
+	preempted = true;
+	
 	var options = extend(settings, o),
 		images = [],
 		imageNodes = [],
@@ -318,6 +414,7 @@ app.run = function (o) {
 	} else if (window.Node && options.images instanceof window.Node) {
 		imageNodes = [options.images];
 	}
+	
 	if (typeof (options.bgnodes) == "string") {
 		bgnodes = selector(options.bgnodes);
 	} else if (window.NodeList && options.elements instanceof window.NodeList) {
@@ -325,7 +422,6 @@ app.run = function (o) {
 	} else if (window.Node && options.bgnodes instanceof window.Node) {
 		bgnodes = [options.bgnodes];
 	}
-	preempted = true;
 	for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]);
 	var holdercss = document.getElementById("holderjs-style");
 	if (!holdercss) {
@@ -388,10 +484,10 @@ app.run = function (o) {
 };
 contentLoaded(win, function () {
 	if (window.addEventListener) {
-		window.addEventListener("resize", fluid_update, false);
-		window.addEventListener("orientationchange", fluid_update, false);
+		window.addEventListener("resize", resizable_update, false);
+		window.addEventListener("orientationchange", resizable_update, false);
 	} else {
-		window.attachEvent("onresize", fluid_update)
+		window.attachEvent("onresize", resizable_update)
 	}
 	preempted || app.run();
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holder_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: Holder.js for Rails 3.1 asset pipeline