skrollr-rails 0.6.23 → 0.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d129c8969be774ce9a3c6daded5a213e6b32107
-  data.tar.gz: 574fc526d377b22f74f677297d7d3445108b83f4
+  metadata.gz: 44b8915aa2d15d10dda44b4b7726fab9dbfda00a
+  data.tar.gz: 0a7d142563e00026dfc0629e6f185d0164208336
 SHA512:
-  metadata.gz: dab9b26c46dda850da2444febc03dda3d1aef4affc5228602bb97d55ed00daa0d7ead9e1952cb49d0702288daff8e6a664f14f46bc5ed3c239fa220be31b4d50
-  data.tar.gz: 5f1a1c1d4e4fcc10b97a0a653f44cae0651be14fb37dbcb570bb7ce796ea64159f03d6bda3198855fdebdf07f1626a47a2e2308bf287203220a1b7925a71e9a0
+  metadata.gz: fdc62b7607039831c9f92f342b7a80803b1165a4e2021a4c139b8bf8852c492b720a7025c90b1113670d8d8b3cba0ac262760558208d5494bc3ef1e74bfd3c81
+  data.tar.gz: ca76dbd7a6ad6c7d8041716c9133c15d945473e6314587bdd262fe50fbf6f8dcf29ada1e2d962f1717accb083cec2fa64990eadcf0c0454f986e7b7bf9837710

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.23"
+    VERSION = "0.6.24"
   end
 end

data/vendor/assets/javascripts/skrollr.js

@@ -67,7 +67,7 @@
 	//Find all data-attributes. data-[_constant]-[offset]-[anchor]-[anchor].
 	var rxKeyframeAttribute = /^data(?:-(_\w+))?(?:-?(-?\d*\.?\d+p?))?(?:-?(start|end|top|center|bottom))?(?:-?(top|center|bottom))?$/;
 
-	var rxPropValue = /\s*([\w\-\[\]]+)\s*:\s*(.+?)\s*(?:;|$)/gi;
+	var rxPropValue = /\s*(@?[\w\-\[\]]+)\s*:\s*(.+?)\s*(?:;|$)/gi;
 
 	//Easing function names follow the property in square brackets.
 	var rxPropEasing = /^([a-z\-]+)\[(\w+)\]$/;
@@ -357,7 +357,7 @@
 			var emitEvents = false;
 
 			//If we're reseting the counter, remove any old element ids that may be hanging around.
-			if(ignoreID) {
+			if(ignoreID && SKROLLABLE_ID_DOM_PROPERTY in el) {
 				delete el[SKROLLABLE_ID_DOM_PROPERTY];
 			}
 
@@ -658,8 +658,8 @@
 			_reset(_skrollables[skrollableIndex].element);
 		}
 
-		documentElement.style.overflow = body.style.overflow = 'auto';
-		documentElement.style.height = body.style.height = 'auto';
+		documentElement.style.overflow = body.style.overflow = '';
+		documentElement.style.height = body.style.height = '';
 
 		if(_skrollrBody) {
 			skrollr.setStyle(_skrollrBody, 'transform', 'none');
@@ -984,7 +984,12 @@
 							if(hasProp.call(props, key)) {
 								value = _interpolateString(props[key].value);
 
-								skrollr.setStyle(element, key, value);
+								//Set style or attribute.
+								if(key.indexOf('@') === 0) {
+									element.setAttribute(key.substr(1), value);
+								} else {
+									skrollr.setStyle(element, key, value);
+								}
 							}
 						}
 
@@ -1018,7 +1023,12 @@
 
 							value = _interpolateString(value);
 
-							skrollr.setStyle(element, key, value);
+							//Set style or attribute.
+							if(key.indexOf('@') === 0) {
+								element.setAttribute(key.substr(1), value);
+							} else {
+								skrollr.setStyle(element, key, value);
+							}
 						}
 					}
 
@@ -1505,7 +1515,7 @@
 
 		if(_forceHeight && !_isMobile) {
 			//un-"force" the height to not mess with the calculations in _updateDependentKeyFrames (#216).
-			body.style.height = 'auto';
+			body.style.height = '';
 		}
 
 		_updateDependentKeyFrames();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.23
+  version: 0.6.24
 platform: ruby
 authors:
 - Nick Reed