From 27b32021d56563f6bbbc06c3070f472eb38a242d Mon Sep 17 00:00:00 2001 From: jgleason Date: Thu, 18 Sep 2014 11:15:40 -0400 Subject: [PATCH 1/3] Some of the code is deprecated in newer versions of jquery. Also for some reason the stop button is acting as if it is required even though it is no where in the demos --- Camera.iml | 9 ++ Camera.ipr | 56 +++++++ Camera.iws | 369 ++++++++++++++++++++++++++++++++++++++++++++++ scripts/camera.js | 85 ++++++----- 4 files changed, 482 insertions(+), 37 deletions(-) create mode 100755 Camera.iml create mode 100755 Camera.ipr create mode 100755 Camera.iws mode change 100644 => 100755 scripts/camera.js diff --git a/Camera.iml b/Camera.iml new file mode 100755 index 0000000..c854a41 --- /dev/null +++ b/Camera.iml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Camera.ipr b/Camera.ipr new file mode 100755 index 0000000..6fe97df --- /dev/null +++ b/Camera.ipr @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + + diff --git a/Camera.iws b/Camera.iws new file mode 100755 index 0000000..9473068 --- /dev/null +++ b/Camera.iws @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + + + 1411051173060 + 1411051173060 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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(); }); From 929de151e839e2ed1e9fdc1ffb452ebcc0f1acb8 Mon Sep 17 00:00:00 2001 From: jgleason Date: Thu, 18 Sep 2014 11:23:13 -0400 Subject: [PATCH 2/3] oops --- Camera.iml | 9 -- Camera.ipr | 56 -------- Camera.iws | 369 ----------------------------------------------------- 3 files changed, 434 deletions(-) delete mode 100755 Camera.iml delete mode 100755 Camera.ipr delete mode 100755 Camera.iws diff --git a/Camera.iml b/Camera.iml deleted file mode 100755 index c854a41..0000000 --- a/Camera.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Camera.ipr b/Camera.ipr deleted file mode 100755 index 6fe97df..0000000 --- a/Camera.ipr +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - - diff --git a/Camera.iws b/Camera.iws deleted file mode 100755 index 9473068..0000000 --- a/Camera.iws +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - - - - - - - - - 1411051173060 - 1411051173060 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 9e15b35fbf453d34fbaf9a7fab6cd9df303e93c5 Mon Sep 17 00:00:00 2001 From: jgleason Date: Thu, 18 Sep 2014 11:24:08 -0400 Subject: [PATCH 3/3] as --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c1e1a62 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.iws +*.ipr +*.iml