Merge branch 'master' into refine-5018

zkoss · Dec 18, 2023 · 89fd9b2 · 89fd9b2
2 parents 4647552 + c8351e3
commit 89fd9b2
Show file tree

Hide file tree

Showing 28 changed files with 56 additions and 61 deletions.
diff --git a/.github/workflows/rebase-trigger.yml b/.github/workflows/rebase-trigger.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Slash Command Dispatch
-        uses: peter-evans/slash-command-dispatch@v1.2.0
+        uses: peter-evans/slash-command-dispatch@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commands: rebase

diff --git a/zksandbox/src/main/webapp/layout/panel.zul b/zksandbox/src/main/webapp/layout/panel.zul
@@ -52,9 +52,9 @@ Copyright (C) 2008 Potix Corporation. All Rights Reserved.
         background: transparent none;
     }
 </style>
-<panel id="panel" framable="true" width="500px" height="400px"
+<panel id="panel" width="500px" height="400px"
 	title="Panel"
-	maximizable="true" minimizable="true" border="normal"
+	maximizable="true" minimizable="true" border="rounded"
 	collapsible="true" closable="true">
 	<attribute name="onClose">alert("Panel is closed");</attribute>
 	<attribute name="onMinimize">alert("Panel is minimized");</attribute>

diff --git a/zktest/src/main/webapp/test/panel/case1.zul b/zktest/src/main/webapp/test/panel/case1.zul
@@ -1,4 +1,4 @@
-<panel framable="false" width="500px" height="100%" title="Panel component"
+<panel width="500px" height="100%" title="Panel component"
 	border="normal" collapsible="true" closable="true">
 	<toolbar>
 		Search:

diff --git a/zktest/src/main/webapp/test/panel/case2.zul b/zktest/src/main/webapp/test/panel/case2.zul
@@ -1,7 +1,7 @@
 <zk>
 <button id="btn" label="Restore Panel" visible="false" onClick='self.visible = panel.minimized = false;'/>
-<panel id="panel" framable="true" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
-	maximizable="true" minimizable="true"  border="normal" collapsible="true" closable="true">
+<panel id="panel" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
+	maximizable="true" minimizable="true"  border="rounded" collapsible="true" closable="true">
 	<attribute name="onMinimize">
 		btn.visible = self.minimized;
 		btn.focus();

diff --git a/zktest/src/main/webapp/test/panel/case4.zul b/zktest/src/main/webapp/test/panel/case4.zul
@@ -1,10 +1,10 @@
 <vbox>
 	<hbox>
-		<panel framable="true" width="300px"
-			title="has title with frame" border="normal">
+		<panel width="300px"
+			title="has title with frame" border="rounded">
 			<panelchildren>Test border</panelchildren>
 		</panel>
-		<panel framable="true" width="300px" border="normal">
+		<panel width="300px" border="rounded">
 			<panelchildren>Test border</panelchildren>
 		</panel>
 		<panel title="has title" width="300px" border="normal">
@@ -15,11 +15,11 @@
 		</panel>
 	</hbox>
 	<hbox>
-		<panel framable="true" title="has title with frame"
+		<panel border="rouned" title="has title with frame"
 			width="300px">
 			<panelchildren>Test none-border</panelchildren>
 		</panel>
-		<panel framable="true" width="300px">
+		<panel border="rounded" width="300px">
 			<panelchildren>Test none-border</panelchildren>
 		</panel>
 		<panel title="has title" width="300px">
@@ -31,8 +31,8 @@
 	</hbox>
 	<separator bar="true"/>
 	<hbox>
-		<panel framable="true" width="300px"
-			title="has title with frame" border="normal">
+		<panel width="300px"
+			title="has title with frame" border="rounded">
 			<toolbar>
 				<toolbarbutton label="top" />
 				<button label="top" />
@@ -47,7 +47,7 @@
 				<button label="foot" />
 			</toolbar>
 		</panel>
-		<panel framable="false" width="500px" border="normal">
+		<panel width="500px" border="normal">
 			<toolbar mold="panel" align="center">
 				<toolbarbutton label="top" />
 				<button label="top" />
@@ -104,8 +104,8 @@
 	</hbox>
 	<separator bar="true"/>
 	<hbox>
