mui_app_rails 0.0.1 → 0.0.2

data/app/assets/javascripts/mui_app_rails/mui.class.scroll.slider.old.js

@@ -1,332 +0,0 @@
-(function($, window) {
-	var CLASS_SLIDER = $.className('slider');
-	var CLASS_SLIDER_GROUP = $.className('slider-group');
-	var CLASS_SLIDER_LOOP = $.className('slider-loop');
-	var CLASS_SLIDER_INDICATOR = $.className('slider-indicator');
-	var CLASS_ACTION_PREVIOUS = $.className('action-previous');
-	var CLASS_ACTION_NEXT = $.className('action-next');
-	var CLASS_SLIDER_ITEM = $.className('slider-item');
-
-	var CLASS_ACTIVE = $.className('active');
-
-	var SELECTOR_SLIDER_ITEM = '.' + CLASS_SLIDER_ITEM;
-	var SELECTOR_SLIDER_INDICATOR = '.' + CLASS_SLIDER_INDICATOR;
-	var SELECTOR_SLIDER_PROGRESS_BAR = $.classSelector('.slider-progress-bar');
-
-
-	var Slider = $.Scroll.extend({
-		init: function(element, options) {
-			this._super(element, $.extend(true, {
-				interval: 0, //设置为0，则不定时轮播
-				scrollY: false,
-				scrollX: true,
-				indicators: false,
-				bounceTime: 200,
-				startX: false
-			}, options));
-			if (this.options.startX) {
-				$.trigger(this.wrapper, 'scrollend', this);
-			}
-		},
-		_init: function() {
-			var scrollers = this.wrapper.querySelectorAll('.' + CLASS_SLIDER_GROUP);
-			for (var i = 0, len = scrollers.length; i < len; i++) {
-				if (scrollers[i].parentNode === this.wrapper) {
-					this.scroller = scrollers[i];
-					break;
-				}
-			}
-			if (this.scroller) {
-				this.scrollerStyle = this.scroller.style;
-				this.progressBar = this.wrapper.querySelector(SELECTOR_SLIDER_PROGRESS_BAR);
-				if (this.progressBar) {
-					this.progressBarWidth = this.progressBar.offsetWidth;
-					this.progressBarStyle = this.progressBar.style;
-				}
-				//忘记这个代码是干什么的了？
-				//				this.x = this._getScroll();
-				//				if (this.options.startX === false) {
-				//					this.options.startX = this.x;
-				//				}
-				//根据active修正startX
-
-				this._super();
-				this._initTimer();
-			}
-		},
-		_initEvent: function() {
-			var self = this;
-			self._super();
-			self.wrapper.addEventListener('swiperight', $.stopPropagation);
-			self.wrapper.addEventListener('scrollend', function() {
-				self.isInTransition = false;
-				var oldSlideNumber = self.slideNumber;
-				self.slideNumber = self._getSlideNumber();
-				var slideNumber = self.slideNumber;
-				if (self.loop) {
-					if (self.slideNumber === 0) {
-						self.slideNumber = self.itemLength - 2;
-						self.setTranslate(-self.wrapperWidth * (self.itemLength - 2), 0);
-					} else if (self.slideNumber === (self.itemLength - 1)) {
-						self.slideNumber = 1;
-						self.setTranslate(-self.wrapperWidth, 0);
-					}
-					slideNumber = self.slideNumber - 1;
-				}
-				self.slideNumber = slideNumber;
-				if (oldSlideNumber !== self.slideNumber) {
-					$.trigger(self.wrapper, 'slide', {
-						slideNumber: slideNumber
-					});
-				}
-
-			});
-			self.wrapper.addEventListener('slide', function(e) {
-				if (e.target !== self.wrapper) {
-					return;
-				}
-				var detail = e.detail;
-				detail.slideNumber = detail.slideNumber || 0;
-				var items = self.wrapper.querySelectorAll(SELECTOR_SLIDER_ITEM);
-				var _slideNumber = detail.slideNumber;
-				if (self.loop) {
-					_slideNumber += 1;
-				}
-				for (var i = 0, len = items.length; i < len; i++) {
-					var item = items[i];
-					if (item.parentNode === self.scroller) {
-						if (i === _slideNumber) {
-							item.classList.add(CLASS_ACTIVE);
-						} else {
-							item.classList.remove(CLASS_ACTIVE);
-						}
-					}
-				}
-				if (self.wrapper.classList.contains($.className('segmented-control'))) { //segmented and slider
-					var controlItem = self.scroller.querySelector('.' + CLASS_ACTIVE + '.' + CLASS_SLIDER_ITEM + ' .' + $.className('control-item'));
-					if (controlItem) {
-						$.trigger(controlItem, 'touchstart'); //targets实现机制太麻烦，后续必须重构
-						$.trigger(controlItem, 'tap');
-					}
-				}
-				var indicatorWrap = self.wrapper.querySelector($.classSelector('.slider-indicator'));
-				if (indicatorWrap) {
-					//					if (indicatorWrap.classList.contains(CLASS_SLIDER)) { //indicator is a slider
-					//						var indicatorSliderItems = indicatorWrap.querySelectorAll(CLASS_SLIDER_ITEM);
-					//						Math.ceil(self.itemLength / indicatorSliderItems.length);
-					//					}
-					var indicators = indicatorWrap.querySelectorAll($.classSelector('.indicator'));
-					if (indicators.length > 0) { //图片轮播
-						for (var i = 0, len = indicators.length; i < len; i++) {
-							indicators[i].classList[i === detail.slideNumber ? 'add' : 'remove'](CLASS_ACTIVE);
-						}
-					} else {
-						var number = indicatorWrap.querySelector($.classSelector('.number span'));
-						if (number) { //图文表格
-							number.innerText = (detail.slideNumber + 1);
-						} else { //segmented controls
-							var controlItems = self.wrapper.querySelectorAll($.classSelector('.control-item'));
-							for (var i = 0, len = controlItems.length; i < len; i++) {
-								controlItems[i].classList[i === detail.slideNumber ? 'add' : 'remove'](CLASS_ACTIVE);
-							}
-						}
-					}
-				}
-				e.stopPropagation();
-			});
-
-			self.wrapper.addEventListener($.eventName('shown', 'tab'), function(e) { //tab
-				console.log('e.detail.tabNumber:::' + e.detail.tabNumber);
-				self.gotoItem((e.detail.tabNumber || 0), self.options.bounceTime);
-			});
-			//indicator
-			var indicator = self.wrapper.querySelector(SELECTOR_SLIDER_INDICATOR);
-			if (indicator) {
-				indicator.addEventListener('tap', function(event) {
-					var target = event.target;
-					if (target.classList.contains(CLASS_ACTION_PREVIOUS) || target.classList.contains(CLASS_ACTION_NEXT)) {
-						self[target.classList.contains(CLASS_ACTION_PREVIOUS) ? 'prevItem' : 'nextItem']();
-						event.stopPropagation();
-					}
-				});
-			}
-		},
-		_drag: function(e) {
-			this._super(e);
-			var direction = e.detail.direction;
-			if (direction === 'left' || direction === 'right') {
-				e.stopPropagation();
-			}
-		},
-		_initTimer: function() {
-			var self = this;
-			var slider = self.wrapper;
-			var interval = self.options.interval;
-			var slidershowTimer = slider.getAttribute('data-slidershowTimer');
-			slidershowTimer && window.clearTimeout(slidershowTimer);
-			if (interval) {
-				slidershowTimer = window.setTimeout(function() {
-					if (!slider) {
-						return;
-					}
-					//仅slider显示状态进行自动轮播
-					if (!!(slider.offsetWidth || slider.offsetHeight)) {
-						self.nextItem(true);
-						//下一个
-					}
-					self._initTimer();
-				}, interval);
-				slider.setAttribute('data-slidershowTimer', slidershowTimer);
-			}
-		},
-		_reLayout: function() {
-			this.hasHorizontalScroll = true;
-			this.loop = this.scroller.classList.contains(CLASS_SLIDER_LOOP);
-			//以防slider类嵌套使用
-			var items = this.scroller.querySelectorAll(SELECTOR_SLIDER_ITEM);
-			this.itemLength = 0;
-			var current = 0;
-			for (var i = 0, len = items.length; i < len; i++) {
-				if (items[i].parentNode === this.scroller) {
-					if (items[i].classList.contains(CLASS_ACTIVE)) {
-						current = this.itemLength;
-					}
-					this.itemLength++;
-				}
-			}
-			current = current === 0 ? (this.loop ? 1 : 0) : current;
-			//根据active修正startX
-			this.options.startX = current ? -this.scrollerWidth * current : 0;
-			this.scrollerWidth = this.itemLength * this.scrollerWidth;
-			this.maxScrollX = Math.min(this.wrapperWidth - this.scrollerWidth, 0);
-			this.slideNumber = this._getSlideNumber();
-			this._super();
-		},
-		_getScroll: function() {
-			var result = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform'));
-			return result ? result.x : 0;
-		},
-		_getSlideNumber: function() {
-			return Math.abs(Math.round(Math.abs(this.x) / this.wrapperWidth));
-		},
-		_transitionEnd: function(e) {
-			if (e.target !== this.scroller || !this.isInTransition) {
-				return;
-			}
-			this._transitionTime();
-			this.isInTransition = false;
-			$.trigger(this.wrapper, 'scrollend', this);
-		},
-		_flick: function(e) {
-			var detail = e.detail;
-			var direction = detail.direction;
-			this._clearRequestAnimationFrame();
-			this.isInTransition = true;
-			if (direction === 'up' || direction === 'down') {
-				this.resetPosition(this.options.bounceTime);
-				return;
-			}
-			if (e.type === 'flick') {
-				if (detail.touchTime < 200) { //flick，太容易触发，额外校验一下touchtime
-					this.x = -(this.slideNumber + (direction === 'left' ? 1 : -1)) * this.wrapperWidth;
-				}
-				this.resetPosition(this.options.bounceTime);
-			} else if (e.type === 'dragend' && !detail.flick) {
-				this.resetPosition(this.options.bounceTime);
-			}
-			e.stopPropagation();
-		},
-		_gotoItem: function(slideNumber, time) {
-			this.scrollTo(-slideNumber * this.wrapperWidth, 0, time, this.options.bounceEasing);
-			if (time === 0) {
-				$.trigger(this.wrapper, 'scrollend', this);
-			}
-			this._initTimer();
-		},
-		_fixedSlideNumber: function(slideNumber) {
-			if (!this.loop) {
-				if (slideNumber < 0) {
-					slideNumber = 0;
-				} else if (slideNumber >= this.itemLength) {
-					slideNumber = this.itemLength - 1;
-				}
-			}
-			return slideNumber;
-		},
-		//API
-		setTranslate: function(x, y) {
-			this._super(x, y);
-			var progressBar = this.progressBar;
-			if (progressBar) {
-				this.progressBarStyle.webkitTransform = 'translate3d(' + (-x * (this.progressBarWidth / this.wrapperWidth)) + 'px,0,0)';
-			}
-		},
-		resetPosition: function(time) {
-			time = time || 0;
-			if (this.x > 0) {
-				this.x = 0;
-			} else if (this.x < this.maxScrollX) {
-				this.x = this.maxScrollX;
-			}
-			this._gotoItem(this._getSlideNumber(), time);
-			return true;
-		},
-		gotoItem: function(slideNumber, time) {
-			this._gotoItem(this._fixedSlideNumber(this.loop ? (slideNumber + 1) : slideNumber), time || this.options.bounceEasing);
-		},
-		nextItem: function(auto) {
-			var slideNumber = this._fixedSlideNumber(this.slideNumber + 1);
-			var bounceTime = this.options.bounceTime;
-			if (auto && !this.loop) {
-				if (this.slideNumber + 1 >= this.itemLength) {
-					bounceTime = slideNumber = 0;
-				}
-			}
-			this._gotoItem(slideNumber, bounceTime);
-			//			if (!auto) { //TODO 这个设置后续还得仔细过一遍
-			//				this.isInTransition = false;
-			//			}
-		},
-		prevItem: function() {
-			this._gotoItem(this._fixedSlideNumber(this.slideNumber - 1), this.options.bounceTime);
-		},
-		refresh: function(options) {
-			if (options) {
-				$.extend(this.options, options);
-				this._super();
-				this._gotoItem(this._getSlideNumber() + 1, this.options.bounceTime);
-			} else {
-				this._super();
-			}
-		}
-	});
-	$.fn.slider = function(options) {
-		var slider = null;
-		this.each(function() {
-			var sliderElement = this;
-			if (!this.classList.contains(CLASS_SLIDER)) {
-				sliderElement = this.querySelector('.' + CLASS_SLIDER);
-			}
-			if (sliderElement) {
-				var id = sliderElement.getAttribute('data-slider');
-				if (!id) {
-					id = ++$.uuid;
-					$.data[id] = slider = new Slider(sliderElement, options);
-					sliderElement.setAttribute('data-slider', id);
-				} else {
-					slider = $.data[id];
-					if (slider && options) {
-						slider.refresh(options);
-					}
-				}
-			}
-		});
-		return slider;
-	};
-	$.ready(function() {
-		//		setTimeout(function() {
-		$($.classSelector('.slider')).slider();
-		//		}, 500); //临时处理slider宽度计算不正确的问题(初步确认是scrollbar导致的)
-
-	});
-})(mui, window);

