diff --git a/js/javascript.js b/js/javascript.js index 3fcd2e8..9e35cb6 100644 --- a/js/javascript.js +++ b/js/javascript.js @@ -1,24 +1,32 @@ function load_slides() { var filelist = [ "What is the world made of", - "Strong interactions" /*, - "The Electromagnetic Interaction", - "Nuclear decay and the weak interaction", - "The Three Generations of Matter", - "The Higgs", - "Antimatter"*/ - ]; + "Strong interactions" /*, + "The Electromagnetic Interaction", + "Nuclear decay and the weak interaction", + "The Three Generations of Matter", + "The Higgs", + "Antimatter"*/ + ]; //$(filelist).each(function(){alert($(this).html());}); + var last = false; + for (var i = 0; i < filelist.length; i++ ) { + + if (i == filelist.length - 1 ) { + last = true; + } + var filename = to_filename(filelist[i]); // get - var chapter = get_html(filename, "chapter", "html"); + var chapter = get_html(filename, "chapter", "html", last); //var readmore = get_html(filelist[i], "readmore", "html"); // here we just need the URL //var icon = get_html(filelist[i], "img", "png"); // - //alert ($.html(chapter)); + //alert (chapter); + } @@ -29,10 +37,16 @@ function to_filename(title) { return title.toLowerCase().replace(/ /g, '_'); } -function get_html(file, prefix, extension ){ +function get_html(file, prefix, extension, last ){ - $.ajax( "./" + prefix + "/" + file + "." + extension ).done( function(data) { - alert(data); - }); + $.ajax( "./" + prefix + "/" + file + "." + extension ).done( function(data) { + //alert('
  • ' + data + "
  • "); + $("#slider").append('
  • ' + data + "
  • "); + if (last) { + set_sliders(); + + } + //return data; + }); } diff --git a/js/slider.js b/js/slider.js index 5386f9a..4c223c3 100644 --- a/js/slider.js +++ b/js/slider.js @@ -1,4 +1,4 @@ -$(function(){ +function set_sliders(){ var slider = $('#slider').bxSlider({ controls: false, easing: 'easeInOutCubic' @@ -27,4 +27,4 @@ $(function(){ } }); -}); +} diff --git a/main.html b/main.html index babc3ab..aaea33b 100644 --- a/main.html +++ b/main.html @@ -75,6 +75,8 @@ // Load slides load_slides(); + + // set them sliding var original_height = $(".navigation").height(); $(".navigation").height('0em');