-		<panel framable="true" width="500px"
-			title="Panel component - has frame" border="normal"
+		<panel width="500px"
+			title="Panel component - has frame" border="rounded"
 			collapsible="true" closable="true">
 			<toolbar>
 				Search:
@@ -189,7 +189,7 @@
 				<button label="button1" />
 			</toolbar>
 		</panel>
-		<panel framable="false" width="500px" title="Panel component"
+		<panel width="500px" title="Panel component"
 			border="normal" collapsible="true" closable="true" >
 			<toolbar>
 				Search:

diff --git a/zktest/src/main/webapp/test2/B2685842_1.zul b/zktest/src/main/webapp/test2/B2685842_1.zul
@@ -15,7 +15,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 -->
 <box hflex="min" height="650">
 	<vbox>
-		<panel framable="true" title="My First Panel" border="normal" hflex="min"
+		<panel title="My First Panel" border="rounded" hflex="min"
 			height="200px">
 			<panelchildren><div width="800px" height="162px" id="tl"/></panelchildren>
 		</panel>

diff --git a/zktest/src/main/webapp/test2/B35-2075808.zul b/zktest/src/main/webapp/test2/B35-2075808.zul
@@ -39,8 +39,8 @@ import org.zkoss.zkmax.zul.Columnchildren;
 				collapsible="true">
 				<panelchildren>Panel</panelchildren>
 			</panel>
-			<panel height="100px" framable="true" title="column1-2"
-				border="normal" maximizable="true" style="margin-bottom:10px">
+			<panel height="100px" title="column1-2"
+				border="rounded" maximizable="true" style="margin-bottom:10px">
 				<panelchildren>Panel</panelchildren>
 			</panel>
 			<panel height="100px" title="column1-3" border="normal"
@@ -106,7 +106,7 @@ import org.zkoss.zkmax.zul.Columnchildren;
 		</columnchildren>
 
 		<columnchildren id="cRig" width="30%" style="padding: 10px">
-			<panel title="Data" framable="true" border="normal"
+			<panel title="Data" border="rounded"
 				style="margin-bottom:10px">
 				<panelchildren>
 					<grid>

diff --git a/zktest/src/main/webapp/test2/B36-2794303.zul b/zktest/src/main/webapp/test2/B36-2794303.zul
@@ -14,8 +14,8 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 
 -->
 <zk>
-<panel id="panel" framable="true" width="400px" height="200px"
-	maximizable="true" minimizable="true" border="normal"
+<panel id="panel" width="400px" height="200px"
+	maximizable="true" minimizable="true" border="rounded"
 	collapsible="true" closable="true">
 	<caption image="/img/Centigrade-Widget-Icons/FirstWindow-24x24.png" label="You should see the four icon at the right"/>
 </panel>

diff --git a/zktest/src/main/webapp/test2/B36-2820552.zul b/zktest/src/main/webapp/test2/B36-2820552.zul
@@ -27,9 +27,9 @@ After loading the page, you should not see any error.
         background: transparent none;
     }
 </style>
-<panel id="panel" framable="true" width="500px" height="400px"
+<panel id="panel" width="500px" height="400px"
 	title="Panel"
-	maximizable="true" minimizable="true" border="normal"
+	maximizable="true" minimizable="true" border="rounded"
 	collapsible="true" closable="true">
 	<attribute name="onClose">alert("Panel is closed");</attribute>
 	<attribute name="onMinimize">alert("Panel is minimized");</attribute>

diff --git a/zktest/src/main/webapp/test2/B50-2887987.zul b/zktest/src/main/webapp/test2/B50-2887987.zul
@@ -16,7 +16,7 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
 <window>
 In IE, each panel should display well (the corner of each panel should not disappear)
 <vlayout>
-    <panel title="Test0" closable="false" framable="true"
+    <panel title="Test0" closable="false" border="rounded"
 collapsible="true" width="300px">
         <panelchildren>
             <listbox>
@@ -26,7 +26,7 @@ collapsible="true" width="300px">
             </listbox>
         </panelchildren>
     </panel>
-    <panel title="Test1" closable="false" framable="true"
+    <panel title="Test1" closable="false" border="rounded"
 collapsible="true">
         <panelchildren>
             <listbox>
@@ -36,7 +36,7 @@ collapsible="true">
             </listbox>
         </panelchildren>
     </panel>
