skrollr-rails 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb34fa2e1b2ca62c6b68054373f28854ff545c52
-  data.tar.gz: c1e98ffdddcc45515a4a43028969fc5ac80a2145
+  metadata.gz: bd1110115e2221306a0b9ca1328d3f4b9cd479fe
+  data.tar.gz: d8f4e8937b43441aa2a794b08b8f31d9c63a0429
 SHA512:
-  metadata.gz: 2d8be55cb4575df26d8ed5daca3de45dff80818e10a2a8bb76ada7f99ee29923fe4d7cfe7faeecdfd2d2703c15bb28fea688b8b7101752be49bf6f4fa9c065d4
-  data.tar.gz: 926a2e74c7b6418b48740d954fc10f64a5c6dc3eccbe10093b18ad6feacd832f6765d74eb5136d68bdcd57182661954de45ab35fa71b0840eb0fa9244eaf5cde
+  metadata.gz: 261db4165ac4cfe9ad793a03b56facc944e807c77e0c8de3468af1a6d8666911a3caf2e4061a8dce6cb84d2cc058481141c25c7d30a61eb3eb393a8e2bbda5d5
+  data.tar.gz: acc368b3991fa3ba7d05df1637eb028742e47c8c2b1a215683e9cd5382fbafe5ec200284158957dd94b7b553b7fce2366bbb6f02d2015516d8706312a65a4362

data/lib/skrollr-rails/version.rb

@@ -1,5 +1,5 @@
 module Skrollr
   module Rails
-    VERSION = "0.6.11"
+    VERSION = "0.6.12"
   end
 end

data/skrollr-rails.gemspec

@@ -9,7 +9,8 @@ Gem::Specification.new do |s|
   s.description   = %q{Integrates the skrollr javascript library with the Rails asset pipeline}
   s.summary       = %q{Skrollr is a stand-alone parallax scrolling library for mobile and desktop.  This gem integrates skrollr with the Rails asset pipeline for ease of use and version control.}
   s.homepage      = 'https://github.com/reed/skrollr-rails'
-
+  s.license       = 'MIT'
+  
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ['lib']
 

data/vendor/assets/javascripts/skrollr.js

@@ -19,7 +19,7 @@
 		init: function(options) {
 			return _instance || new Skrollr(options);
 		},
-		VERSION: '0.6.11'
+		VERSION: '0.6.12'
 	};
 
 	//Minify optimization.
@@ -149,7 +149,7 @@
 				var deltaTime = _now() - lastTime;
 				var delay = Math.max(0, 1000 / 60 - deltaTime);
 
-				window.setTimeout(function() {
+				return window.setTimeout(function() {
 					lastTime = _now();
 					callback();
 				}, delay);
@@ -159,6 +159,18 @@
 		return requestAnimFrame;
 	};
 
+	var polyfillCAF = function() {
+		var cancelAnimFrame = window.cancelAnimationFrame || window[theCSSPrefix.toLowerCase() + 'CancelAnimationFrame'];
+
+		if(_isMobile || !cancelAnimFrame) {
+			cancelAnimFrame = function(timeout) {
+				return window.clearTimeout(timeout);
+			};
+		}
+
+		return cancelAnimFrame;
+	};
+
 	//Built-in easing functions.
 	var easings = {
 		begin: function() {
@@ -294,7 +306,7 @@
 		//Let's go.
 		(function animloop(){
 			_render();
-			requestAnimFrame(animloop);
+			_animFrame = requestAnimFrame(animloop);
 		}());
 
 		return _instance;
@@ -595,6 +607,52 @@
 		return _instance;
 	};
 
+	Skrollr.prototype.destroy = function() {
+		var cancelAnimFrame = polyfillCAF();
+		cancelAnimFrame(_animFrame);
+		_removeAllEvents();
+
+		_updateClass(documentElement, [NO_SKROLLR_CLASS], [SKROLLR_CLASS, SKROLLR_DESKTOP_CLASS, SKROLLR_MOBILE_CLASS]);
+
+		var skrollableIndex = 0;
+		var skrollablesLength = _skrollables.length;
+
+		for(; skrollableIndex < skrollablesLength; skrollableIndex++) {
+			_reset(_skrollables[skrollableIndex].element);
+		}
+
+		documentElement.style.overflow = body.style.overflow = 'auto';
+		documentElement.style.height = body.style.height = 'auto';
+
+		if(_skrollrBody) {
+			skrollr.setStyle(_skrollrBody, 'transform', 'none');
+		}
+
+		_instance = undefined;
+		_skrollrBody = undefined;
+		_listeners = undefined;
+		_forceHeight = undefined;
+		_maxKeyFrame = 0;
+		_scale = 1;
+		_constants = undefined;
+		_mobileDeceleration = undefined;
+		_direction = 'down';
+		_lastTop = -1;
+		_lastViewportWidth = 0;
+		_lastViewportHeight = 0;
+		_requestReflow = false;
+		_scrollAnimation = undefined;
+		_smoothScrollingEnabled = undefined;
+		_smoothScrollingDuration = undefined;
+		_smoothScrolling = undefined;
+		_forceRender = undefined;
+		_skrollableIdCounter = 0;
+		_edgeStrategy = undefined;
+		_isMobile = false;
+		_mobileOffset = 0;
+		_translateZ = undefined;
+	};
+
 	/*
 		Private methods.
 	*/
@@ -1261,18 +1319,57 @@
 
 		names = names.split(' ');
 
+		var name;
 		var nameCounter = 0;
 		var namesLength = names.length;
 
 		for(; nameCounter < namesLength; nameCounter++) {
+			name = names[nameCounter];
+
 			if(element.addEventListener) {
-				element.addEventListener(names[nameCounter], callback, false);
+				element.addEventListener(name, callback, false);
 			} else {
-				element.attachEvent('on' + names[nameCounter], intermediate);
+				element.attachEvent('on' + name, intermediate);
 			}
+
+			//Remember the events to be able to flush them later.
+			_registeredEvents.push({
+				element: element,
+				name: name,
+				listener: callback
+			});
 		}
 	};
 
+	var _removeEvent = skrollr.removeEvent = function(element, names, callback) {
+		names = names.split(' ');
+
+		var nameCounter = 0;
+		var namesLength = names.length;
+
+		for(; nameCounter < namesLength; nameCounter++) {
+			if(element.removeEventListener) {
+				element.removeEventListener(names[nameCounter], callback, false);
+			} else {
+				element.detachEvent('on' + names[nameCounter], callback);
+			}
+		}
+	};
+
+	var _removeAllEvents = function() {
+		var eventData;
+		var eventCounter = 0;
+		var eventsLength = _registeredEvents.length;
+
+		for(; eventCounter < eventsLength; eventCounter++) {
+			eventData = _registeredEvents[eventCounter];
+
+			_removeEvent(eventData.element, eventData.name, eventData.listener);
+		}
+
+		_registeredEvents = [];
+	};
+
 	var _reflow = function() {
 		var pos = _instance.getScrollTop();
 
@@ -1490,4 +1587,10 @@
 
 	//If the browser supports 3d transforms, this will be filled with 'translateZ(0)' (empty string otherwise).
 	var _translateZ;
-}(window, document));
+
+	//Will contain data about registered events by skrollr.
+	var _registeredEvents = [];
+
+	//Animation frame id returned by RequestAnimationFrame (or timeout when RAF is not supported).
+	var _animFrame;
+}(window, document));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skrollr-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,7 +44,8 @@ files:
 - vendor/assets/javascripts/skrollr.js
 - vendor/assets/javascripts/skrollr.menu.js
 homepage: https://github.com/reed/skrollr-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []