Merge branch 'master' into cas
This commit is contained in:
commit
a1f0ffad98
@ -58,7 +58,6 @@ $(document).ready(function(){
|
|||||||
var possibles = ['ul.folder:first li',
|
var possibles = ['ul.folder:first li',
|
||||||
'ul#pages-list li'];
|
'ul#pages-list li'];
|
||||||
for(var i = 0; i<possibles.length; i++){
|
for(var i = 0; i<possibles.length; i++){
|
||||||
console.log("checking possibles", i, possibles[i]);
|
|
||||||
if($(possibles[i]).length > 0){
|
if($(possibles[i]).length > 0){
|
||||||
return possibles[i];
|
return possibles[i];
|
||||||
}
|
}
|
||||||
@ -97,7 +96,13 @@ $(document).ready(function(){
|
|||||||
});
|
});
|
||||||
|
|
||||||
guiders.createGuider({
|
guiders.createGuider({
|
||||||
attachTo: 'li.hoverable:eq(2)',
|
attachTo: (function(){
|
||||||
|
if($('li.hoverable:eq(2)').length > 0){
|
||||||
|
return 'li.hoverable:eq(2)';
|
||||||
|
}else{
|
||||||
|
return 'li.hoverable:first';
|
||||||
|
}
|
||||||
|
}()),
|
||||||
buttons: [{name: "Quit", onclick: guiders.hideAll},
|
buttons: [{name: "Quit", onclick: guiders.hideAll},
|
||||||
{name: "Next - Edit an Event",
|
{name: "Next - Edit an Event",
|
||||||
onclick: function(){
|
onclick: function(){
|
||||||
@ -551,9 +556,9 @@ $(document).ready(function(){
|
|||||||
$(".tutorial").click(function(){
|
$(".tutorial").click(function(){
|
||||||
var $this = $(this);
|
var $this = $(this);
|
||||||
guiders.hideAll();
|
guiders.hideAll();
|
||||||
if($this.attr('href') != '#'){
|
if($this.attr('href') != '#' && window.location.pathname != $this.attr('href')){
|
||||||
window.location = $this.attr('href') + "#guider=" + $this.attr('id');
|
window.location = $this.attr('href') + "#guider=" + $this.attr('id');
|
||||||
window.location.refresh;
|
window.location.reload();
|
||||||
}else{
|
}else{
|
||||||
guiders.show($this.attr('id'));
|
guiders.show($this.attr('id'));
|
||||||
}
|
}
|
||||||
@ -583,6 +588,7 @@ $(document).ready(function(){
|
|||||||
|
|
||||||
window.onload = function(){
|
window.onload = function(){
|
||||||
window.setTimeout(function(){
|
window.setTimeout(function(){
|
||||||
|
if($('#bushi_banner').length > 0){
|
||||||
guiders.createGuider({
|
guiders.createGuider({
|
||||||
attachTo: "#bushi_banner",
|
attachTo: "#bushi_banner",
|
||||||
description: "You may have noticed the bar at the top of your site. Its provided by Bushido. Bushido are friends of LocomotiveCMS. They are our official hosting partner.\
|
description: "You may have noticed the bar at the top of your site. Its provided by Bushido. Bushido are friends of LocomotiveCMS. They are our official hosting partner.\
|
||||||
@ -594,6 +600,7 @@ $(document).ready(function(){
|
|||||||
next: "congratulations",
|
next: "congratulations",
|
||||||
position: 6
|
position: 6
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}, 1000);
|
}, 1000);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user