-    <panel title="Test2" closable="false" framable="false"
+    <panel title="Test2" closable="false"
 collapsible="true" border="normal">
         <panelchildren>
             <listbox>
@@ -46,7 +46,7 @@ collapsible="true" border="normal">
             </listbox>
         </panelchildren>
     </panel>
-    <panel closable="false" framable="true"
+    <panel closable="false" border="rounded"
 collapsible="true">
         <panelchildren>
             <listbox>

diff --git a/zktest/src/main/webapp/test2/B50-3152678.zul b/zktest/src/main/webapp/test2/B50-3152678.zul
@@ -1,10 +1,10 @@
 <zk>
-	<html><![CDATA[
+	<html><![CDATA[
 		<ol>
 			<li>Click on each of the following buttons. If in any case the Panel does not resize to fit the height (you need to see the complete bottom of Panel), it is a bug.</li>
 		</ol>
 	]]></html>
-	<panel title="Panel" border="normal" framable="true" width="300px" height="300px">
+	<panel title="Panel" border="rounded" width="300px" height="300px">
 		<toolbar id="tbar1" visible="false">
 			Toolbar 1
 		</toolbar>

diff --git a/zktest/src/main/webapp/test2/B50-3218576.zul b/zktest/src/main/webapp/test2/B50-3218576.zul
@@ -19,7 +19,7 @@ Copyright (C) 2011 Potix Corporation. All Rights Reserved.
 <li>Click the button "Click Me", you should see the toolbar of "T3" is outside the border of the "Panel Content".</li>
 </ol>
 ]]></html>
-<panel id="panel" title="Panel" border="normal" framable="true">
+<panel id="panel" title="Panel" border="rounded">
 <panelchildren>
 Panel Content
 </panelchildren>

diff --git a/zktest/src/main/webapp/test2/B50-3255116.zul b/zktest/src/main/webapp/test2/B50-3255116.zul
@@ -16,9 +16,9 @@ Copyright (C) 2011 Potix Corporation. All Rights Reserved.
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>
 <zk>
 After you see this page, you should not see the horizontal scrollbar shown in the grid.
-<panel border="normal"
+<panel border="rounded"
 	width="580px" height="250px" sclass="bg-tree-panel"
-	framable="true" id="homeContext" style="min-height">
+	id="homeContext" style="min-height">
 	<caption
 		label="Listbox test" />
 	<panelchildren

diff --git a/zktest/src/main/webapp/test2/B50-3315594.zul b/zktest/src/main/webapp/test2/B50-3315594.zul
@@ -33,7 +33,7 @@ You shall see "item 19" in the window and panel.
 			</listitem>
 		</listbox>
 	</window>
-	<panel border="normal" vflex="min" hflex="min" framable="true">
+	<panel border="rounded" vflex="min" hflex="min">
 	<panelchildren>
 		<listbox rows="20" hflex="min">
 			<listhead>

diff --git a/zktest/src/main/webapp/test2/B60-ZK-1003.zul b/zktest/src/main/webapp/test2/B60-ZK-1003.zul
@@ -16,7 +16,7 @@ Copyright (C) 2012 Potix Corporation. All Rights Reserved.
 <zk>
 	<div>You should see two Toolbar below the 'Panel Content'</div>
 	<div height="400px" style="border: 1px solid red">
-		<panel vflex="1" border="normal" title="Panel" framable="true"
+		<panel vflex="1" border="rounded" title="Panel"
 			closable="true" maximizable="true" minimizable="true" collapsible="true">
 			<toolbar mold="panel">Toolbar</toolbar>
 			<panelchildren>

diff --git a/zktest/src/main/webapp/test2/B65-ZK-1404.zul b/zktest/src/main/webapp/test2/B65-ZK-1404.zul
@@ -5,7 +5,7 @@
 	</label>
 	<hbox>
 		<panel title="Splitter, Default Mold" sclass="center-bg-win"
-			framable="true" border="normal" height="300px" width="300px">
+			border="rounded" height="300px" width="300px">
 			<panelchildren>
 				<hbox spacing="0" height="100%">
 					<vbox spacing="0" width="100%" height="100%">