data/app/assets/javascripts/mui_app_rails/mui.detect.5+.js

@@ -1,18 +0,0 @@
-/**
- * $.os.plus
- * @param {type} $
- * @returns {undefined}
- */
-(function($, document) {
-	function detect(ua) {
-		this.os = this.os || {};
-		var plus = ua.match(/Html5Plus/i); //TODO 5\+Browser?
-		if (plus) {
-			this.os.plus = true;
-			$(function() {
-				document.body.classList.add($.className('plus'));
-			});
-		}
-	}
-	detect.call($, navigator.userAgent);
-})(mui, document);

data/app/assets/javascripts/mui_app_rails/mui.detect.js

@@ -1,50 +0,0 @@
-/**
- * $.os
- * @param {type} $
- * @returns {undefined}
- */
-(function($, window) {
-	function detect(ua) {
-		this.os = {};
-		var funcs = [
-
-			function() { //wechat
-				var wechat = ua.match(/(MicroMessenger)\/([\d\.]+)/i);
-				if (wechat) { //wechat
-					this.os.wechat = {
-						version: wechat[2].replace(/_/g, '.')
-					};
-				}
-				return false;
-			},
-			function() { //android
-				var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
-				if (android) {
-					this.os.android = true;
-					this.os.version = android[2];
-
-					this.os.isBadAndroid = !(/Chrome\/\d/.test(window.navigator.appVersion));
-				}
-				return this.os.android === true;
-			},
-			function() { //ios
-				var iphone = ua.match(/(iPhone\sOS)\s([\d_]+)/);
-				if (iphone) { //iphone
-					this.os.ios = this.os.iphone = true;
-					this.os.version = iphone[2].replace(/_/g, '.');
-				} else {
-					var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
-					if (ipad) { //ipad
-						this.os.ios = this.os.ipad = true;
-						this.os.version = ipad[2].replace(/_/g, '.');
-					}
-				}
-				return this.os.ios === true;
-			}
-		];
-		[].every.call(funcs, function(func) {
-			return !func.call($);
-		});
-	}
-	detect.call($, navigator.userAgent);
-})(mui, window);

