Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix bug ZK-1462

  • Loading branch information...
commit d4b85140bc68440af565a36ee353c06012b8bdbb 1 parent 3db0c16
VincentJian VincentJian authored
9 zk/src/archive/web/js/zk/widget.js
@@ -454,6 +454,8 @@ it will be useful, but WITHOUT ANY WARRANTY.
454 454 delete wgt._z$rd;
455 455 wgt._norenderdefer = true;
456 456 wgt.replaceHTML('#' + wgt.uuid, wgt.parent ? wgt.parent.desktop: null, null, true);
  457 + if (wgt.parent)
  458 + wgt.parent.onChildRenderDefer_(wgt);
457 459 }
458 460 }
459 461
@@ -1875,6 +1877,13 @@ wgt.$f().main.setTitle("foo");
1875 1877 */
1876 1878 onChildVisible_: function () {
1877 1879 },
  1880 + /** A callback called after a child has been delay rendered.
  1881 + * @param zk.Widget child the child being rendered
  1882 + * @see #deferRedraw_
  1883 + * @since 6.5.1
  1884 + */
  1885 + onChildRenderDefer_: function (/*child*/) {
  1886 + },
1878 1887 /** Makes this widget as topmost.
1879 1888 * <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.
1880 1889 * To make a widget floating, use {@link #setFloating_}.
1  zkdoc/release-note
@@ -72,6 +72,7 @@ ZK 6.5.1
72 72 ZK-1213: Calendar and datebox showing the wrong day number
73 73 ZK-1220: Instant textbox doesn't preserve the focus at position
74 74 ZK-1467: Resizable panels inside portallayout loses resizability after move
  75 + ZK-1462: Portalchildren and Renderdeferer cause a Javascript error
75 76
76 77 * Upgrade Notes
77 78 + Decouple Flashchart component from zul.jar to flashchart.jar, due to Flashchart contains a potential
27 zktest/src/archive/test2/B65-ZK-1462.zul
... ... @@ -0,0 +1,27 @@
  1 +<zk>
  2 + <label>
  3 + Wait around 1 seconds, should see two panels showed and they are draggable and droppable.
  4 + </label>
  5 + <portallayout id="myptl" maximizedMode="whole">
  6 + <portalchildren renderdefer="1000">
  7 + <panel id="paneltables" border="normal" title="test" height="352px"
  8 + collapsible="true" maximizable="true" style="margin-bottom:10px">
  9 + <panelchildren>
  10 + <hlayout height="100%">
  11 + <label>Panel 1</label>
  12 + </hlayout>
  13 + </panelchildren>
  14 + </panel>
  15 + </portalchildren>
  16 + <portalchildren>
  17 + <panel border="normal" title="test" height="352px"
  18 + collapsible="true" maximizable="true" style="margin-bottom:10px" renderdefer="1000">
  19 + <panelchildren>
  20 + <hlayout height="100%">
  21 + <label>Panel 2</label>
  22 + </hlayout>
  23 + </panelchildren>
  24 + </panel>
  25 + </portalchildren>
  26 + </portallayout>
  27 +</zk>
1  zktest/src/archive/test2/config.properties
@@ -1461,6 +1461,7 @@ B65-ZK-1463.zul=A,E,Window,Button,Skipper
1461 1461 B65-ZK-1220.zul=B,M,InputWidget,instant,cursor position
1462 1462 B65-ZK-1213.zul=A,E,Calendar
1463 1463 B65-ZK-1467.zul=B,M,Panel,sizable
  1464 +B65-ZK-1462.zul=A,M,Portallayout,renderdefer
1464 1465
1465 1466 ##
1466 1467 # Features - 3.0.x version

0 comments on commit d4b8514

Please sign in to comment.
Something went wrong with that request. Please try again.