diff --git a/zktest/src/main/webapp/test2/B80-ZK-3139.zul b/zktest/src/main/webapp/test2/B80-ZK-3139.zul
@@ -19,7 +19,7 @@ Copyright (C) 2016 Potix Corporation. All Rights Reserved.
             1. click on the maximize buttons.
             2. hover mouse on the button, the icon should change to restore.
         </label>
-        <panel width="250px" height="100px" framable="true" border="normal" maximizable="true" minimizable="true" title="Title">
+        <panel width="250px" height="100px" border="rounded" maximizable="true" minimizable="true" title="Title">
             <panelchildren/>
         </panel>
         <window width="250px" height="100px" border="normal" closable="true" maximizable="true">

diff --git a/zktest/src/main/webapp/test2/F35-1997391.zul b/zktest/src/main/webapp/test2/F35-1997391.zul
@@ -19,8 +19,8 @@ Copyright (C) 2008 Potix Corporation. All Rights Reserved.
 -->
 <zk>
 <button id="btn" label="Restore Panel" visible="false" onClick='self.visible = panel.minimized = false;'/>
-<panel id="panel" framable="true" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
-	maximizable="true" minimizable="true"  border="normal" collapsible="true" closable="true">
+<panel id="panel" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
+	maximizable="true" minimizable="true"  border="rounded" collapsible="true" closable="true">
 	<attribute name="onMinimize">
 		btn.visible = self.minimized;
 		btn.focus();

diff --git a/zktest/src/main/webapp/test2/F35-2049401.zul b/zktest/src/main/webapp/test2/F35-2049401.zul
@@ -26,8 +26,8 @@ Copyright (C) 2008 Potix Corporation. All Rights Reserved.
 				collapsible="true">
 				<panelchildren>Panel</panelchildren>
 			</panel>
-			<panel height="100px" framable="true" title="column1-2"
-				border="normal" maximizable="true" style="margin-bottom:10px">
+			<panel height="100px" title="column1-2"
+				border="rounded" maximizable="true" style="margin-bottom:10px">
 				<panelchildren>Panel</panelchildren>
 			</panel>
 			<panel height="100px" title="column1-3" border="normal"

diff --git a/zktest/src/main/webapp/test2/F50-2187771.zul b/zktest/src/main/webapp/test2/F50-2187771.zul
@@ -27,9 +27,9 @@ Copyright (C) 2009 Potix Corporation. All Rights Reserved.
     }
 </style>
 Panel can be sizable
-<panel sizable="true" id="panel" framable="true" width="500px" height="400px"
+<panel sizable="true" id="panel" width="500px" height="400px"
     title="Panel"
-    maximizable="true" minimizable="true" border="normal"
+    maximizable="true" minimizable="true" border="rounded"
     collapsible="true" closable="true">
     <attribute name="onClose">alert("Panel is closed");</attribute>
     <attribute name="onMinimize">alert("Panel is minimized");</attribute>

diff --git a/zktest/src/main/webapp/test2/F50-3316591.zul b/zktest/src/main/webapp/test2/F50-3316591.zul
@@ -16,7 +16,7 @@
 		none; }
 	</style>
 
-	<panel framable="true" sclass="container" width="400px">
+	<panel sclass="container" border="rounded" width="400px">
 		<panelchildren>
 			<textbox id='txb' sclass="txb" width="99%"
 				style="background:#FFFFCC" rows="5"

diff --git a/zktest/src/main/webapp/test2/Z35-borderlayout-001.zul b/zktest/src/main/webapp/test2/Z35-borderlayout-001.zul
@@ -156,8 +156,8 @@
 				<east size="50%" border="none">
 				<div vflex="1">
 				<button id="btn" label="Restore Panel" visible="false" onClick='self.visible = panel.minimized = false;'/>
-					<panel id="panel" framable="true" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
-	maximizable="true" minimizable="true"  border="normal" collapsible="true" closable="true">
+					<panel id="panel" width="500px" height="500px" title="Panel component" floatable="true" movable="true"
+	maximizable="true" minimizable="true" border="rounded" collapsible="true" closable="true">
 	<attribute name="onMinimize">
 		btn.visible = self.minimized;
 		btn.focus();

diff --git a/zktest/src/main/webapp/test2/Z35-columnlayout-0002.zul b/zktest/src/main/webapp/test2/Z35-columnlayout-0002.zul
@@ -39,8 +39,8 @@ import org.zkoss.zkmax.zul.Columnchildren;
 				collapsible="true">
 				<panelchildren>Panel</panelchildren>
 			</panel>
