Skip to content
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

Jump to bottom

Using <a href="" can cause conflicts with third-party software #148

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

Using <a href="" can cause conflicts with third-party software #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcd53ef
Prevent conflicts with third party software by changing a to span
hogart Sep 5, 2013
8eac931
Prevent conflicts with third party software by changing a to span
hogart Sep 5, 2013
02e20f5
Prevent conflicts with third party software by changing a to span
hogart Sep 5, 2013
6091dca
Prevent conflicts with third party software by changing a to span
hogart Sep 5, 2013
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
10 changes: 5 additions & 5 deletions bjqs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;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 a{display:inline-block;}
p.bjqs-caption{display:block;width:96%;margin:0;padding:2%;position:absolute;bottom:0;}
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;}
12 changes: 6 additions & 6 deletions demo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,32 @@ 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;
color:#000;
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;
margin:5px;
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);
}
}
10 changes: 5 additions & 5 deletions js/bjqs-1.3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,11 @@

// create the elements for the controls
$c_wrapper = $('<ul class="bjqs-controls"></ul>');
$c_fwd = $('<li class="bjqs-next"><a href="#" data-direction="'+ vars.fwd +'">' + settings.nexttext + '</a></li>');
$c_prev = $('<li class="bjqs-prev"><a href="#" data-direction="'+ vars.prev +'">' + settings.prevtext + '</a></li>');
$c_fwd = $('<li class="bjqs-next"><span data-direction="'+ vars.fwd +'">' + settings.nexttext + '</span></li>');
$c_prev = $('<li class="bjqs-prev"><span data-direction="'+ vars.prev +'">' + settings.prevtext + '</span></li>');

// 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');
Expand Down Expand Up @@ -479,13 +479,13 @@
gotoslide = key + 2;
}

var marker = $('<li><a href="#">'+ slidenum +'</a></li>');
var marker = $('<li><span>'+ slidenum +'</span></li>');

// 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);
Expand Down