From 1b9914dcf89d84bbb92d62c5924e02e683a0e505 Mon Sep 17 00:00:00 2001 From: chiu Date: Sat, 7 Sep 2019 16:05:08 +0800 Subject: [PATCH 1/2] Update text_marquees_controller.rb add auto create title feature to meet the Barrier-Free check --- app/controllers/text_marquees_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/text_marquees_controller.rb b/app/controllers/text_marquees_controller.rb index 0f520d3..e2dba29 100644 --- a/app/controllers/text_marquees_controller.rb +++ b/app/controllers/text_marquees_controller.rb @@ -3,11 +3,17 @@ class TextMarqueesController < ApplicationController subpart = OrbitHelper.get_current_widget marquee = Marquee.find(OrbitHelper.widget_custom_value) texts = marquee.marquee_texts.collect do |mqt| + doc = Nokogiri::HTML(mqt.title) + if mqt.title.to_s.empty? + title = 'no content' + else + title = doc.css('span').text.empty? ? mqt.title : doc.css('span').text + end { "text" => mqt.title, "speed" => mqt.speed, "url" => (mqt.url || ""), - "content" => (mqt.url.to_s.empty? ? "#{mqt.title}" : "#{mqt.title}") + "content" => (mqt.url.to_s.empty? ? "#{mqt.title}" : "#{mqt.title}") } end { From ea315a7f899284cd9331f35524310ded14e830f2 Mon Sep 17 00:00:00 2001 From: chiu Date: Sat, 7 Sep 2019 16:12:10 +0800 Subject: [PATCH 2/2] Update text_marquees_controller.rb fix error create title for img tag --- app/controllers/text_marquees_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/text_marquees_controller.rb b/app/controllers/text_marquees_controller.rb index e2dba29..e6ce63a 100644 --- a/app/controllers/text_marquees_controller.rb +++ b/app/controllers/text_marquees_controller.rb @@ -4,11 +4,7 @@ class TextMarqueesController < ApplicationController marquee = Marquee.find(OrbitHelper.widget_custom_value) texts = marquee.marquee_texts.collect do |mqt| doc = Nokogiri::HTML(mqt.title) - if mqt.title.to_s.empty? - title = 'no content' - else - title = doc.css('span').text.empty? ? mqt.title : doc.css('span').text - end + title = doc.text.empty? ? 'no content' : doc.text { "text" => mqt.title, "speed" => mqt.speed,