You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by jm...@apache.org on 2006/12/11 06:00:27 UTC
svn commit: r485516 - in /incubator/xap/trunk/src/xap/widgets/dojo:
HorizontalPanel.js VerticalPanel.js
Author: jmargaris
Date: Sun Dec 10 22:00:26 2006
New Revision: 485516
URL: http://svn.apache.org/viewvc?view=rev&rev=485516
Log:
removed useless flex()
Modified:
incubator/xap/trunk/src/xap/widgets/dojo/HorizontalPanel.js
incubator/xap/trunk/src/xap/widgets/dojo/VerticalPanel.js
Modified: incubator/xap/trunk/src/xap/widgets/dojo/HorizontalPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/widgets/dojo/HorizontalPanel.js?view=diff&rev=485516&r1=485515&r2=485516
==============================================================================
--- incubator/xap/trunk/src/xap/widgets/dojo/HorizontalPanel.js (original)
+++ incubator/xap/trunk/src/xap/widgets/dojo/HorizontalPanel.js Sun Dec 10 22:00:26 2006
@@ -69,7 +69,6 @@
xap.widgets.dojo.HorizontalPanel.superclass.addChild.call(this,child, overrideContainerNode, pos, ref, insertIndex);
this.setAlign(this.align);
- this.flex();
},
removeChild: function(child) {
@@ -79,8 +78,6 @@
var containerCell= child.domNode.parentNode;
xap.widgets.dojo.HorizontalPanel.superclass.removeChild.call(this,child);
containerCell.parentNode.removeChild(containerCell);
-
- this.flex();
},
setAlign: function(align) {
@@ -123,35 +120,7 @@
else if (pack == "center") {
this.centerTd.align = "center";
}
- },
-
- flex: function() {
- var children = this.children;
-
- var maxFlex = -1;
- var minFlex = 999999;
- var minWidth = 999999;
- for (var i = 0; i < children.length; i++) {
- if (!children[i].domNode.flex) {
- children[i].domNode.flex = 1;
- }
-
- var flexInt = parseInt(children[i].domNode.flex);
-
- maxFlex = Math.max(flexInt, maxFlex);
- minFlex = Math.min(flexInt, minFlex);
-
- minWidth = Math.min(minWidth, parseInt(children[i].domNode.offsetWidth));
- }
-
- if (maxFlex != minFlex) {
- for (var i = 0; i < children.length; i++) {
- if (children[i].domNode.style.width) {
- var ratio = parseInt(children[i].domNode.flex) / minFlex;
- children[i].domNode.style.width = minWidth * ratio + "px";
- }
- }
- }
- }
+ }
+
}
);
Modified: incubator/xap/trunk/src/xap/widgets/dojo/VerticalPanel.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/widgets/dojo/VerticalPanel.js?view=diff&rev=485516&r1=485515&r2=485516
==============================================================================
--- incubator/xap/trunk/src/xap/widgets/dojo/VerticalPanel.js (original)
+++ incubator/xap/trunk/src/xap/widgets/dojo/VerticalPanel.js Sun Dec 10 22:00:26 2006
@@ -71,7 +71,6 @@
this.setAlign(this.align);
- this.flex();
this.setPack("start");
},
@@ -82,8 +81,6 @@
var containerRow = child.domNode.parentNode.parentNode;
xap.widgets.dojo.VerticalPanel.superclass.removeChild.call(this,child);
containerRow.parentNode.removeChild(containerRow);
-
- this.flex();
},
setAlign: function(align){
@@ -136,36 +133,6 @@
show: function() {
this.isHidden = false;
- this.flex();
- },
-
- flex: function() {
- var children = this.children;
-
- var maxFlex = -1;
- var minFlex = 999999;
- var minHeight = 999999;
- for (var i = 0; i < children.length; i++) {
- if (!children[i].domNode.flex) {
- children[i].domNode.flex = 1;
- }
-
- var flexInt = parseInt(children[i].domNode.flex);
-
- maxFlex = Math.max(flexInt, maxFlex);
- minFlex = Math.min(flexInt, minFlex);
-
- minHeight = Math.min(minHeight, parseInt(children[i].domNode.offsetHeight));
- }
-
- if (maxFlex != minFlex) {
- for (var i = 0; i < children.length; i++) {
- if (children[i].domNode.style.height) {
- var ratio = parseInt(children[i].domNode.flex) / minFlex;
- children[i].domNode.style.height = minHeight * ratio + "px";
- }
- }
- }
}
}
);