data/app/assets/javascripts/mui_app_rails/mui.dialog.alert.js

@@ -1,27 +0,0 @@
-(function($, window) {
-	/**
-	 * 警告消息框
-	 */
-	$.alert = function(message,title,btnValue,callback) {
-		if ($.os.plus) {
-			if(typeof message === undefined){
-				return;
-			}else{
-				if(typeof title ==='function'){
-					callback = title;
-					title = null;
-					btnValue = '确定';
-				}else if(typeof btnValue ==='function'){
-					callback = btnValue;
-					btnValue = null;
-				}
-				plus.nativeUI.alert(message,callback,title,btnValue);
-			}
-
-		}else{
-			//TODO H5版本
-			window.alert(message);
-		}
-	};
-
-})(mui, window);

data/app/assets/javascripts/mui_app_rails/mui.dialog.confirm.js

@@ -1,27 +0,0 @@
-(function($, window) {
-	/**
-	 * 确认消息框
-	 */
-	$.confirm = function(message,title,btnArray,callback) {
-		if ($.os.plus) {
-			if(typeof message === undefined){
-				return;
-			}else{
-				if(typeof title ==='function'){
-					callback = title;
-					title = null;
-					btnArray = null;
-				}else if(typeof btnArray ==='function'){
-					callback = btnArray;
-					btnArray = null;
-				}
-				plus.nativeUI.confirm(message,callback,title,btnArray);
-			}
-
-		}else{
-			//TODO H5版本
-			window.confirm(message);
-		}
-	};
-
-})(mui, window);

