skrollr-rails 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f887e7dbbdcae40eecde8fe3b75d435e56f7b8
-  data.tar.gz: 34706973c35618bf5d62a0f23590ea5a148e163a
+  metadata.gz: fc392484b2d622dfbdc8c4ea6e03a3b5eeb8f8e5
+  data.tar.gz: 6c69ff25ca905d70b40f68f05c72026e515c8e2f
 SHA512:
-  metadata.gz: 5e0b66ec9be55fce54c96594731c75a58eeb7d0c39c9a64cba02a0f7fecf91ee15beeccd4a38f4c1d99226e7671ff49cd629c3cdd70e47ef3958599f9829ef7a
-  data.tar.gz: 7bb38a3b041c0b5842b9be964f25f7c41e7fdca4f4b8cc4499261b99171eee7d04f01f53f397638be049fe1860ff65ddbdd10cd7c133ecc7e53f132be51e568a
+  metadata.gz: 3acb1b7751e38c669a7e4f95f121238b16f0b17f9faabcb52b57c5d6e1acbc85caa6ea4a0b6ab44458bc342fb52a6369d0e9304ec81ba0f4813b3a4593ee2d41
+  data.tar.gz: e119e409da9733d5a757c1cffbad6d3d19ddd6243f94ae835545a4e8e779fc684d33208dccf041a98e421d092e2b48b84db157efd152c5f45600e8530a1477ef

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
   end
 end

data/vendor/assets/javascripts/skrollr.ie.js

@@ -5,120 +5,119 @@
  * Alexander Prinzhorn - https://github.com/Prinzhorn/skrollr
  *
  * Free to use under terms of MIT license
