diff options
author | Alib <aliboba@free.fr> | 2010-06-03 19:38:23 +0200 |
---|---|---|
committer | Alib <aliboba@free.fr> | 2010-06-03 19:38:23 +0200 |
commit | ebddc115d8243b31b7309b1aebd45ceda4132690 (patch) | |
tree | b46e1f826328fdb9bcccd4470ddf9446b98a9ab1 /js/jqtouch.transitions.js | |
parent | f62c1a54048ef32f3f32807b7e27d5170e9286a5 (diff) | |
download | istreamdev-ebddc115d8243b31b7309b1aebd45ceda4132690.tar.gz istreamdev-ebddc115d8243b31b7309b1aebd45ceda4132690.tar.bz2 |
added tweak to alow streaming on ipad and mac safari.
Diffstat (limited to 'js/jqtouch.transitions.js')
-rw-r--r-- | js/jqtouch.transitions.js | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/js/jqtouch.transitions.js b/js/jqtouch.transitions.js index 3fcdc02..9d8970f 100644 --- a/js/jqtouch.transitions.js +++ b/js/jqtouch.transitions.js @@ -1,60 +1,60 @@ -/*
-
- _/ _/_/ _/_/_/_/_/ _/
- _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/
- _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/
- _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/
- _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/
- _/
- _/
-
- Created by David Kaneda <http://www.davidkaneda.com>
- Documentation and issue tracking on Google Code <http://code.google.com/p/jqtouch/>
-
- Special thanks to Jonathan Stark <http://jonathanstark.com/>
- and pinch/zoom <http://www.pinchzoom.com/>
-
- (c) 2009 by jQTouch project members.
- See LICENSE.txt for license.
-
-*/
-
-(function($) {
-
- $.fn.transition = function(css, options) {
- return this.each(function(){
- var $el = $(this);
- var defaults = {
- speed : '300ms',
- callback: null,
- ease: 'ease-in-out'
- };
- var settings = $.extend({}, defaults, options);
- if(settings.speed === 0) {
- $el.css(css);
- window.setTimeout(settings.callback, 0);
- } else {
- if ($.browser.safari)
- {
- var s = [];
- for(var i in css) {
- s.push(i);
- }
- $el.css({
- webkitTransitionProperty: s.join(", "),
- webkitTransitionDuration: settings.speed,
- webkitTransitionTimingFunction: settings.ease
- });
- if (settings.callback) {
- $el.one('webkitTransitionEnd', settings.callback);
- }
- setTimeout(function(el){ el.css(css) }, 0, $el);
- }
- else
- {
- $el.animate(css, settings.speed, settings.callback);
- }
- }
- });
- }
+/* + + _/ _/_/ _/_/_/_/_/ _/ + _/ _/ _/ _/_/ _/ _/ _/_/_/ _/_/_/ + _/ _/ _/_/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/ + _/ _/_/ _/ _/ _/_/ _/_/_/ _/_/_/ _/ _/ + _/ + _/ + + Created by David Kaneda <http://www.davidkaneda.com> + Documentation and issue tracking on Google Code <http://code.google.com/p/jqtouch/> + + Special thanks to Jonathan Stark <http://jonathanstark.com/> + and pinch/zoom <http://www.pinchzoom.com/> + + (c) 2009 by jQTouch project members. + See LICENSE.txt for license. + +*/ + +(function($) { + + $.fn.transition = function(css, options) { + return this.each(function(){ + var $el = $(this); + var defaults = { + speed : '300ms', + callback: null, + ease: 'ease-in-out' + }; + var settings = $.extend({}, defaults, options); + if(settings.speed === 0) { + $el.css(css); + window.setTimeout(settings.callback, 0); + } else { + if ($.browser.safari) + { + var s = []; + for(var i in css) { + s.push(i); + } + $el.css({ + webkitTransitionProperty: s.join(", "), + webkitTransitionDuration: settings.speed, + webkitTransitionTimingFunction: settings.ease + }); + if (settings.callback) { + $el.one('webkitTransitionEnd', settings.callback); + } + setTimeout(function(el){ el.css(css) }, 0, $el); + } + else + { + $el.animate(css, settings.speed, settings.callback); + } + } + }); + } })(jQuery);
\ No newline at end of file |