diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4f52935fa..94e560a13 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -220,7 +220,7 @@ module ApplicationHelper javascripts << "\n" end javascripts << "\n" - javascripts << "\n" + # javascripts << "\n" javascripts << "\n" # javascripts << "\n" javascripts << "\n" diff --git a/app/views/front/show_banner.html.erb b/app/views/front/show_banner.html.erb index 0a59f1bda..929b0a56f 100644 --- a/app/views/front/show_banner.html.erb +++ b/app/views/front/show_banner.html.erb @@ -3,7 +3,7 @@
@@ -13,7 +13,10 @@ "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>", "banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>", "image_count":"<%= @ad_banner.ad_images.length %>", - "image_loaded":0 + "image_loaded":0, + "time_to_next":<%= @ad_banner.transition_msec %>, + "current":0, + "best_size": "<%= @ad_banner.best_size %>" }; banners.push(banner); \ No newline at end of file diff --git a/public/static/kernel.js b/public/static/kernel.js index 87de3e3d6..49b49ff6b 100644 --- a/public/static/kernel.js +++ b/public/static/kernel.js @@ -1,5 +1,7 @@ var banners = []; var banner_index = 0; +$q = jQuery; +$q.getScript('/static/jquery.cycle.all.latest.js'); $(document).ready(function() { $.each($(".dymanic_load"),function(){ @@ -36,22 +38,56 @@ function ajax_load_proc(wapper,url,isBanner){ function BannerCycle(banner_index){ var banner = banners[banner_index]; - if (!!$.prototype.cycle && (banner.image_loaded==$(banner.banner_name+" img").length)){ - $(banner.banner_name).ready(function() { - $(banner.banner_name).cycle({ + if (banner.image_loaded==$(banner.banner_name+" img").length){ + if(banner.banner_name=="#slideshow-banner"){ + $q(banner.banner_name).cycle({ delay: -1000, fx: banner.banner_fx, - timeoutFn: getTimeout, + timeout: banner.time_to_next, pager: banner.banner_pager, pagerAnchorBuilder: function(idx, slide) { return "