data/app/assets/javascripts/mui_app_rails/mui.dialog.prompt.js

@@ -1,33 +0,0 @@
-(function($, window) {
-	/**
-	 * 输入对话框
-	 */
-	$.prompt = function(text,defaultText,title,btnArray,callback) {
-		if ($.os.plus) {
-			if(typeof message === undefined){
-				return;
-			}else{
-
-				if(typeof defaultText ==='function'){
-					callback = defaultText;
-					defaultText = null;
-					title = null;
-					btnArray = null;
-				}else if(typeof title === 'function'){
-					callback = title;
-					title = null;
-					btnArray = null;
-				}else if(typeof btnArray ==='function'){
-					callback = btnArray;
-					btnArray = null;
-				}
-				plus.nativeUI.prompt(text,callback,title,defaultText,btnArray);
-			}
-
-		}else{
-			//TODO H5版本
-			window.prompt(text);
-		}
-	};
-
-})(mui, window);

data/app/assets/javascripts/mui_app_rails/mui.dialog.toast.js

@@ -1,20 +0,0 @@
-(function($, window) {
-	/**
-	 * 自动消失提示框
-	 */
-	$.toast = function(message) {
-		if($.os.plus){
-			//默认显示在底部；
-			plus.nativeUI.toast(message,{verticalAlign:'bottom'});
-		}else{
-			var toast = document.createElement('div');
-			toast.classList.add($.className('toast-container'));
-			toast.innerHTML = '<div class="'+$.className('toast-message')+'">'+message+'</div>';
-			document.body.appendChild(toast);
-			setTimeout(function(){
-		  		document.body.removeChild(toast);
-			},2000);
-		}
-	};
-
-})(mui, window);

