From bcd53efb98268d740c9b6a9d2fe2dc0d816518a4 Mon Sep 17 00:00:00 2001 From: Konstantin Kitmanov Date: Thu, 5 Sep 2013 03:38:07 -0700 Subject: [PATCH 1/4] Prevent conflicts with third party software by changing a to span --- bjqs.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bjqs.css b/bjqs.css index 5e5fdb8..6da96b8 100644 --- a/bjqs.css +++ b/bjqs.css @@ -3,11 +3,11 @@ ul.bjqs{position:relative; list-style:none;padding:0;margin:0;overflow:hidden; display:none;} li.bjqs-slide{position:absolute; display:none;} ul.bjqs-controls{list-style:none;margin:0;padding:0;z-index:9999;} -ul.bjqs-controls.v-centered li a{position:absolute;} -ul.bjqs-controls.v-centered li.bjqs-next a{right:0;} -ul.bjqs-controls.v-centered li.bjqs-prev a{left:0;} +ul.bjqs-controls.v-centered li span{position:absolute;} +ul.bjqs-controls.v-centered li.bjqs-next span{right:0;} +ul.bjqs-controls.v-centered li.bjqs-prev span{left:0;} ol.bjqs-markers{list-style: none; padding: 0; margin: 0; width:100%;} ol.bjqs-markers.h-centered{text-align: center;} ol.bjqs-markers li{display:inline;} -ol.bjqs-markers li a{display:inline-block;} -p.bjqs-caption{display:block;width:96%;margin:0;padding:2%;position:absolute;bottom:0;} \ No newline at end of file +ol.bjqs-markers li span{display:inline-block;} +p.bjqs-caption{display:block;width:96%;margin:0;padding:2%;position:absolute;bottom:0;} From 8eac9313ae147faffc4cdc984deaada39ee9a3f9 Mon Sep 17 00:00:00 2001 From: Konstantin Kitmanov Date: Thu, 5 Sep 2013 03:40:27 -0700 Subject: [PATCH 2/4] Prevent conflicts with third party software by changing a to span --- js/bjqs-1.3.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/bjqs-1.3.js b/js/bjqs-1.3.js index f06e7b2..daeb0bc 100755 --- a/js/bjqs-1.3.js +++ b/js/bjqs-1.3.js @@ -418,11 +418,11 @@ // create the elements for the controls $c_wrapper = $(''); - $c_fwd = $('
  • ' + settings.nexttext + '
  • '); - $c_prev = $('
  • ' + settings.prevtext + '
  • '); + $c_fwd = $('
  • ' + settings.nexttext + '
  • '); + $c_prev = $('
  • ' + settings.prevtext + '
  • '); // bind click events - $c_wrapper.on('click','a',function(e){ + $c_wrapper.on('click','span',function(e){ e.preventDefault(); var direction = $(this).attr('data-direction'); @@ -479,13 +479,13 @@ gotoslide = key + 2; } - var marker = $('
  • '+ slidenum +'
  • '); + var marker = $('
  • '+ slidenum +'
  • '); // set the first marker to be active if(slidenum === state.currentslide){ marker.addClass('active-marker'); } // bind the click event - marker.on('click','a',function(e){ + marker.on('click','span',function(e){ e.preventDefault(); if(!state.animating && state.currentslide !== gotoslide){ go(false,gotoslide); From 02e20f5b8283e6423d444819162887812ae1cbfe Mon Sep 17 00:00:00 2001 From: Konstantin Kitmanov Date: Thu, 5 Sep 2013 03:44:39 -0700 Subject: [PATCH 3/4] Prevent conflicts with third party software by changing a to span --- demo.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/demo.css b/demo.css index 9231085..0ebd955 100644 --- a/demo.css +++ b/demo.css @@ -41,7 +41,7 @@ pre + h2{ margin-bottom: 60px; } -ul.bjqs-controls.v-centered li a{ +ul.bjqs-controls.v-centered li span{ display:block; padding:10px; background:#fff; @@ -49,12 +49,12 @@ ul.bjqs-controls.v-centered li a{ text-decoration: none; } -ul.bjqs-controls.v-centered li a:hover{ +ul.bjqs-controls.v-centered li span:hover{ background:#000; color:#fff; } -ol.bjqs-markers li a{ +ol.bjqs-markers li span{ padding:5px 10px; background:#000; color:#fff; @@ -62,11 +62,11 @@ ol.bjqs-markers li a{ text-decoration: none; } -ol.bjqs-markers li.active-marker a, -ol.bjqs-markers li a:hover{ +ol.bjqs-markers li.active-marker span, +ol.bjqs-markers li span:hover{ background: #999; } p.bjqs-caption{ background: rgba(255,255,255,0.5); -} \ No newline at end of file +} From 6091dcadac9f723cb9b452387c9af02185407382 Mon Sep 17 00:00:00 2001 From: Konstantin Kitmanov Date: Thu, 5 Sep 2013 03:45:24 -0700 Subject: [PATCH 4/4] Prevent conflicts with third party software by changing a to span --- bjqs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bjqs.css b/bjqs.css index 6da96b8..d1f6439 100644 --- a/bjqs.css +++ b/bjqs.css @@ -3,11 +3,11 @@ ul.bjqs{position:relative; list-style:none;padding:0;margin:0;overflow:hidden; display:none;} li.bjqs-slide{position:absolute; display:none;} ul.bjqs-controls{list-style:none;margin:0;padding:0;z-index:9999;} -ul.bjqs-controls.v-centered li span{position:absolute;} +ul.bjqs-controls.v-centered li span{position:absolute;cursor:pointer;} ul.bjqs-controls.v-centered li.bjqs-next span{right:0;} ul.bjqs-controls.v-centered li.bjqs-prev span{left:0;} ol.bjqs-markers{list-style: none; padding: 0; margin: 0; width:100%;} ol.bjqs-markers.h-centered{text-align: center;} ol.bjqs-markers li{display:inline;} -ol.bjqs-markers li span{display:inline-block;} +ol.bjqs-markers li span{display:inline-block;cursor:pointer;} p.bjqs-caption{display:block;width:96%;margin:0;padding:2%;position:absolute;bottom:0;}