Skip to content

Problems with newer versions of JQuery #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrgleason wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Problems with newer versions of JQuery #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27b3202
Some of the code is deprecated in newer versions of jquery. Also for …
Sep 18, 2014
929de15
oops
Sep 18, 2014
9e15b35
as
Sep 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.iws
*.ipr
*.iml
85 changes: 48 additions & 37 deletions scripts/camera.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
});
Expand Down