rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Update holder.js to v2.3.2.

Browse Source
This commit is contained in:
XhmikosR 2014-04-25 08:30:52 +03:00
parent f2eff55064
commit ab1087f6e5
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/assets/js/_vendor/holder.js
View File

@ -1,6 +1,6 @@
/*! /*!
Holder - 2.3.1 - client side image placeholders Holder - 2.3.2 - client side image placeholders
(c) 2012-2014 Ivan Malopinsky / http://imsky.co (c) 2012-2014 Ivan Malopinsky / http://imsky.co
Provided under the MIT License. Provided under the MIT License.
@ -269,7 +269,7 @@ function draw_svg(args){
font:font, font:font,
template:template template:template
}) })
return "data:image/svg+xml;base64,"+btoa(string); return "data:image/svg+xml;base64,"+btoa(unescape(encodeURIComponent(string)));
} }
function draw(args) { function draw(args) {
@ -500,6 +500,7 @@ app.add_image = function (src, el) {
}; };
app.run = function (o) { app.run = function (o) {
instance_config = extend({}, system_config) instance_config = extend({}, system_config)
preempted = true; preempted = true;
@ -531,6 +532,7 @@ app.run = function (o) {
bgnodes = [options.bgnodes]; bgnodes = [options.bgnodes];
} }
for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]); for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]);
var holdercss = document.getElementById("holderjs-style"); var holdercss = document.getElementById("holderjs-style");
if (!holdercss) { if (!holdercss) {
holdercss = document.createElement("style"); holdercss = document.createElement("style");
@ -538,13 +540,17 @@ app.run = function (o) {
holdercss.type = "text/css"; holdercss.type = "text/css";
document.getElementsByTagName("head")[0].appendChild(holdercss); document.getElementsByTagName("head")[0].appendChild(holdercss);
} }
if (!options.nocss) { if (!options.nocss) {
if (holdercss.styleSheet) { if (holdercss.styleSheet) {
holdercss.styleSheet.cssText += options.stylesheet; holdercss.styleSheet.cssText += options.stylesheet;
} else { } else {
if(options.stylesheet.length){
holdercss.appendChild(document.createTextNode(options.stylesheet)); holdercss.appendChild(document.createTextNode(options.stylesheet));
} }
} }
}
var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)"); var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)");
for (var l = bgnodes.length, i = 0; i < l; i++) { for (var l = bgnodes.length, i = 0; i < l; i++) {
var src = window.getComputedStyle(bgnodes[i], null) var src = window.getComputedStyle(bgnodes[i], null)
@ -598,6 +604,10 @@ contentLoaded(win, function () {
window.attachEvent("onresize", resizable_update) window.attachEvent("onresize", resizable_update)
} }
preempted || app.run({}); preempted || app.run({});
if (typeof window.Turbolinks === "object") {
document.addEventListener("page:change", function() { app.run({}) })
}
}); });
if (typeof define === "function" && define.amd) { if (typeof define === "function" && define.amd) {
define([], function () { define([], function () {