saurabh
/
adbanner-test
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug.

This commit is contained in:
BoHung Chiu 2022-07-04 17:47:28 +08:00
parent 3f85c120d7
commit e48b43937c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/ad_banners_controller.rb
View File

@ -32,6 +32,7 @@ class AdBannersController < ApplicationController
if !b.out_link.blank? if !b.out_link.blank?
image_link += "\" style=\"cursor:pointer;\" onload=\"var el=this;(function(){if((el.parentElement==undefined||el.parentElement.tagName!='A')&&$('<p>'+$(el).parents('.w-ba-banner__slide').eq(0).attr('data-overlay-template')+'</p>').find('a').length==0){el.outerHTML=('<a href=#{b.out_link} target=#{target}>'+el.outerHTML+'</a>');}})()\"" image_link += "\" style=\"cursor:pointer;\" onload=\"var el=this;(function(){if((el.parentElement==undefined||el.parentElement.tagName!='A')&&$('<p>'+$(el).parents('.w-ba-banner__slide').eq(0).attr('data-overlay-template')+'</p>').find('a').length==0){el.outerHTML=('<a href=#{b.out_link} target=#{target}>'+el.outerHTML+'</a>');}})()\""
end end
context = (b.context.tr('"',"'") rescue "")
images << { images << {
"slide_number" => (i+1), "slide_number" => (i+1),
"image_link" => image_link, "image_link" => image_link,
@ -42,7 +43,8 @@ class AdBannersController < ApplicationController
"height" => adbanner.height, "height" => adbanner.height,
"width" => adbanner.width, "width" => adbanner.width,
"caption" => caption, "caption" => caption,
"context" => (b.context.tr('"',"'") rescue ""), "context" => context,
"desc" => context,
"link" => b.out_link || "#", "link" => b.out_link || "#",
"target" => target "target" => target
} }
@ -58,8 +60,7 @@ class AdBannersController < ApplicationController
"banner-width" => adbanner.width, "banner-width" => adbanner.width,
"base_image" => (base_image - 1), "base_image" => (base_image - 1),
"timeout" => (adbanner.timeout * 1000), "timeout" => (adbanner.timeout * 1000),
"more" => "More", "more" => "More"
"desc" => ""
}, },
"images" => images "images" => images
} }

2
app/views/admin/ad_images/_jplayer.html.erb
View File

@ -386,7 +386,7 @@
if ($("#jquery_jplayer_<%= i %>").parents("div.cycle-slideshow").length>0){ if ($("#jquery_jplayer_<%= i %>").parents("div.cycle-slideshow").length>0){
$("#jquery_jplayer_<%= i %>").addClass("hide-ui"); $("#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 %>(); click_jplayer_<%= i %>();
//event.stopPropagation(); //event.stopPropagation();
}) })