Merge pull request #28 from LogiGear/viet.bui/addTableShadow

dviet3201 · web-flow · commit aaea89723fb2 · 2026-05-29T16:19:50.000+07:00
Update shadowDom for TableCustomize.html and JP
diff --git a/HTML_5/ControlsList/Properties.js b/HTML_5/ControlsList/Properties.js
@@ -272,13 +272,10 @@ function Element_textContent(value, isSet) {
 }
 
 function Element_innerHTML(value, isSet) {
-
     if (isSet == 1) {
         GetControlByIDAndShadowContext(IDControl).innerHTML = value;
     }
-
     return GetControlByIDAndShadowContext(IDControl).innerHTML;
-
 }
 
 function Element_rows(value, isSet) {
diff --git a/HTML_5/CustomizeControls/TableCustomize.html b/HTML_5/CustomizeControls/TableCustomize.html
@@ -3,6 +3,7 @@
 <head>
 <title>Standard Control</title>
 <script src="../Scripts/js/jquery-1.5.2.min.js" type="text/javascript"></script>
+<script type="text/javascript" src="../ControlsList/Util.js"></script>
 <style type="text/css">
 body {
 	background-image: url(../images/background.jpg);
@@ -54,8 +55,8 @@
     
     function AddRow() {
 
-        var table = document.getElementById("TableTest3");
-        var itemName = document.getElementById("txtColumnName");
+        var table = getControlByIDAndShadowContext("TableTest3");
+        var itemName = getControlByIDAndShadowContext("txtColumnName");
         var curRow = table.rows.length - 1;        
         var newrow = table.insertRow(-1);
         var col = table.getElementsByTagName("tr")[0].cells.length;
@@ -78,8 +79,8 @@
     }
 
     function AddColumn() {
-        var table = document.getElementById('TableTest3'); //table body
-        var itemName = document.getElementById("txtColumnName");
+        var table = getControlByIDAndShadowContext('TableTest3'); //table body
+        var itemName = getControlByIDAndShadowContext("txtColumnName");
         for (var i = 0; i < table.rows.length; i++) {
             var newCell = table.rows[i].insertCell(-1); //create new cell
 
@@ -102,7 +103,7 @@
     }
 
     function TextInComment(text) {
-        document.getElementById("txtComments").value = text;
+        getControlByIDAndShadowContext("txtComments").value = text;
     }
 	function changeTitle() 
 	{
@@ -271,5 +272,10 @@
   <td colspan="4" align="right" height="19%"><span class="style3"></span></td>
 </tr>
 </table>
+<script type="text/javascript">
+    if (getUrlParm('shadow').toLowerCase() === 'true') {
+        attachShadowDOM(document.querySelector("td:has(#TableTest-1)"));
+    }
+</script>
 </body>
 <!-- InstanceEnd --></html>
diff --git a/HTML_5/HTML_JP/CustomizeControls/ScenarioDynamic.html b/HTML_5/HTML_JP/CustomizeControls/ScenarioDynamic.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"><!-- InstanceBegin template="/Templates/layout.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
-    <script src="../Scripts/js/jquery-1.5.2.min.js" type="text/javascript"></script>
-    <script type="text/javascript" src="../ControlsList/Util.js"></script>
+<script src="../Scripts/js/jquery-1.5.2.min.js" type="text/javascript"></script>
+<script type="text/javascript" src="../ControlsList/Util.js"></script>
 <title>標準コントロール</title>
 <meta charset="UTF-8">
 <style type="text/css">
@@ -87,8 +87,11 @@
 		$("#content").height(iHeight);
 		$("#content").width(iWidth);
         sPage = getUrlParm('id');
+
+
+
+
         sPage = "../ScenarioData_HTML/" + sPage + ".html";
-		console.log(sPage);
         $("#content").load(sPage, function (response, status, xhr) {            
             if (status == "error") {
                 var msg = "Sorry but there was an error: ";
@@ -97,7 +100,15 @@
             else
                 $("#txtComment").html("Page loaded successful.");
         });
+
+        if (getUrlParm('shadow').toLowerCase() === 'true') {
+            attachShadowDOM(document.getElementById("content"));
+        }
+
+		var sTitle = document.title;
+		parent.postMessage(sTitle,"*");
     });
 </script>
+
 </body>
 <!-- InstanceEnd --></html>
diff --git a/HTML_5/HTML_JP/CustomizeControls/TableCustomize.html b/HTML_5/HTML_JP/CustomizeControls/TableCustomize.html
@@ -3,6 +3,7 @@
 <head>
 <title>Standard Control</title>
 <script src="../Scripts/js/jquery-1.5.2.min.js" type="text/javascript"></script>
+<script type="text/javascript" src="../ControlsList/Util.js"></script>
 <style type="text/css">
 body {
 	background-image: url(../images/background.jpg);
@@ -54,8 +55,8 @@
     
     function AddRow() {
 
-        var table = document.getElementById("TableTest3");
-        var itemName = document.getElementById("txtColumnName");
+        var table = getControlByIDAndShadowContext("TableTest3");
+        var itemName = getControlByIDAndShadowContext("txtColumnName");
         var curRow = table.rows.length - 1;        
         var newrow = table.insertRow(-1);
         var col = table.getElementsByTagName("tr")[0].cells.length;
@@ -78,8 +79,8 @@
     }
 
     function AddColumn() {
-        var table = document.getElementById('TableTest3'); //table body
-        var itemName = document.getElementById("txtColumnName");
+        var table = getControlByIDAndShadowContext('TableTest3'); //table body
+        var itemName = getControlByIDAndShadowContext("txtColumnName");
         for (var i = 0; i < table.rows.length; i++) {
             var newCell = table.rows[i].insertCell(-1); //create new cell
 
@@ -102,10 +103,15 @@
     }
 
     function TextInComment(text) {
-        document.getElementById("txtComments").value = text;
+        getControlByIDAndShadowContext("txtComments").value = text;
     }
+	function changeTitle() 
+	{
+		var sTitle = document.title;
+		parent.postMessage(sTitle,"*");
+	}
 	</script>
-<body>
+<body onload="changeTitle()">
 
 <table id="wrapper" cellspacing="0">
 <tr>
@@ -266,5 +272,10 @@
   <td colspan="4" align="right" height="19%"><span class="style3"></span></td>
 </tr>
 </table>
+<script type="text/javascript">
+    if (getUrlParm('shadow').toLowerCase() === 'true') {
+        attachShadowDOM(document.querySelector("td:has(#TableTest-1)"));
+    }
+</script>
 </body>
 <!-- InstanceEnd --></html>
diff --git a/HTML_5/HTML_JP/ScenarioData_HTML/Iframe_Test_Switch_Frame.html b/HTML_5/HTML_JP/ScenarioData_HTML/Iframe_Test_Switch_Frame.html
@@ -14,6 +14,7 @@
     cursor:pointer;
 }
 </style>
+<script type="text/javascript" src="../ControlsList/Util.js"></script>
 </head>
 <body>
 
@@ -23,5 +24,10 @@ <h2>Iframe - Target for a Link</h2>
 <td colspan="3" height="100%"><iframe name="Iframe_test_lv1" id="Iframe_test_lv1" width="100%" height="1200" src="./Iframe_Page/Iframe_フレームテストLV1.html"></iframe></td>
 </tr>
 </table>
+<script type="text/javascript">
+    if (getUrlParm('shadow').toLowerCase() === 'true') {
+        attachShadowDOM(document.querySelector("table"));
+    }
+</script>
 </body>
 </html>
diff --git a/HTML_5/HTML_JP/ScenarioData_HTML/_MultiControls_sample_with_AR.html b/HTML_5/HTML_JP/ScenarioData_HTML/_MultiControls_sample_with_AR.html
diff --git a/HTML_5/HTML_JP/ScenarioData_HTML/複数コントロール_日本語.html b/HTML_5/HTML_JP/ScenarioData_HTML/複数コントロール_日本語.html

Original file line number	Diff line number	Diff line change
`@@ -272,13 +272,10 @@ function Element_textContent(value, isSet) {`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`function Element_innerHTML(value, isSet) {`
`275`		`-`
`276`	`275`	`if (isSet == 1) {`
`277`	`276`	`GetControlByIDAndShadowContext(IDControl).innerHTML = value;`
`278`	`277`	`}`
`279`		`-`
`280`	`278`	`return GetControlByIDAndShadowContext(IDControl).innerHTML;`
`281`		`-`
`282`	`279`	`}`
`283`	`280`
`284`	`281`	`function Element_rows(value, isSet) {`