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 mt...@apache.org on 2006/07/05 02:09:35 UTC
svn commit: r419136 - in /incubator/xap/trunk/WebContent/examples/dojo:
dojoExample_0.html dojoExample_0.xal
Author: mturyn
Date: Tue Jul 4 19:09:34 2006
New Revision: 419136
URL: http://svn.apache.org/viewvc?rev=419136&view=rev
Log:
Altered to show the floating pane just added to {the bridged Dojo widget} set.
Modified:
incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html
incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.xal
Modified: incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html?rev=419136&r1=419135&r2=419136&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.html Tue Jul 4 19:09:34 2006
@@ -8,6 +8,15 @@
@import url(../../css/xapDefault.css);
-->
</style>
+
+ <!-- Keep dojo from trying to scan this whole page for dojoType'd tags: -->
+ <script type="text/javascript">
+ djConfig = {
+ parseWidgets: false
+ };
+ </script>
+
+
<script language="JavaScript" type="text/javascript" src="../../src/dojo/dojo.js"></script>
<script language="JavaScript" type="text/javascript" src="../../src/xap/util/Utils.js"></script>
<script language="JavaScript" type="text/javascript" src="../../src/xap/Xap.js"></script>
@@ -25,6 +34,8 @@
dojo.require("dojo.widget.*");
dojo.require("dojo.event.*");
dojo.require("dojo.widget.Button");
+ dojo.require("dojo.widget.FloatingPane");
+ //dojo.require("dojo.widget.LayoutPane");
</script>
@@ -38,6 +49,23 @@
<script language="JavaScript"
type="text/javascript"
src="dojoExample_0.js"></script>
+
+ <script language="JavaScript"
+ type="text/javascript"
+ src="../../../xap/src/xap/taghandling/AbstractTagImpl.js"></script>
+
+ <script language="JavaScript"
+ type="text/javascript"
+ src="../../../xap/src/xap/taghandling/PluginDocumentHandler.js"></script>
+
+
+ <script language="JavaScript"
+ type="text/javascript"
+ src="../../../xap/src/xap/bridges/dojo/DojoWidgetBridge.js"></script>
+
+ <script language="JavaScript"
+ type="text/javascript"
+ src="../../../xap/src/xap/bridges/dojo/DojoLayoutPaneBridge.js"></script>
</body>
Modified: incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.xal
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.xal?rev=419136&r1=419135&r2=419136&view=diff
==============================================================================
--- incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.xal (original)
+++ incubator/xap/trunk/WebContent/examples/dojo/dojoExample_0.xal Tue Jul 4 19:09:34 2006
@@ -9,33 +9,53 @@
id="button_0"
position="absolute"
backgroundColor="#00aaaa"
- />
- <button xmlns="http://www.dojotoolkit.org/"
- src="replaceButton.xm"
- text="Dojo"
- x="40px"
- y="24px"
- position="absolute"
- onClick="huh_1"
- width="60px"
- height="32px"
- color="#00aa00"
- />
- <button text="widgets" xmlns="http://www.dojotoolkit.org/"
- onClick="huh_2"
- x="100px"
- y="6px"
- position="absolute"
- width="30px"
- height="18px"
- color="#0000aa"
- />
+ />
+ <floatingPane
+ x="60px" y="20px"
+ width="300px" height="200px"
+ xmlns="http://www.dojotoolkit.org/"
+ backgroundColor="#FFAAFF"
+ layoutAlign="vertical"
+ color="#FFAAFF"
+ title="a floating pane, vertical alignment"
+ >
+
+ <button xmlns="http://www.dojotoolkit.org/"
+ src="replaceButton.xm"
+ text="Do-"
+ onClick="huh_1"
+ width="60px"
+ height="32px"
+ color="#00aa00"
+ />
+
+ <button xmlns="http://www.dojotoolkit.org/"
+ src="replaceButton.xm"
+ text="jo"
+ onClick="huh_1"
+ width="60px"
+ height="32px"
+ color="#00ff00"
+ />
+
+ </floatingPane>
+
+ <button text="widgets" xmlns="http://www.dojotoolkit.org/"
+ onClick="huh_2"
+ x="360px"
+ y="0px"
+ position="absolute"
+ width="30px"
+ height="18px"
+ color="#0000aa"
+ />
+
</xm:append>
<!-- Try out caption-changing: -->
<xm:set-attribute select="id('button_0')">
<attribute name="text" value="Three..."/>
- </xm:set-attribute>
+ </xm:set-attribute>
</xm:modifications>