You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/11/05 21:54:39 UTC

svn commit: r471527 - in /tapestry/tapestry4/trunk: tapestry-examples/TimeTracker/src/context/ tapestry-framework/src/java/org/apache/tapestry/dojo/html/ tapestry-framework/src/java/org/apache/tapestry/engine/

Author: jkuhnert
Date: Sun Nov  5 12:54:38 2006
New Revision: 471527

URL: http://svn.apache.org/viewvc?view=rev&rev=471527
Log:
Removed un used methods, cleaned up script imports.

Modified:
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html?view=diff&rev=471527&r1=471526&r2=471527
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html Sun Nov  5 12:54:38 2006
@@ -53,17 +53,6 @@
     </fieldset>
 </form>
 
-<a jwcid="@DirectLink" listener="listener:showDialog" 
-	async="true" updateComponents="testDialog">Show Dialog</a><br/>
-
-<div jwcid="testDialog@Dialog" style="display:none" hidden="ognl:dlHidden" >
-	<p style="display:block;background:#ffffff;width:20em;">
-	This is content hidden in a Dialog.
-	
-	<a href="#" onClick="dojo.widget.byId('testDialog').hide();return false">Close</a>
-	</p>
-</div>
-
 <div jwcid="projectDescription@Any" >
 	<h2 jwcid="@If" condition="ognl:selectedProject" style="clear:left" >
 		<span jwcid="projName@InlineEditBox" value="ognl:selectedProject.name" />

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script?view=diff&rev=471527&r1=471526&r2=471527
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.script Sun Nov  5 12:54:38 2006
@@ -21,6 +21,11 @@
 
 <input-symbol key="component" required="yes" />
 <input-symbol key="props" required="yes" />
+    <body>
+    <unique>
+    dojo.require("tapestry.widget.Widget");
+    </unique>
+    </body>
     <initialization>
     tapestry.widget.synchronizeWidgetState("${component.clientId}", "Dialog", ${props}, ${component.destroy});
     

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.java?view=diff&rev=471527&r1=471526&r2=471527
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.java Sun Nov  5 12:54:38 2006
@@ -108,6 +108,10 @@
             throw new ApplicationRuntimeException(WidgetMessages.invalidTextMode(getMode()));
         }
         
+        if (cycle.isRewinding()) {
+            return;
+        }
+        
         JSONObject prop = new JSONObject();
         prop.put("widgetId", getClientId());
         prop.put("textValue", getValue());
@@ -131,7 +135,7 @@
     public String getUpdateUrl()
     {
         DirectServiceParameter dsp =
-            new DirectServiceParameter(this, new Object[]{});
+            new DirectServiceParameter(this);
         
         return getEngine().getLink(true, dsp).getURL();
     }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script?view=diff&rev=471527&r1=471526&r2=471527
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/InlineEditBox.script Sun Nov  5 12:54:38 2006
@@ -20,7 +20,12 @@
 <script>
 
 <input-symbol key="component" required="yes" />
-<input-symbol key="props" required="yes" />
+<input-symbol key="props" required="yes" />
+    <body>
+    <unique>
+    dojo.require("tapestry.widget.Widget");
+    </unique>
+    </body>
     <initialization>
     tapestry.widget.synchronizeWidgetState("${component.clientId}", "InlineEditBox", ${props}, ${component.destroy});
     

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java?view=diff&rev=471527&r1=471526&r2=471527
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java Sun Nov  5 12:54:38 2006
@@ -530,20 +530,6 @@
         forgetPage(name);
     }
 
-    /** @since 2.0.3 * */
-
-    public Object[] getServiceParameters()
-    {
-        return getListenerParameters();
-    }
-
-    /** @since 2.0.3 * */
-
-    public void setServiceParameters(Object[] serviceParameters)
-    {
-        setListenerParameters(serviceParameters);
-    }
-
     /** @since 4.0 */
     public Object[] getListenerParameters()
     {