diff --git a/app/controllers/ad_banners_controller.rb b/app/controllers/ad_banners_controller.rb index 75bc326..968b742 100644 --- a/app/controllers/ad_banners_controller.rb +++ b/app/controllers/ad_banners_controller.rb @@ -32,6 +32,7 @@ class AdBannersController < ApplicationController if !b.out_link.blank? image_link += "\" style=\"cursor:pointer;\" onload=\"var el=this;(function(){if((el.parentElement==undefined||el.parentElement.tagName!='A')&&$('

'+$(el).parents('.w-ba-banner__slide').eq(0).attr('data-overlay-template')+'

').find('a').length==0){el.outerHTML=(''+el.outerHTML+'');}})()\"" end + context = (b.context.tr('"',"'") rescue "") images << { "slide_number" => (i+1), "image_link" => image_link, @@ -42,7 +43,8 @@ class AdBannersController < ApplicationController "height" => adbanner.height, "width" => adbanner.width, "caption" => caption, - "context" => (b.context.tr('"',"'") rescue ""), + "context" => context, + "desc" => context, "link" => b.out_link || "#", "target" => target } @@ -58,8 +60,7 @@ class AdBannersController < ApplicationController "banner-width" => adbanner.width, "base_image" => (base_image - 1), "timeout" => (adbanner.timeout * 1000), - "more" => "More", - "desc" => "" + "more" => "More" }, "images" => images } diff --git a/app/views/admin/ad_images/_jplayer.html.erb b/app/views/admin/ad_images/_jplayer.html.erb index f4df1f1..15cc462 100644 --- a/app/views/admin/ad_images/_jplayer.html.erb +++ b/app/views/admin/ad_images/_jplayer.html.erb @@ -386,7 +386,7 @@ if ($("#jquery_jplayer_<%= i %>").parents("div.cycle-slideshow").length>0){ $("#jquery_jplayer_<%= i %>").addClass("hide-ui"); } - $("#jquery_jplayer_<%= i %>").click(function(event){ + $("#jquery_jplayer_<%= i %>, #jquery_jplayer_<%= i %> +.jp-gui .jp-video-play-icon").click(function(event){ click_jplayer_<%= i %>(); //event.stopPropagation(); })