diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c1e1a62 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.iws +*.ipr +*.iml diff --git a/scripts/camera.js b/scripts/camera.js old mode 100644 new mode 100755 index daddaaa..9e82ad8 --- a/scripts/camera.js +++ b/scripts/camera.js @@ -132,8 +132,17 @@ ); var loader; - - if(opts.loader=='pie' && $.browser.msie && $.browser.version < 9){ + + //FIXME this needs to be changed in order to support ie9 or lower + //Browser taken out of some Jquery implementations + var isMsie = false, + versionLessThat9 = false; + if($.browser != null){ + isMsie = $.browser.msie; + versionLessThat9 = $.browser.version < 9 + } + + if(opts.loader=='pie' && isMsie && versionLessThat9){ loader = 'bar'; } else { loader = opts.loader; @@ -360,7 +369,7 @@ if(!elem.hasClass('paused')){ elem.addClass('paused'); if($('.camera_stop',camera_thumbs_wrap).length){ - $('.camera_stop',camera_thumbs_wrap).hide() + $('.camera_stop',camera_thumbs_wrap).hide(); $('.camera_play',camera_thumbs_wrap).show(); if(loader!='none'){ $('#'+pieID).hide(); @@ -746,45 +755,47 @@ }); } } - - - $('.camera_stop',camera_thumbs_wrap).live('click',function(){ - autoAdv = false; - elem.addClass('paused'); - if($('.camera_stop',camera_thumbs_wrap).length){ - $('.camera_stop',camera_thumbs_wrap).hide() - $('.camera_play',camera_thumbs_wrap).show(); - if(loader!='none'){ - $('#'+pieID).hide(); - } - } else { - if(loader!='none'){ - $('#'+pieID).hide(); - } - } - }); - - $('.camera_play',camera_thumbs_wrap).live('click',function(){ - autoAdv = true; - elem.removeClass('paused'); - if($('.camera_play',camera_thumbs_wrap).length){ - $('.camera_play',camera_thumbs_wrap).hide(); - $('.camera_stop',camera_thumbs_wrap).show(); - if(loader!='none'){ - $('#'+pieID).show(); - } - } else { - if(loader!='none'){ - $('#'+pieID).show(); - } - } - }); + + if($('.camera_stop',camera_thumbs_wrap).length) { + $('.camera_stop', camera_thumbs_wrap).live('click', function () { + autoAdv = false; + elem.addClass('paused'); + if ($('.camera_stop', camera_thumbs_wrap).length) { + $('.camera_stop', camera_thumbs_wrap).hide(); + $('.camera_play', camera_thumbs_wrap).show(); + if (loader != 'none') { + $('#' + pieID).hide(); + } + } else { + if (loader != 'none') { + $('#' + pieID).hide(); + } + } + }); + } + if($('.camera_play',camera_thumbs_wrap).length) { + $('.camera_play', camera_thumbs_wrap).live('click', function () { + autoAdv = true; + elem.removeClass('paused'); + if ($('.camera_play', camera_thumbs_wrap).length) { + $('.camera_play', camera_thumbs_wrap).hide(); + $('.camera_stop', camera_thumbs_wrap).show(); + if (loader != 'none') { + $('#' + pieID).show(); + } + } else { + if (loader != 'none') { + $('#' + pieID).show(); + } + } + }); + } if(opts.pauseOnClick==true){ $('.camera_target_content',fakeHover).mouseup(function(){ autoAdv = false; elem.addClass('paused'); - $('.camera_stop',camera_thumbs_wrap).hide() + $('.camera_stop',camera_thumbs_wrap).hide(); $('.camera_play',camera_thumbs_wrap).show(); $('#'+pieID).hide(); });