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/10/20 07:21:06 UTC
svn commit: r466020 - in /incubator/xap/trunk: WebContent/
WebContent/examples/widgets/ src/xap/bridges/dojo/ src/xap/taghandling/
src/xap/widgets/dojo/
Author: jmargaris
Date: Fri Oct 20 00:21:03 2006
New Revision: 466020
URL: http://svn.apache.org/viewvc?view=rev&rev=466020
Log:
while bunch of fixes, split pane now takes top / bottom /left
/ right, sizing works better, etc etc
Added:
incubator/xap/trunk/src/xap/bridges/dojo/SecondSplitChildBridge.js (with props)
incubator/xap/trunk/src/xap/bridges/dojo/SplitChildBridge.js (with props)
Modified:
incubator/xap/trunk/WebContent/XapConfig.xml
incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal
incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal
incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal
incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html
incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal
incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal
incubator/xap/trunk/src/xap/bridges/dojo/BorderPanelBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/FreePanelBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/HorizontalFlowPaneBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/HorizontalPanelBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/SplitPaneBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/TabPaneBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/VerticalPanelBridge.js
incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js
incubator/xap/trunk/src/xap/taghandling/plugin.xml
incubator/xap/trunk/src/xap/widgets/dojo/Window.js
Modified: incubator/xap/trunk/WebContent/XapConfig.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/XapConfig.xml?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/XapConfig.xml (original)
+++ incubator/xap/trunk/WebContent/XapConfig.xml Fri Oct 20 00:21:03 2006
@@ -1,6 +1,6 @@
<xap-configuration>
<!-- turn this on to enable debugging trace -->
- <log-configuration logging-enabled="false">
+ <log-configuration logging-enabled="true">
</log-configuration>
<plugins>
Modified: incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/complexExample.xal Fri Oct 20 00:21:03 2006
@@ -16,11 +16,16 @@
<xal:freePanel width="100%" height="100px" backgroundColor="red" borderPosition="north"/>
<xal:splitPane>
- <xal:freePanel backgroundColor="yellow"/>
- <xal:tabPane>
- <xal:tab text="Package Explorer"/>
- <xal:tab text="JUnit"/>
- </xal:tabPane>
+ <xal:top>
+ <xal:freePanel backgroundColor="yellow"/>
+ </xal:top>
+
+ <xal:bottom>
+ <xal:tabPane>
+ <xal:tab text="Package Explorer"/>
+ <xal:tab text="JUnit"/>
+ </xal:tabPane>
+ </xal:bottom>
</xal:splitPane>
<xal:freePanel width="100%" height="100px" backgroundColor="green" borderPosition="south"/>
Modified: incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/horizontalFlowPane.xal Fri Oct 20 00:21:03 2006
@@ -13,18 +13,22 @@
<xm:append select="/xal">
<xal:splitPane width="400px" height="400px">
+ <xal:top>
<xal:horizontalFlowPane width="200px" height="200px" backgroundColor="black"
id="testComponent">
<xal:freePanel width="100px" height="100px" backgroundColor="red"/>
<xal:freePanel width="100px" height="100px" x="100px" backgroundColor="green"/>
<xal:freePanel y="100px" width="100px" height="100px" backgroundColor="blue"/>
</xal:horizontalFlowPane>
+ </xal:top>
+ <xal:bottom>
<xal:horizontalFlowPane width="200px" height="200px" backgroundColor="black">
<xal:freePanel width="100px" height="100px" backgroundColor="red"/>
<xal:freePanel width="100px" height="100px" x="100px" backgroundColor="green"/>
<xal:freePanel y="100px" width="100px" height="100px" backgroundColor="blue"/>
</xal:horizontalFlowPane>
+ </xal:bottom>
</xal:splitPane>
Modified: incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/splitPane.xal Fri Oct 20 00:21:03 2006
@@ -14,8 +14,12 @@
<xal:splitPane width="200px" height="100px"
id="testComponent" >
- <xal:button text="Left"/>
- <xal:button text="right"/>
+ <xal:top>
+ <xal:button text="Left"/>
+ </xal:top>
+ <xal:bottom>
+ <xal:button text="Right"/>
+ </xal:bottom>
</xal:splitPane>
Modified: incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.html Fri Oct 20 00:21:03 2006
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -23,7 +22,7 @@
</head>
- <body onload="Xap.createAllPredefinedSessions();">
- <div xapId="ButtonExample" xapSrc="splitPaneExample.xal" xapToolkit="dojo" xapContext="../../"></div>
+ <body style="width:100%;height:100%" onload="Xap.createAllPredefinedSessions();">
+ <div style="width:100%; height:100%" xapId="ButtonExample" xapSrc="splitPaneExample.xal" xapToolkit="dojo" xapContext="../../"></div>
</body>
</html>
Modified: incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/splitPaneExample.xal Fri Oct 20 00:21:03 2006
@@ -12,16 +12,23 @@
<xm:modifications xmlns:xm="http://www.openxal.org/xmodify">
<xm:append select="/xal">
- <xal:splitPane width="100%" height="100%" orientation="horizontal">
- <xal:button text="Left"/>
+ <xal:splitPane width="100%" height="100%" orientation="horizontal"
+ borderWidth="2px" borderStyle="solid" borderColor="red">
+ <xal:top>
+ <xal:button text="Left"/>
+ </xal:top>
+
+ <xal:bottom>
<xal:splitPane width="100%" height="100%" orientation="vertical">
- <xal:button text="Top"/>
- <xal:button text="Bottom"/>
+ <xal:top>
+ <xal:button text="Top"/>
+ </xal:top>
+ <xal:bottom>
+ <xal:button text="Bottom"/>
+ </xal:bottom>
</xal:splitPane>
+ </xal:bottom>
</xal:splitPane>
-
-
-
</xm:append>
</xm:modifications>
Modified: incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal (original)
+++ incubator/xap/trunk/WebContent/examples/widgets/verticalPanelExample.xal Fri Oct 20 00:21:03 2006
@@ -16,18 +16,18 @@
<xal:verticalPanel width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black">
- <xal:freePanel width="100" height="20" backgroundColor="red"/>
- <xal:freePanel width="100" height="20" backgroundColor="green"/>
- <xal:freePanel width="100" height="20" backgroundColor="blue"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="red"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="green"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
</xal:verticalPanel >
<xal:verticalPanel x="250px" width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black" pack="end">
- <xal:freePanel width="100" height="20" backgroundColor="red"/>
- <xal:freePanel width="100" height="20" backgroundColor="green"/>
- <xal:freePanel width="100" height="20" backgroundColor="blue"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="red"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="green"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
</xal:verticalPanel >
@@ -35,9 +35,9 @@
<xal:verticalPanel y="250px" width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black" align="stretch">
- <xal:freePanel width="100" height="20" backgroundColor="red"/>
- <xal:freePanel width="100" height="20" backgroundColor="green"/>
- <xal:freePanel width="100" height="20" backgroundColor="blue"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="red"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="green"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
</xal:verticalPanel >
@@ -45,9 +45,9 @@
<xal:verticalPanel x="250px" y="250px" width="200px" height="200px" borderWidth="1" borderStyle="solid" borderColor="black" align="end">
- <xal:freePanel width="100" height="20" backgroundColor="red"/>
- <xal:freePanel width="100" height="20" backgroundColor="green"/>
- <xal:freePanel width="100" height="20" backgroundColor="blue"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="red"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="green"/>
+ <xal:freePanel width="100px" height="20px" backgroundColor="blue"/>
</xal:verticalPanel >
Modified: incubator/xap/trunk/src/xap/bridges/dojo/BorderPanelBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/BorderPanelBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/BorderPanelBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/BorderPanelBridge.js Fri Oct 20 00:21:03 2006
@@ -51,18 +51,6 @@
}
-/** XML attribute set method for "width" */
-xap.bridges.dojo.BorderPanelBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.BorderPanelBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
xap.bridges.dojo.BorderPanelBridge.prototype.addChild = function( childHandler ){
var element = childHandler.getElement();
var borderPosition = element.getAttribute("borderPosition");
Modified: incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/DojoWidgetBridge.js Fri Oct 20 00:21:03 2006
@@ -291,6 +291,25 @@
return [];
}
+/** XML attribute set method for "width" */
+xap.bridges.dojo.DojoWidgetBridge.prototype.setWidthAttribute = function(value){
+ //IMPORTANT should we use some method that sets the height
+ //INCLUDING the padding/border??Or use dojo widget
+ //resizeTo()?
+ this.getRootDomNode().style.width = value ;
+ if (this.getPeer().onResized){
+ this.getPeer().onResized();
+ }
+}
+
+/** XML attribute set method for "height" */
+xap.bridges.dojo.DojoWidgetBridge.prototype.setHeightAttribute = function(value){
+ this.getRootDomNode().style.height = value ;
+ if (this.getPeer().onResized){
+ this.getPeer().onResized();
+ }
+}
+
xap.bridges.dojo.DojoWidgetBridge.prototype.getNodeForChildren = function(){
if (this.getPeer().isContainer){
Modified: incubator/xap/trunk/src/xap/bridges/dojo/FreePanelBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/FreePanelBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/FreePanelBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/FreePanelBridge.js Fri Oct 20 00:21:03 2006
@@ -50,21 +50,6 @@
return "FreePanel" ;
}
-
-/** XML attribute set method for "width" */
-xap.bridges.dojo.FreePanelBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.FreePanelBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
-
-
/**
*
Modified: incubator/xap/trunk/src/xap/bridges/dojo/HorizontalFlowPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/HorizontalFlowPaneBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/HorizontalFlowPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/HorizontalFlowPaneBridge.js Fri Oct 20 00:21:03 2006
@@ -49,21 +49,6 @@
return "HorizontalFlowPane" ;
}
-
-/** XML attribute set method for "width" */
-xap.bridges.dojo.HorizontalFlowPaneBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.HorizontalFlowPaneBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
-
-
/**
*
Modified: incubator/xap/trunk/src/xap/bridges/dojo/HorizontalPanelBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/HorizontalPanelBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/HorizontalPanelBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/HorizontalPanelBridge.js Fri Oct 20 00:21:03 2006
@@ -51,20 +51,6 @@
}
-/** XML attribute set method for "width" */
-xap.bridges.dojo.HorizontalPanelBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.HorizontalPanelBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
-
-
/**
*
Added: incubator/xap/trunk/src/xap/bridges/dojo/SecondSplitChildBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/SecondSplitChildBridge.js?view=auto&rev=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/SecondSplitChildBridge.js (added)
+++ incubator/xap/trunk/src/xap/bridges/dojo/SecondSplitChildBridge.js Fri Oct 20 00:21:03 2006
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+
+/*
+ *
+ *
+ * a holder for the child of a splitter, a splitter should
+ * have two childen, top/left and right/bottom.
+ *
+ * This is a bit weird in that it isn't really a component itself.
+ * When you add to this you are actually adding to the underyling split
+ * pane
+ */
+
+Xap.provide("xap.bridges.dojo.SecondSplitChildBridge");
+
+Xap.require("xap.bridges.dojo.SecondChildBridge");
+
+
+
+ /**
+ * @fileoverview
+ *
+ * A bridge class with dojo toolkit button peer.
+ */
+
+xap.bridges.dojo.SecondSplitChildBridge= function() {
+ xap.bridges.dojo.SplitChildBridge.call(this);
+}
+
+
+Xap.setupClassAsSubclassOf(
+ "xap.bridges.dojo.SecondSplitChildBridge",
+ "xap.bridges.dojo.SplitChildBridge"
+);
Propchange: incubator/xap/trunk/src/xap/bridges/dojo/SecondSplitChildBridge.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/xap/trunk/src/xap/bridges/dojo/SplitChildBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/SplitChildBridge.js?view=auto&rev=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/SplitChildBridge.js (added)
+++ incubator/xap/trunk/src/xap/bridges/dojo/SplitChildBridge.js Fri Oct 20 00:21:03 2006
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+
+/*
+ *
+ *
+ * a holder for the child of a splitter, a splitter should
+ * have two childen, top/left and right/bottom.
+ *
+ * This is a bit weird in that it isn't really a component itself.
+ * When you add to this you are actually adding to the underyling split
+ * pane
+ */
+
+Xap.provide("xap.bridges.dojo.SplitChildBridge");
+
+Xap.require("xap.bridges.basic.AbstractWidgetBridge");
+
+
+
+ /**
+ * @fileoverview
+ *
+ * A bridge class with dojo toolkit button peer.
+ */
+
+xap.bridges.dojo.SplitChildBridge= function() {
+ xap.bridges.basic.AbstractWidgetBridge.call(this);
+}
+
+
+Xap.setupClassAsSubclassOf(
+ "xap.bridges.dojo.SplitChildBridge",
+ "xap.bridges.basic.AbstractWidgetBridge"
+);
+
+
+
+/**
+ *
+ *
+ * Attribute definitions
+ *
+ */
+
+
+/**
+ * No new dynamic attributes
+ */
+xap.bridges.dojo.SplitChildBridge.prototype.getAllowedAttributes = function(){
+ return [];
+}
+
+xap.bridges.dojo.SplitChildBridge.prototype.obtainPeer = function(){
+
+}
+
+xap.bridges.dojo.SplitChildBridge.prototype.getRootDomNode = function(){
+ return this._proxyHandler?this._proxyHandler.getRootDomNode():null;
+}
+
+
+
+//IMPORTANT be more strict about multiple children
+//and handle remove properly!!!
+xap.bridges.dojo.SplitChildBridge.prototype.addChild = function(childHandler, index){
+ //if we have a parent split pane already then add to it
+ //if we don't have a parent split pane yet then when we add to the parent
+ //it should take care of this
+ this.setPeer(childHandler.getPeer());
+ this._proxyHandler = childHandler;
+ if (this._splitPaneBridge){
+ this._splitPaneBridge.addChild(this,0);
+ }
+}
+
+xap.bridges.dojo.SplitChildBridge.prototype.removeChild = function(childHandler){
+ if (this._splitPaneBridge){
+ //this should work fine as our getPeer() and getRootDomNode()
+ //should proxy to the handler one.
+ this._splitPaneBridge.removeChild(this,0);
+ }
+ this.setPeer(null);
+ this._proxyHandler = null;
+}
+
+
Propchange: incubator/xap/trunk/src/xap/bridges/dojo/SplitChildBridge.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/xap/trunk/src/xap/bridges/dojo/SplitPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/SplitPaneBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/SplitPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/SplitPaneBridge.js Fri Oct 20 00:21:03 2006
@@ -21,12 +21,12 @@
* A bridge class that controls a dojo SplitPane peer.
*/
-// This:
Xap.provide("xap.bridges.dojo.SplitPaneBridge");
Xap.require("xap.bridges.dojo.DojoWidgetBridge");
Xap.require("dojo.widget.SplitContainer");
-
+Xap.require('xap.bridges.dojo.SplitChildBridge');
+Xap.require('xap.bridges.dojo.SecondSplitChildBridge');
/**
@@ -62,20 +62,6 @@
return mappings;
}
-/** XML attribute set method for "width" */
-xap.bridges.dojo.SplitPaneBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.SplitPaneBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
-
-
/**
*
*
@@ -90,5 +76,22 @@
xap.bridges.dojo.SplitPaneBridge.prototype.getNewAllowedAttributes = function(){
return [];
}
+
+xap.bridges.dojo.SplitPaneBridge.prototype.addChild = function(childHandler, index){
+
+ var insertIndex = -1;
+ if (childHandler instanceof xap.bridges.dojo.SecondSplitChildBridge){
+ insertIndex = this.getPeer().children.length;
+ childHandler._splitPaneBridge = this;
+ }
+ else if (childHandler instanceof xap.bridges.dojo.SplitChildBridge){
+ insertIndex = 0;
+ childHandler._splitPaneBridge = this;
+ }
+ if (insertIndex>-1 && childHandler.getPeer()){
+ this.superclass.addChild.call(this,childHandler,insertIndex);
+ }
+
+}
Modified: incubator/xap/trunk/src/xap/bridges/dojo/TabPaneBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/TabPaneBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/TabPaneBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/TabPaneBridge.js Fri Oct 20 00:21:03 2006
@@ -65,19 +65,6 @@
-/** XML attribute set method for "width" */
-xap.bridges.dojo.TabPaneBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.TabPaneBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
-
/**
*
Modified: incubator/xap/trunk/src/xap/bridges/dojo/VerticalPanelBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/VerticalPanelBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/VerticalPanelBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/VerticalPanelBridge.js Fri Oct 20 00:21:03 2006
@@ -50,21 +50,6 @@
return "VerticalPanel" ;
}
-
-/** XML attribute set method for "width" */
-xap.bridges.dojo.VerticalPanelBridge.prototype.setWidthAttribute = function(value){
- this.getRootDomNode().style.width = value ;
- this.getPeer().onResized();
-}
-
-/** XML attribute set method for "height" */
-xap.bridges.dojo.VerticalPanelBridge.prototype.setHeightAttribute = function(value){
- this.getRootDomNode().style.height = value ;
- this.getPeer().onResized();
-}
-
-
-
/**
*
Modified: incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js (original)
+++ incubator/xap/trunk/src/xap/bridges/dojo/WindowBridge.js Fri Oct 20 00:21:03 2006
@@ -181,5 +181,19 @@
evt.preventDefault();
}
}
+
+/** XML attribute set method for "width" */
+xap.bridges.dojo.WindowBridge.prototype.setWidthAttribute = function(value){
+ this.getRootDomNode().style.width = value ;
+ this.getPeer().resizeWindow();
+
+
+}
+
+/** XML attribute set method for "height" */
+xap.bridges.dojo.WindowBridge.prototype.setHeightAttribute = function(value){
+ this.getRootDomNode().style.height = value ;
+ this.getPeer().resizeWindow();
+}
Modified: incubator/xap/trunk/src/xap/taghandling/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/taghandling/plugin.xml?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/taghandling/plugin.xml (original)
+++ incubator/xap/trunk/src/xap/taghandling/plugin.xml Fri Oct 20 00:21:03 2006
@@ -59,8 +59,16 @@
<mapping class="xap.bridges.xap.ListItemBridge" name="listItem"/>
- <mapping class="xap.bridges.dojo.TableBridge" name="table"/>
+
<mapping class="xap.bridges.dojo.SplitPaneBridge" name="splitPane"/>
+ <mapping class="xap.bridges.dojo.SplitChildBridge" name="top"/>
+ <mapping class="xap.bridges.dojo.SplitChildBridge" name="left"/>
+
+ <mapping class="xap.bridges.dojo.SecondSplitChildBridge" name="bottom"/>
+
+ <mapping class="xap.bridges.dojo.SecondSplitChildBridge" name="right"/>
+
+ <mapping class="xap.bridges.dojo.TableBridge" name="table"/>
<mapping class="xap.bridges.dojo.TabPaneBridge" name="tabPane"/>
<mapping class="xap.bridges.dojo.TabBridge" name="tab"/>
<mapping class="xap.bridges.dojo.FreePanelBridge" name="freePanel"/>
Modified: incubator/xap/trunk/src/xap/widgets/dojo/Window.js
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/src/xap/widgets/dojo/Window.js?view=diff&rev=466020&r1=466019&r2=466020
==============================================================================
--- incubator/xap/trunk/src/xap/widgets/dojo/Window.js (original)
+++ incubator/xap/trunk/src/xap/widgets/dojo/Window.js Fri Oct 20 00:21:03 2006
@@ -97,6 +97,17 @@
}
xap.widgets.dojo.Window.superclass.closeWindow.call(this,evt);
+ },
+
+ resizeWindow: function(){
+
+ //logic copied from floating pane
+ dojo.html.layout(this.domNode,
+ [
+ {domNode: this.titleBar, layoutAlign: "top"},
+ {domNode: this.resizeBar, layoutAlign: "bottom"},
+ {domNode: this.containerNode, layoutAlign: "client"}
+ ] );
}
});