Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix Flex-138 #40

Merged
merged 1 commit into from

2 participants

@huangnoah

No description provided.

@VincentJian VincentJian merged commit fe48b26 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 25, 2013
  1. @huangnoah

    Fix Flex-138

    huangnoah authored
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 3 deletions.
  1. +6 −3 zk/src/archive/web/js/zk/flex.js
View
9 zk/src/archive/web/js/zk/flex.js
@@ -391,7 +391,7 @@ zFlex = { //static methods
wdh = psz.width,
c = p.firstChild,
scrWdh;
-
+
// Bug 3185686, B50-ZK-452
if(zkp.hasVScroll()) //with vertical scrollbar
wdh -= (scrWdh = jq.scrollbarWidth());
@@ -417,8 +417,11 @@ zFlex = { //static methods
cwgt = zk.Widget.$(c, {exact: 1});
//Bug ZK-1647: should consider header width
- if (zk.isLoaded('zul.mesh') && cwgt && cwgt.$instanceof(zul.mesh.HeaderWidget))
- offwdh = jq(c).width();
+ if (zk.isLoaded('zul.mesh') && cwgt && cwgt.$instanceof(zul.mesh.HeaderWidget)) {
+ // Bug Flex-138: skip if wdh exists
+ if(!offwdh)
+ offwdh = jq(c).width();
+ }
//horizontal size
if (cwgt && cwgt._nhflex) {
Something went wrong with that request. Please try again.