From 1a0df1fbd09d58713e19a62f2073ec2db2eb9839 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 9 Oct 2013 18:52:19 -0700 Subject: [PATCH] upgrade holder.js to v2.1 --- docs-assets/js/holder.js | 425 +++++++++++++++++++-------------------- 1 file changed, 205 insertions(+), 220 deletions(-) mode change 100644 => 100755 docs-assets/js/holder.js diff --git a/docs-assets/js/holder.js b/docs-assets/js/holder.js old mode 100644 new mode 100755 index f717054c3d..ebeb3c5296 --- a/docs-assets/js/holder.js +++ b/docs-assets/js/holder.js @@ -1,9 +1,9 @@ /* -Holder - 2.0 - client side image placeholders +Holder - 2.1 - client side image placeholders (c) 2012-2013 Ivan Malopinsky / http://imsky.co -Provided under the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0 +Provided under the MIT License. Commercial use requires attribution. */ @@ -15,176 +15,6 @@ var preempted = false, fallback = false, canvas = document.createElement('canvas'); -//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= 0.75) { - text_height = Math.floor(text_height * 0.75 * (width/text_width)); - } - //Resetting font size if necessary - ctx.font = "bold " + (text_height * ratio) + "px " + font; - ctx.fillText(text, (width / 2), (height / 2), width); - return canvas.toDataURL("image/png"); -} - -function render(mode, el, holder, src) { - var dimensions = holder.dimensions, - theme = holder.theme, - text = holder.text ? decodeURIComponent(holder.text) : holder.text; - var dimensions_caption = dimensions.width + "x" + dimensions.height; - theme = (text ? extend(theme, { - text: text - }) : theme); - theme = (holder.font ? extend(theme, { - font: holder.font - }) : theme); - if (mode == "image") { - el.setAttribute("data-src", src); - el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption); - if (fallback || !holder.auto) { - el.style.width = dimensions.width + "px"; - el.style.height = dimensions.height + "px"; - } - if (fallback) { - el.style.backgroundColor = theme.background; - } else { - el.setAttribute("src", draw(ctx, dimensions, theme, ratio)); - } - } else if (mode == "background") { - if (!fallback) { - el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")"; - el.style.backgroundSize = dimensions.width + "px " + dimensions.height + "px"; - } - } else if (mode == "fluid") { - el.setAttribute("data-src", src); - el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption); - if (dimensions.height.substr(-1) == "%") { - el.style.height = dimensions.height - } else { - el.style.height = dimensions.height + "px" - } - if (dimensions.width.substr(-1) == "%") { - el.style.width = dimensions.width - } else { - el.style.width = dimensions.width + "px" - } - if (el.style.display == "inline" || el.style.display == "") { - el.style.display = "block"; - } - if (fallback) { - el.style.backgroundColor = theme.background; - } else { - el.holderData = holder; - fluid_images.push(el); - fluid_update(el); - } - } -}; - -function fluid_update(element) { - var images; - if (element.nodeType == null) { - images = fluid_images; - } else { - images = [element] - } - for (i in images) { - 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)); - } - } -} - -function parse_flags(flags, options) { - - var ret = { - theme: settings.themes.gray - }, render = false; - - for (sl = flags.length, j = 0; j < sl; j++) { - var flag = flags[j]; - if (app.flags.dimensions.match(flag)) { - render = true; - ret.dimensions = app.flags.dimensions.output(flag); - } else if (app.flags.fluid.match(flag)) { - render = true; - ret.dimensions = app.flags.fluid.output(flag); - ret.fluid = true; - } 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]; - } else if (app.flags.text.match(flag)) { - ret.text = app.flags.text.output(flag); - } else if (app.flags.font.match(flag)) { - ret.font = app.flags.font.output(flag); - } else if (app.flags.auto.match(flag)) { - ret.auto = true; - } - } - - return render ? ret : false; - -}; - - - if (!canvas.getContext) { fallback = true; } else { @@ -206,8 +36,181 @@ if(!fallback){ var ratio = dpr / bsr; -var fluid_images = []; +//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= 0.75) { + text_height = Math.floor(text_height * 0.75 * (width / text_width)); + } + //Resetting font size if necessary + ctx.font = "bold " + (text_height * ratio) + "px " + font; + ctx.fillText(text, (width / 2), (height / 2), width); + return canvas.toDataURL("image/png"); +} + +function render(mode, el, holder, src) { + var dimensions = holder.dimensions, + theme = holder.theme, + text = holder.text ? decodeURIComponent(holder.text) : holder.text; + var dimensions_caption = dimensions.width + "x" + dimensions.height; + theme = (text ? extend(theme, { + text: text + }) : theme); + theme = (holder.font ? extend(theme, { + font: holder.font + }) : theme); + el.setAttribute("data-src", src); + theme.literalText = dimensions_caption; + holder.originalTheme = holder.theme; + holder.theme = theme; + + if (mode == "image") { + el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption); + if (fallback || !holder.auto) { + el.style.width = dimensions.width + "px"; + el.style.height = dimensions.height + "px"; + } + if (fallback) { + el.style.backgroundColor = theme.background; + } else { + el.setAttribute("src", draw(ctx, dimensions, theme, ratio)); + } + } else if (mode == "background") { + if (!fallback) { + el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")"; + el.style.backgroundSize = dimensions.width + "px " + dimensions.height + "px"; + } + } else if (mode == "fluid") { + el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption); + if (dimensions.height.slice(-1) == "%") { + el.style.height = dimensions.height + } else { + el.style.height = dimensions.height + "px" + } + if (dimensions.width.slice(-1) == "%") { + el.style.width = dimensions.width + } else { + el.style.width = dimensions.width + "px" + } + if (el.style.display == "inline" || el.style.display === "") { + el.style.display = "block"; + } + if (fallback) { + el.style.backgroundColor = theme.background; + } else { + el.holderData = holder; + fluid_images.push(el); + fluid_update(el); + } + } +} + +function fluid_update(element) { + var images; + if (element.nodeType == null) { + images = fluid_images; + } else { + images = [element] + } + for (var i in images) { + 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)); + } + } +} + +function parse_flags(flags, options) { + var ret = { + theme: settings.themes.gray + }; + var render = false; + for (sl = flags.length, j = 0; j < sl; j++) { + var flag = flags[j]; + if (app.flags.dimensions.match(flag)) { + render = true; + ret.dimensions = app.flags.dimensions.output(flag); + } else if (app.flags.fluid.match(flag)) { + 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.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]; + } else if (app.flags.font.match(flag)) { + ret.font = app.flags.font.output(flag); + } else if (app.flags.auto.match(flag)) { + ret.auto = true; + } else if (app.flags.text.match(flag)) { + ret.text = app.flags.text.output(flag); + } + } + return render ? ret : false; +} +var fluid_images = []; var settings = { domain: "holder.js", images: "img", @@ -229,10 +232,8 @@ var settings = { size: 12 } }, - stylesheet: ".holderjs-fluid {font-size:16px;font-weight:bold;text-align:center;font-family:sans-serif;margin:0}" + stylesheet: "" }; - - app.flags = { dimensions: { regex: /^(\d+)x(\d+)$/, @@ -279,21 +280,21 @@ app.flags = { }, auto: { regex: /^auto$/ + }, + literal: { + regex: /^literal$/ } } - for (var flag in app.flags) { if (!app.flags.hasOwnProperty(flag)) continue; app.flags[flag].match = function (val) { return val.match(this.regex) } } - app.add_theme = function (name, theme) { name != null && theme != null && (settings.themes[name] = theme); return app; }; - app.add_image = function (src, el) { var node = selector(el); if (node.length) { @@ -305,32 +306,27 @@ app.add_image = function (src, el) { } return app; }; - app.run = function (o) { var options = extend(settings, o), - images = [], imageNodes = [], bgnodes = []; - - if(typeof(options.images) == "string"){ - imageNodes = selector(options.images); - } - else if (window.NodeList && options.images instanceof window.NodeList) { + images = [], + imageNodes = [], + bgnodes = []; + if (typeof (options.images) == "string") { + imageNodes = selector(options.images); + } else if (window.NodeList && options.images instanceof window.NodeList) { imageNodes = options.images; } else if (window.Node && options.images instanceof window.Node) { imageNodes = [options.images]; } - - if(typeof(options.bgnodes) == "string"){ - bgnodes = selector(options.bgnodes); + if (typeof (options.bgnodes) == "string") { + bgnodes = selector(options.bgnodes); } else if (window.NodeList && options.elements instanceof window.NodeList) { bgnodes = options.bgnodes; } 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) { holdercss = document.createElement("style"); @@ -338,53 +334,44 @@ app.run = function (o) { holdercss.type = "text/css"; document.getElementsByTagName("head")[0].appendChild(holdercss); } - if (!options.nocss) { - if (holdercss.styleSheet) { - holdercss.styleSheet.cssText += options.stylesheet; - } else { - holdercss.appendChild(document.createTextNode(options.stylesheet)); - } + if (holdercss.styleSheet) { + holdercss.styleSheet.cssText += options.stylesheet; + } else { + holdercss.appendChild(document.createTextNode(options.stylesheet)); + } } - var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)"); - for (var l = bgnodes.length, i = 0; i < l; i++) { var src = window.getComputedStyle(bgnodes[i], null) .getPropertyValue("background-image"); var flags = src.match(cssregex); var bgsrc = bgnodes[i].getAttribute("data-background-src"); - if (flags) { var holder = parse_flags(flags[1].split("/"), options); if (holder) { render("background", bgnodes[i], holder, src); } - } - else if(bgsrc != null){ - var holder = parse_flags(bgsrc.substr(bgsrc.lastIndexOf(options.domain) + options.domain.length + 1) + } else if (bgsrc != null) { + var holder = parse_flags(bgsrc.substr(bgsrc.lastIndexOf(options.domain) + options.domain.length + 1) .split("/"), options); - if(holder){ - render("background", bgnodes[i], holder, src); - } + if (holder) { + render("background", bgnodes[i], holder, src); + } } } - for (l = images.length, i = 0; i < l; i++) { - - var attr_src = attr_data_src = src = null; - - try{ - attr_src = images[i].getAttribute("src"); - attr_datasrc = images[i].getAttribute("data-src"); - }catch(e){} - + var attr_data_src, attr_src; + attr_src = attr_data_src = src = null; + try { + attr_src = images[i].getAttribute("src"); + attr_datasrc = images[i].getAttribute("data-src"); + } catch (e) {} if (attr_datasrc == null && !! attr_src && attr_src.indexOf(options.domain) >= 0) { src = attr_src; } else if ( !! attr_datasrc && attr_datasrc.indexOf(options.domain) >= 0) { src = attr_datasrc; } - if (src) { var holder = parse_flags(src.substr(src.lastIndexOf(options.domain) + options.domain.length + 1) .split("/"), options); @@ -399,7 +386,6 @@ app.run = function (o) { } return app; }; - contentLoaded(win, function () { if (window.addEventListener) { window.addEventListener("resize", fluid_update, false); @@ -409,9 +395,8 @@ contentLoaded(win, function () { } preempted || app.run(); }); - if (typeof define === "function" && define.amd) { - define("Holder", [], function () { + define([], function () { return app; }); }