-			<panel height="100px" framable="true" title="column1-2"
-				border="normal" maximizable="true" style="margin-bottom:10px">
+			<panel height="100px" title="column1-2"
+				border="rounded" maximizable="true" style="margin-bottom:10px">
 				<panelchildren>Panel</panelchildren>
 			</panel>
 			<panel height="100px" title="column1-3" border="normal"
@@ -105,7 +105,7 @@ import org.zkoss.zkmax.zul.Columnchildren;
 		</columnchildren>
 
 		<columnchildren id="cRig" width="30%" style="padding: 10px">
-			<panel title="Data" framable="true" border="normal"
+			<panel title="Data" border="rounded"
 				style="margin-bottom:10px">
 				<panelchildren>
 					<grid>

diff --git a/zktest/src/main/webapp/test2/Z35-grid-0107-comp.zul b/zktest/src/main/webapp/test2/Z35-grid-0107-comp.zul
@@ -113,9 +113,9 @@
 				<radio label="Grape"/>
 			</radiogroup>
 		</groupbox>
-	<panel framable="true" width="250px"
+	<panel width="250px"
 		title="Panel component"
-		maximizable="true" minimizable="true" border="normal"
+		maximizable="true" minimizable="true" border="rounded"
 		collapsible="true" closable="true"  if="${!empty arg.panel1}">
 		<panelchildren>
 		<window border="normal" width="200px" sizable="true">

diff --git a/zktest/src/main/webapp/test2/Z35-panel-001.zul b/zktest/src/main/webapp/test2/Z35-panel-001.zul
@@ -20,11 +20,6 @@
 					p1.setBorder("none");
 			</attribute>
 		</button>
-		<button label="Change framable">
-			<attribute name="onClick">
-					p1.framable=!p1.framable;
-			</attribute>
-		</button>
 		<button label="Change width and height">
 			<attribute name="onClick">
 				if(p1.width.equals("500px")) {

diff --git a/zktest/src/main/webapp/test2/Z35-portallayout-comp.zul b/zktest/src/main/webapp/test2/Z35-portallayout-comp.zul
@@ -127,9 +127,9 @@
 			</radiogroup>
 	</groupbox>
 
-	<panel framable="true" width="200px"
+	<panel width="200px"
 		title="Panel component"
-		maximizable="true" minimizable="true" border="normal"
+		maximizable="true" minimizable="true" border="rounded"
 		collapsible="true" closable="true"  if="${!empty execution.parameterMap.panel1}">
 		<panelchildren>
 		<window border="normal" width="250px" sizable="true">

diff --git a/zktest/src/main/webapp/test2/Z50-rod.zul b/zktest/src/main/webapp/test2/Z50-rod.zul
@@ -237,7 +237,7 @@ new Comboitem("John3").setParent(mycombo);
 </button>
 <button label="set visible" onClick="panel.visible = true"/>
 <button label="set max" onClick="panel.setMaximized(true)"/>
-<panel id="panel" framable="false" title="Panel component" maximizable="true"
+<panel id="panel" title="Panel component" maximizable="true"
 border="normal" collapsible="true" closable="true" visible="false">
 	<panelchildren id="pc">
 	The content of a panel

diff --git a/zul/src/main/resources/metainfo/xml/zul.xsd b/zul/src/main/resources/metainfo/xml/zul.xsd
@@ -2582,7 +2582,6 @@
 		<xs:attribute name="border" type="panelBorderAttrType"
 			use="optional" />
 		<xs:attribute name="sizable" type="booleanType" use="optional" />
-		<xs:attribute name="framable" type="booleanType" use="optional" />
 		<xs:attribute name="closable" type="booleanType" use="optional" />
 		<xs:attribute name="collapsible" type="booleanType" use="optional" />
 		<xs:attribute name="floatable" type="booleanType" use="optional" />
@@ -2600,6 +2599,7 @@
 				<xs:restriction base="xs:string">
 					<xs:enumeration value="normal" />
 					<xs:enumeration value="none" />
+					<xs:enumeration value="rounded" />
 				</xs:restriction>
 			</xs:simpleType>
 			<xs:simpleType>