data/app/assets/javascripts/mui_app_rails/mui.event.js

@@ -1,160 +0,0 @@
-/**
- * 仅提供简单的on，off(仅支持事件委托，不支持当前元素绑定，当前元素绑定请直接使用addEventListener,removeEventListener)
- * @param {Object} $
- */
-(function($) {
-
-	var _mid = 1;
-	var delegates = {};
-	//需要wrap的函数
-	var eventMethods = {
-		preventDefault: 'isDefaultPrevented',
-		stopImmediatePropagation: 'isImmediatePropagationStopped',
-		stopPropagation: 'isPropagationStopped'
-	};
-	//默认true返回函数
-	var returnTrue = function() {
-		return true
-	};
-	//默认false返回函数
-	var returnFalse = function() {
-		return false
-	};
-	//wrap浏览器事件
-	var compatible = function(event, target) {
-		if (!event.detail) {
-			event.detail = {
-				currentTarget: target
-			};
-		} else {
-			event.detail.currentTarget = target;
-		}
-		$.each(eventMethods, function(name, predicate) {
-			var sourceMethod = event[name];
-			event[name] = function() {
-				this[predicate] = returnTrue;
-				return sourceMethod && sourceMethod.apply(event, arguments)
-			}
-			event[predicate] = returnFalse;
-		});
-		return event;
-	};
-	//简单的wrap对象_mid
-	var mid = function(obj) {
-		return obj._mid || (obj._mid = _mid++);
-	};
-	//事件委托对象绑定的事件回调列表
-	var delegateFns = {};
-	//返回事件委托的wrap事件回调
-	var delegateFn = function(element, event, selector, callback) {
-		return function(e) {
-			//same event
-			var callbackObjs = delegates[element._mid][event];
-			var handlerQueue = [];
-			var target = e.target;
-			var selectorAlls = {};
-			for (; target && target !== document; target = target.parentNode) {
-				if (target === element) {
-					break;
-				}
-				if (~['click', 'tap', 'doubletap', 'longtap', 'hold'].indexOf(event) && (target.disabled || target.classList.contains($.className('disabled')))) {
-					break;
-				}
-				var matches = {};
-				$.each(callbackObjs, function(selector, callbacks) { //same selector
-					if (~(selectorAlls[selector] || (selectorAlls[selector] = $.qsa(selector, element))).indexOf(target)) {
-						if (!matches[selector]) {
-							matches[selector] = callbacks;
-						}
-					}
-				});
-				if (!$.isEmptyObject(matches)) {
-					handlerQueue.push({
-						element: target,
-						handlers: matches
-					});
-				}
-			}
-			selectorAlls = null;
-			e = compatible(e); //compatible event
-			$.each(handlerQueue, function(index, handler) {
-				target = handler.element;
-				var tagName = target.tagName;
-				if (event === 'tap' && (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT')) {
-					e.preventDefault();
-					e.detail && e.detail.gesture && e.detail.gesture.preventDefault();
-				}
-				$.each(handler.handlers, function(index, handler) {
-					$.each(handler, function(index, callback) {
-						if (callback.call(target, e) === false) {
-							e.preventDefault();
-							e.stopPropagation();
-						}
-					});
-				})
-				if (e.isPropagationStopped()) {
-					return false;
-				}
-			});
-		};
-	};
-	/**
-	 * mui delegate events
-	 * @param {type} event
-	 * @param {type} selector
-	 * @param {type} callback
-	 * @returns {undefined}
-	 */
-	$.fn.on = function(event, selector, callback) { //仅支持简单的事件委托,主要是tap事件使用，类似mouse,focus之类暂不封装支持
-		return this.each(function() {
-			var element = this;
-			mid(element);
-			mid(callback);
-			var isAddEventListener = false;
-			var delegateEvents = delegates[element._mid] || (delegates[element._mid] = {});
-			var delegateCallbackObjs = delegateEvents[event] || ((delegateEvents[event] = {}));
-			if ($.isEmptyObject(delegateCallbackObjs)) {
-				isAddEventListener = true;
-			}
-			var delegateCallbacks = delegateCallbackObjs[selector] || (delegateCallbackObjs[selector] = []);
-			delegateCallbacks.push(callback);
-			if (isAddEventListener) {
-				delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
-				element.addEventListener(event, delegateFns[mid(element)]);
-				if (event === 'tap') { //TODO 需要找个更好的解决方案
-					element.addEventListener('click', function(e) {
-						if (e.target) {
-							var tagName = e.target.tagName;
-							if (tagName !== 'INPUT' && tagName !== 'TEXTAREA' && tagName !== 'SELECT') {
-								e.preventDefault();
-							}
-						}
-					});
-				}
-			}
-		});
-	};
-	$.fn.off = function(event, selector, callback) {
-		return this.each(function() {
-			var _mid = mid(this);
-			if (!callback) {
-				if (delegates[_mid] && delegates[_mid][event]) {
-					delete delegates[_mid][event][selector];
-				}
-			} else {
-				var delegateCallbacks = delegates[_mid] && delegates[_mid][event] && delegates[_mid][event][selector];
-				$.each(delegateCallbacks, function(index, delegateCallback) {
-					if (mid(delegateCallback) === mid(callback)) {
-						delegateCallbacks.splice(index, 1);
-						return false;
-					}
-				});
-			}
-			//如果off掉了所有当前element的指定的event事件，则remove掉当前element的delegate回调
-			if (delegates[_mid] && $.isEmptyObject(delegates[_mid][event])) {
-				this.removeEventListener(event, delegateFns[_mid]);
-				delete delegateFns[_mid];
-			}
-		})
-	};
-})(mui);

data/app/assets/javascripts/mui_app_rails/mui.fixed.animation.js

@@ -1,22 +0,0 @@
-/**
- * mui fixed requestAnimationFrame
- * @param {type} window
- * @returns {undefined}
- */
-(function(window) {
-	if (!window.requestAnimationFrame) {
-		var lastTime = 0;
-		window.requestAnimationFrame = window.webkitRequestAnimationFrame || function(callback, element) {
-			var currTime = new Date().getTime();
-			var timeToCall = Math.max(0, 16.7 - (currTime - lastTime));
-			var id = window.setTimeout(function() {
-				callback(currTime + timeToCall);
-			}, timeToCall);
-			lastTime = currTime + timeToCall;
-			return id;
-		};
-		window.cancelAnimationFrame = window.webkitCancelAnimationFrame || window.webkitCancelRequestAnimationFrame || function(id) {
-			clearTimeout(id);
-		};
-	};
-}(window));