Author: jkuhnert
Date: Sun Aug 5 13:35:19 2007
New Revision: 562951
URL: http://svn.apache.org/viewvc?view=rev&rev=562951
Log:
Minor documentation / parameter tweaks.
Modified:
tapestry/tapestry4/trunk/src/site/xdoc/components/general/script.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/DefaultScriptSource.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/script/ScriptParser.java
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/general/script.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/general/script.xml?view=diff&rev=562951&r1=562950&r2=562951
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/general/script.xml
(original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/general/script.xml Sun
Aug 5 13:35:19 2007
@@ -60,7 +60,7 @@
<td>script</td>
<td>String</td>
<td>no</td>
- <td></td>
+ <td> </td>
<td>
The path of a resource (on the classpath)
containing the script. One of
either <code>script</code> or
<code>scriptAsset</code> must be specified.
@@ -74,7 +74,7 @@
</a>
</td>
<td>no</td>
- <td></td>
+ <td> </td>
<td>
A reference to a script as an
<a
href="../../apidocs/org/apache/tapestry/IAsset.html">
@@ -87,7 +87,7 @@
<td>symbols</td>
<td>java.util.Map</td>
<td>no</td>
- <td></td>
+ <td> </td>
<td>
The base set of symbols to be provided to the
<a
href="../../apidocs/org/apache/tapestry/IScript.html">
@@ -139,33 +139,34 @@
<p>
<strong>HTML Template</strong>
</p>
- <source xml:space="preserve">
-<body jwcid="@Body">
-<span jwcid="@Script" script="/com/mycorp/scripts/FormFocus.script"/>
-<form jwcid="@Form" listener="ognl:listener.formSubmit">
- <table cellpadding="4">
- <tr><td>Username:</td><td><input
jwcid="@TextField" value="ognl:visit.username" size="12"/></td>
- </tr>
- <tr><td>Password:</td><td><input
jwcid="@TextField" value="ognl:visit.password" hidden="ognl:true"
size="12"/></td>
- </tr>
- <tr align="right">
- <td colspan="2"><input type="submit" value="Login"/></td>
- </tr>
- </table>
-</form>
-</body>
- </source>
+
+ <source><![CDATA[<body jwcid="@Body">
+<span jwcid="@Script" script="/com/mycorp/scripts/FormFocus.script"/>
+<form jwcid="@Form" listener="ognl:listener.formSubmit">
+ <table cellpadding="4">
+ <tr><td>Username:</td><td><input jwcid="@TextField"
value="ognl:visit.username" size="12"/></td>
+ </tr>
+ <tr><td>Password:</td><td><input jwcid="@TextField"
value="ognl:visit.password" hidden="ognl:true" size="12"/></td>
+ </tr>
+ <tr align="right">
+ <td colspan="2"><input type="submit" value="Login"/></td>
+ </tr>
+ </table>
+</form>
+</body>]]></source>
<p>
<strong>Script File (FormFocus.script)</strong>
</p>
- <source xml:space="preserve">
-<script>
- <body>
-<![CDATA[
+<source><![CDATA[<!DOCTYPE script PUBLIC
+ "-//Apache Software Foundation//Tapestry Script Specification 3.0//EN"
+ "http://jakarta.apache.org/tapestry/dtd/Script_3_0.dtd";>
+ <script>
+ <body>
+<![CDATA[
function setFocus() {
if (document.forms[0]) {
- for (i = 0; i < document.forms[0].elements.length; i++) {
- if (document.forms[0].elements[i].type != "hidden" &&
+ for (i = 0; i < document.forms[0].elements.length; i++) {
+ if (document.forms[0].elements[i].type != "hidden" &&
document.forms[0].elements[i].disabled != true) {
document.forms[0].elements[i].focus();
@@ -174,13 +175,11 @@
}
}
}
-]]>
- </body>
- <initialization>
+ </body>
+ <initialization>
setFocus();
- </initialization>
-</script>
- </source>
+ </initialization>
+</script>]]></source>
<p>
This alternative FormFocus.script specifies the actual
input field to give the
focus to. The target input field is identified by an
informal parameter named
@@ -216,28 +215,30 @@
<p>
<strong>Script File (FormFocus.script)</strong>
</p>
- <source xml:space="preserve">
-<!--
+<source><![CDATA[<!DOCTYPE script PUBLIC
+ "-//Apache Software Foundation//Tapestry Script Specification 3.0//EN"
+ "http://jakarta.apache.org/tapestry/dtd/Script_3_0.dtd";>
+<!--
Selects the specified form input field on body load if the input type is not
"hidden" and the input field is not disabled.
Input symbols:
component: the component input field to give focus
--->
-
-<script>
-
-<input-symbol key="component"
class="org.apache.tapestry.form.AbstractFormComponent" required="yes"/>
+-->
-<let key="formObject">
+<script>
+
+<input-symbol key="component"
class="org.apache.tapestry.form.AbstractFormComponent" required="yes"/>
+
+<let key="formObject">
document.${component.form.name}
-</let>
+</let>
-<let key="componentObject">
+<let key="componentObject">
${formObject}.${component.name}
-</let>
+</let>
-<body>
+<body>
function setFocus() {
var inputField = ${componentObject};
@@ -249,15 +250,13 @@
window.alert('InputFocus.script cannot set focus on a hidden field');
}
}
-</body>
+</body>
-<initialization>
+<initialization>
setFocus();
-</initialization>
-
-</script>
- </source>
+</initialization>
+</script>]]></source>
</section>
</section>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.jwc?view=diff&rev=562951&r1=562950&r2=562951
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.jwc
Sun Aug 5 13:35:19 2007
@@ -25,13 +25,13 @@
<description>
Creates a modal Dialog.
</description>
-
- <parameter name="hidden" default-value="true" />
-
+
+ <parameter name="hidden" default-value="ognl:true" />
+
<parameter name="backgroundColor" default-value="literal:black" />
-
- <parameter name="opacity" default-value="0.4" />
-
+
+ <parameter name="opacity" default-value="0.4" />
+
<inject property="script" type="script" object="Dialog.script"/>
</component-specification>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/DefaultScriptSource.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/DefaultScriptSource.java?view=diff&rev=562951&r1=562950&r2=562951
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/DefaultScriptSource.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/DefaultScriptSource.java
Sun Aug 5 13:35:19 2007
@@ -80,8 +80,7 @@
private IScript parse(Resource resource)
{
- ScriptParser parser = new ScriptParser(_classResolver,
_expressionEvaluator,
- _valueConverter);
+ ScriptParser parser = new ScriptParser(_classResolver,
_expressionEvaluator, _valueConverter);
try
{
return parser.parse(resource);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/script/ScriptParser.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/script/ScriptParser.java?view=diff&rev=562951&r1=562950&r2=562951
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/script/ScriptParser.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/script/ScriptParser.java
Sun Aug 5 13:35:19 2007
@@ -49,7 +49,7 @@
* <code>initialization</code> element of the XML document) is used to add
* JavaScript that will be evaluated when the page finishes loading (i.e., from
* the HTML <body> element's onLoad event handler).
- *
+ *
* @author Howard Lewis Ship
*/
@@ -66,25 +66,24 @@
/** @since 4.1 */
public static final String SCRIPT_DTD_4_0_PUBLIC_ID = "-//Apache Software
Foundation//Tapestry Script Specification 4.0//EN";
-
+
private RuleDirectedParser _parser;
-
- public ScriptParser(ClassResolver resolver, ExpressionEvaluator evaluator,
- ValueConverter valueConverter)
+
+ public ScriptParser(ClassResolver resolver, ExpressionEvaluator evaluator,
ValueConverter valueConverter)
{
_parser = new RuleDirectedParser();
-
+
_parser.registerEntity(SCRIPT_DTD_1_0_PUBLIC_ID,
- "/org/apache/tapestry/script/Script_1_0.dtd");
+ "/org/apache/tapestry/script/Script_1_0.dtd");
_parser.registerEntity(SCRIPT_DTD_1_1_PUBLIC_ID,
- "/org/apache/tapestry/script/Script_1_1.dtd");
+ "/org/apache/tapestry/script/Script_1_1.dtd");
_parser.registerEntity(SCRIPT_DTD_1_2_PUBLIC_ID,
- "/org/apache/tapestry/script/Script_1_2.dtd");
+ "/org/apache/tapestry/script/Script_1_2.dtd");
_parser.registerEntity(SCRIPT_DTD_3_0_PUBLIC_ID,
- "/org/apache/tapestry/script/Script_3_0.dtd");
+ "/org/apache/tapestry/script/Script_3_0.dtd");
_parser.registerEntity(SCRIPT_DTD_4_0_PUBLIC_ID,
- "/org/apache/tapestry/script/Script_4_0.dtd");
-
+ "/org/apache/tapestry/script/Script_4_0.dtd");
+
_parser.addRule("script", new ScriptRule(evaluator, valueConverter));
_parser.addRule("let", new LetRule());
_parser.addRule("set", new SetRule());
@@ -96,7 +95,7 @@
_parser.addRule("if-not", new IfRule(false));
_parser.addRule("foreach", new ForeachRule());
_parser.addRule("unique", new UniqueRule());
-
+
// This will go away when the 1.1 and earler DTDs are retired.
_parser.addRule("insert", new InsertRule());
