Permalink
Browse files

Merge commit 'master' into zk-1469

  • Loading branch information...
dennischen committed Nov 19, 2012
2 parents 1b9efd2 + d4b8514 commit 8141c91b4721d8059c068b7ae2345b8c755aa3c3
@@ -454,6 +454,8 @@ it will be useful, but WITHOUT ANY WARRANTY.
delete wgt._z$rd;
wgt._norenderdefer = true;
wgt.replaceHTML('#' + wgt.uuid, wgt.parent ? wgt.parent.desktop: null, null, true);
+ if (wgt.parent)
+ wgt.parent.onChildRenderDefer_(wgt);
}
}
@@ -1875,6 +1877,13 @@ wgt.$f().main.setTitle("foo");
*/
onChildVisible_: function () {
},
+ /** A callback called after a child has been delay rendered.
+ * @param zk.Widget child the child being rendered
+ * @see #deferRedraw_
+ * @since 6.5.1
+ */
+ onChildRenderDefer_: function (/*child*/) {
+ },
/** Makes this widget as topmost.
* <p>If this widget is not floating, this method will look for its ancestors for the first ancestor who is floating. In other words, this method makes the floating containing this widget as topmost.
* To make a widget floating, use {@link #setFloating_}.
View
@@ -72,6 +72,7 @@ ZK 6.5.1
ZK-1213: Calendar and datebox showing the wrong day number
ZK-1220: Instant textbox doesn't preserve the focus at position
ZK-1467: Resizable panels inside portallayout loses resizability after move
+ ZK-1462: Portalchildren and Renderdeferer cause a Javascript error
ZK-1469: argument type mismatch when try to get @ScopeParam with @ref value
* Upgrade Notes
@@ -0,0 +1,27 @@
+<zk>
+ <label>
+ Wait around 1 seconds, should see two panels showed and they are draggable and droppable.
+ </label>
+ <portallayout id="myptl" maximizedMode="whole">
+ <portalchildren renderdefer="1000">
+ <panel id="paneltables" border="normal" title="test" height="352px"
+ collapsible="true" maximizable="true" style="margin-bottom:10px">
+ <panelchildren>
+ <hlayout height="100%">
+ <label>Panel 1</label>
+ </hlayout>
+ </panelchildren>
+ </panel>
+ </portalchildren>
+ <portalchildren>
+ <panel border="normal" title="test" height="352px"
+ collapsible="true" maximizable="true" style="margin-bottom:10px" renderdefer="1000">
+ <panelchildren>
+ <hlayout height="100%">
+ <label>Panel 2</label>
+ </hlayout>
+ </panelchildren>
+ </panel>
+ </portalchildren>
+ </portallayout>
+</zk>
@@ -1461,6 +1461,7 @@ B65-ZK-1463.zul=A,E,Window,Button,Skipper
B65-ZK-1220.zul=B,M,InputWidget,instant,cursor position
B65-ZK-1213.zul=A,E,Calendar
B65-ZK-1467.zul=B,M,Panel,sizable
+B65-ZK-1462.zul=A,M,Portallayout,renderdefer
##
# Features - 3.0.x version

0 comments on commit 8141c91

Please sign in to comment.