- */ (function(document, skrollr) {
-    'use strict';
-
-    var rxHSLAColor = /hsla?\(\s*(-?[\d.]+)\s*,\s*(-?[\d.]+)%\s*,\s*(-?[\d.]+)%.*?\)/g;
-    var rxRGBAColor = /rgba?\(\s*(-?[\d.]+%?)\s*,\s*(-?[\d.]+%?)\s*,\s*(-?[\d.]+%?).*?\)/g;
-    var rxID = /^#[^\s]+$/;
-
-    var _setStyle = skrollr.setStyle;
-
-    //Monkeypatch the setStyle function.
-    skrollr.setStyle = function(el, prop, val) {
-        //Original function call.
-        _setStyle.apply(this, arguments);
-
-        var style = el.style;
-        var matched;
-
-        //IE opacity
-        if (prop === 'opacity') {
-            style.zoom = 1;
-
-            //Remove filter attribute in IE
-            if (val >= 1 && style.removeAttribute) {
-                style.removeAttribute('filter');
-            } else {
-                style.filter = 'alpha(opacity=' + val * 100 + ')';
-            }
-
-            return;
-        }
-
-        //Fast pre check
-        if (val.indexOf('hsl') > -1) {
-            matched = false;
-
-            //Replace hsl(a) with hex if needed (ignoring alpha).
-            val = val.replace(rxHSLAColor, function(x, h, s, l) {
-                matched = true;
-
-                return toHex.hsl(parseFloat(h), parseFloat(s), parseFloat(l));
-            });
-
-            if (matched) {
-                try {
-                    style[prop] = val;
-                } catch (ignore) {}
-
-                return;
-            }
-        }
-
-        //Fast pre check
-        if (val.indexOf('rgb') > -1) {
-            matched = false;
-
-            //Replace rgba with hex if needed (ignoring alpha).
-            val = val.replace(rxRGBAColor, function(s, r, g, b) {
-                matched = true;
-
-                r = parseFloat(r, 10);
-                g = parseFloat(g, 10);
-                b = parseFloat(b, 10);
-
-                //rgba allows percentage notation.
-                if (s.indexOf('%') > -1) {
-                    r = (r / 100) * 255;
-                    g = (g / 100) * 255;
-                    b = (b / 100) * 255;
-                }
-
-                return toHex.rgb(r | 0, g | 0, b | 0);
-            });
-
-            if (matched) {
-                try {
-                    style[prop] = val;
-                } catch (ignore) {}
-
-                return;
-            }
-        }
-    };
-
-
-    /**
-     * Converts rgb or hsl color to hex color.
-     */
-    var toHex = {
-        //Credits to aemkei, jed and others
-        //Based on https://gist.github.com/1325937 and https://gist.github.com/983535
-        hsl: function(a, b, c, y) {
-            a %= 360;
-            a = a / 60;
-            c = c / 100;
-            b = [c += b *= (c < 0.5 ? c : 1 - c) / 100, c - a % 1 * b * 2, c -= b *= 2, c, c + a % 1 * b, c + b];
-
-            y = [b[~~a % 6], b[(a | 16) % 6], b[(a | 8) % 6]];
-
-            return toHex.rgb(parseInt(y[0] * 255, 10), parseInt(y[1] * 255, 10), parseInt(y[2] * 255, 10));
-        },
-        //https://gist.github.com/983535
-        rgb: function(a, b, c) {
-            return '#' + ((256 + a << 8 | b) << 8 | c).toString(16).slice(1);
-        }
-    };
-
-    /*
+ */
+(function(document, skrollr) {
+	'use strict';
+
+	var rxHSLAColor = /hsla?\(\s*(-?[\d.]+)\s*,\s*(-?[\d.]+)%\s*,\s*(-?[\d.]+)%.*?\)/g;
+	var rxRGBAColor = /rgba?\(\s*(-?[\d.]+%?)\s*,\s*(-?[\d.]+%?)\s*,\s*(-?[\d.]+%?).*?\)/g;
+	var rxID = /^#[^\s]+$/;
+
+	var _setStyle = skrollr.setStyle;
+
+	//Monkeypatch the setStyle function.
+	skrollr.setStyle = function(el, prop, val) {
+		//Original function call.
+		_setStyle.apply(this, arguments);
+
+		var style = el.style;
+		var matched;
+
+		//IE opacity
+		if(prop === 'opacity') {
+			style.zoom = 1;
+
+			//Remove filter attribute in IE
+			if(val >= 1 && style.removeAttribute) {
+				style.removeAttribute('filter');
+			} else {
+				style.filter = 'alpha(opacity=' + val * 100 + ')';
+			}
+
+			return;
+		}
+
+		//Fast pre check
+		if(val.indexOf('hsl') > -1) {
+			matched = false;
+
+			//Replace hsl(a) with hex if needed (ignoring alpha).
+			val = val.replace(rxHSLAColor, function(x, h, s, l) {
+				matched = true;
+
+				return toHex.hsl(parseFloat(h), parseFloat(s), parseFloat(l));
+			});
+
+			if(matched) {
+				try {
+					style[prop] = val;
+				} catch(ignore) {}
+
+				return;
+			}
+		}
+
+		//Fast pre check
+		if(val.indexOf('rgb') > -1) {
+			matched = false;
+
+			//Replace rgba with hex if needed (ignoring alpha).
+			val = val.replace(rxRGBAColor, function(s, r, g, b) {
+				matched = true;
+
+				r = parseFloat(r, 10);
+				g = parseFloat(g, 10);
+				b = parseFloat(b, 10);
+
+				//rgba allows percentage notation.
+				if(s.indexOf('%') > -1) {
+					r = (r / 100) * 255;
+					g = (g / 100) * 255;
+					b = (b / 100) * 255;
+				}
+
+				return toHex.rgb(r | 0, g | 0, b | 0);
+			});
+
+			if(matched) {
+				try {
+					style[prop] = val;
+				} catch(ignore) {}
+
+				return;
+			}
+		}
+	};
+
+
+	/**
+	 * Converts rgb or hsl color to hex color.
+	 */
+	var toHex = {
+		//Credits to aemkei, jed and others
+		//Based on https://gist.github.com/1325937 and https://gist.github.com/983535
+		hsl: function(a,b,c,y){
+			a%=360;
+			a=a/60;c=c/100;b=[c+=b*=(c<0.5?c:1-c)/100,c-a%1*b*2,c-=b*=2,c,c+a%1*b,c+b];
+
+			y = [b[~~a%6],b[(a|16)%6],b[(a|8)%6]];
+
+			return toHex.rgb(parseInt(y[0] * 255, 10), parseInt(y[1] * 255, 10), parseInt(y[2] * 255, 10));
+		},
+		//https://gist.github.com/983535
+		rgb: function(a,b,c){
+			return'#' + ((256+a<<8|b)<<8|c).toString(16).slice(1);
+		}
+	};
+
+	/*
 		A really bad polyfill. But the main use-case for data-anchor-target are IDs.
 	*/
-    document.querySelector = document.querySelector || function(selector) {
-        if (!rxID.test(selector)) {
-            throw 'Unsupported selector "' + selector + '". The querySelector polyfill only works for IDs.';
-        }
-
-        return document.getElementById(selector.substr(1));
-    };
-}(document, window.skrollr)); 
+	document.querySelector = document.querySelector || function(selector) {
+		if(!rxID.test(selector)) {
+			throw 'Unsupported selector "' + selector + '". The querySelector polyfill only works for IDs.';
+		}
+
+		return document.getElementById(selector.substr(1));
+	};
+}(document, window.skrollr));