From d788e94c475a8a265074b0a365ade3110083701c Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Thu, 20 May 2021 09:52:49 +0800
Subject: [PATCH] Update widget4.

---
 modules/announcement/_annc_widget4.html.erb | 86 +++++++++++++--------
 modules/announcement/info.json              |  1 +
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/modules/announcement/_annc_widget4.html.erb b/modules/announcement/_annc_widget4.html.erb
index d6efec2..548fcbd 100644
--- a/modules/announcement/_annc_widget4.html.erb
+++ b/modules/announcement/_annc_widget4.html.erb
@@ -32,46 +32,54 @@
     </li>
   </ul>
 </div>
+<style type="text/css">
+	[data-subpart-id="{{subpart-id}}"] .bullseye{
+		overflow: hidden;
+	}
+</style>
 <script>
-	var lilength = $('.widget-announcement-4 li.w-annc__item').length;
 	function combineul(){
-		for(var i=1;i<$('.widget-announcement-4 ul.w-annc__list').length;i++)
-			$('.widget-announcement-4 ul.w-annc__list').eq(0).find('>li').eq(-1).after($('.widget-announcement-4 ul.w-annc__list').eq(i).html());
-		var ullength = $('.widget-announcement-4 ul.w-annc__list').length;
-		for(var i = 1;i < ullength;i++)
-			$('.widget-announcement-4 ul.w-annc__list').eq(-1).remove();
+		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
+		parents.each(function(i,v){
+			for(var i=1;i<$(v).find('ul.w-annc__list').length;i++)
+				$(v).find('ul.w-annc__list').eq(0).find('>li').eq(-1).after($(v).find('ul.w-annc__list').eq(i).html());
+			var ullength = $(v).find('ul.w-annc__list').length;
+			for(var i = 1;i < ullength;i++)
+				$(v).find('ul.w-annc__list').eq(-1).remove();
+		})
 	};
+	var num;
+	var lilength = $('[data-subpart-id=\"{{subpart-id}}\"] li.w-annc__item').length;
 	function reorganize(num){
 		combineul();
-		for(var i=1;i< Math.ceil(lilength/num);i++){
-			$('.widget-announcement-4 ul.w-annc__list').eq(-1).after('<ul class="w-annc__list  row" data-level="0" data-list="announcements"></ul>')
-			var lihtml="";
-			if(i != (Math.ceil(lilength/num)-1)){
-				for(var j=0;j<num;j++)
-					lihtml += "<li class='w-annc__item  col-md-4'>"+$('.widget-announcement-4 li.w-annc__item').eq(i*num+j).html()+"</li>"
-			}else{
-				for(var j=0;j< lilength - num *(Math.ceil(lilength/num)-1) ;j++)
-					lihtml += "<li class='w-annc__item  col-md-4'>"+$('.widget-announcement-4 li.w-annc__item').eq(i*num+j).html()+"</li>"
-			};
-			$('.widget-announcement-4 ul.w-annc__list').eq(-1).html(lihtml);
-		};
-		if(Math.ceil(lilength/num) != 1 )
-			for(var i=0;i< lilength -num ; i++ )
-				$('.widget-announcement-4 ul.w-annc__list').eq(0).find("li.w-annc__item").eq(num).remove();
+		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
+		parents.each(function(i,v){
+			var lilength = $(v).find('li.w-annc__item').length;
+			var ul_length = Math.ceil(lilength/num);
+			for(var ii=1;ii< ul_length;ii++){
+				var clone_ul = $(v).find('ul.w-annc__list').eq(-1).clone();
+				clone_ul.empty();
+				clone_ul.removeClass("active");
+				clone_ul.css("display","");
+				$(v).find('ul.w-annc__list').eq(-1).after(clone_ul.prop("outerHTML"));
+				var lihtml="";
+				if(ii != (ul_length-1)){
+					for(var j=0;j<num;j++){
+						lihtml += $(v).find('li.w-annc__item').eq(ii*num+j).prop("outerHTML");
+					};
+				}else{
+					for(var j=0;j< lilength - num *(ul_length-1) ;j++){
+						lihtml += $(v).find('li.w-annc__item').eq(ii*num+j).prop("outerHTML");
+					};
+				};
+				$(v).find('ul.w-annc__list').eq(-1).html(lihtml);
+			}
+			if(ul_length != 1 )
+				for(var i=0;i< lilength -num ; i++)
+					$(v).find('ul.w-annc__list').eq(0).find("li.w-annc__item").eq(num).remove();
+		})
 		$('.widget-announcement-4 ul.w-annc__list >li').css('width','calc('+100/num+'% - '+20/16+'em)'); //20px=>li的margin
 	};
-	$(document).ready(function(){
-		if($(window).width()>1024){
-			reorganize(3);
-			num=3;
-		}else if($(window).width()>576){
-			reorganize(2);
-			num=2;
-		}else{
-			reorganize(1);
-			num=1;
-		}
-	});
 	$(window).resize(function(){
 		if($(window).width()>1024){
 			reorganize(3);
@@ -84,4 +92,16 @@
 			num=1;
 		}
 	})
+	$(document).ready(function(){
+		if($(window).width()>1024){
+			reorganize(3);
+			num=3;
+		}else if($(window).width()>576){
+			reorganize(2);
+			num=2;
+		}else{
+			reorganize(1);
+			num=1;
+		}
+	})
 </script>
diff --git a/modules/announcement/info.json b/modules/announcement/info.json
index c51b528..476c487 100644
--- a/modules/announcement/info.json
+++ b/modules/announcement/info.json
@@ -164,6 +164,7 @@
 		},
 		{
 			"filename" : "annc_widget4",
+			"force_cover": "true",
 			"name" : {
 				"zh_tw" : "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
 				"en" : "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"