Author: jkuhnert
Date: Wed Sep 12 06:20:15 2007
New Revision: 574949
URL: http://svn.apache.org/viewvc?rev=574949&view=rev
Log:
Applied patch from Martino Piccinato in TAPESTRY-1729 to add some additional
widget parameters to the dojo dialog component.
Modified:
tapestry/tapestry4/trunk/src/site/xdoc/components/dojo/dialog.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.jwc
Modified: tapestry/tapestry4/trunk/src/site/xdoc/components/dojo/dialog.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/src/site/xdoc/components/dojo/dialog.xml?rev=574949&r1=574948&r2=574949&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/src/site/xdoc/components/dojo/dialog.xml (original)
+++ tapestry/tapestry4/trunk/src/site/xdoc/components/dojo/dialog.xml Wed Sep
12 06:20:15 2007
@@ -95,6 +95,62 @@
valid values would range from <code>0.1 - 1</code>.
</td>
</tr>
+ <tr>
+ <td>followScroll</td>
+ <td>boolean</td>
+ <td>no</td>
+ <td>true</td>
+ <td>
+ Whether ot not the dialog should follow the scroll
remaining centered on the browser viewport.
+ </td>
+ </tr>
+ <tr>
+ <td>closeOnBackgroundClick</td>
+ <td>boolean</td>
+ <td>no</td>
+ <td>false</td>
+ <td>
+ Whether ot not the dialog should close when
clicking on the background.
+ </td>
+ </tr>
+ <tr>
+ <td>blockDuration</td>
+ <td>int</td>
+ <td>no</td>
+ <td>0</td>
+ <td>
+ Number of seconds for which the user cannot
dismiss the dialog.
+ </td>
+ </tr>
+ <tr>
+ <td>lifeTime</td>
+ <td>int</td>
+ <td>no</td>
+ <td>0</td>
+ <td>
+ The number of seconds the dialog will be displayed
before automatically disappearing.
+ </td>
+ </tr>
+ <tr>
+ <td>toggle</td>
+ <td>String</td>
+ <td>no</td>
+ <td>literal:fade</td>
+ <td>
+ The type of effect to be used on dialog show/hide.
Possible values are:
+ <code>litera:plain</code>,
<code>literal:wipe</code>, <code>literal:fade</code>,
<code>literal:explode</code>
+ </td>
+ </tr>
+ <tr>
+ <td>toggleDuration</td>
+ <td>int</td>
+ <td>no</td>
+ <td>150</td>
+ <td>
+ Controls how opaque the background is. This
parameter is given in the form of a percent, so
+ valid values would range from <code>0.1 - 1</code>.
+ </td>
+ </tr>
</table>
<p>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java?rev=574949&r1=574948&r2=574949&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
Wed Sep 12 06:20:15 2007
@@ -37,6 +37,18 @@
public abstract float getOpacity();
+ public abstract boolean getFollowScroll();
+
+ public abstract boolean getCloseOnBackgroundClick();
+
+ public abstract int getBlockDuration();
+
+ public abstract int getLifeTime();
+
+ public abstract String getToggle();
+
+ public abstract int getToggleDuration();
+
public void show()
{
setHidden(false);
@@ -69,6 +81,12 @@
JSONObject json = new JSONObject();
json.put("bgColor", getBackgroundColor());
json.put("bgOpacity", getOpacity());
+ json.put("followScroll", getFollowScroll());
+ json.put("closeOnBackgroundClick", getCloseOnBackgroundClick());
+ json.put("blockDuration", getBlockDuration());
+ json.put("lifeTime", getLifeTime());
+ json.put("toggle", getToggle());
+ json.put("toggleDuration", getToggleDuration());
Map parms = new HashMap();
parms.put("component", this);
@@ -77,7 +95,7 @@
getScript().execute(this, cycle,
TapestryUtils.getPageRenderSupport(cycle, this), parms);
}
}
-
+
/** injected. */
public abstract IScript getScript();
}
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?rev=574949&r1=574948&r2=574949&view=diff
==============================================================================
---
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
Wed Sep 12 06:20:15 2007
@@ -31,7 +31,19 @@
<parameter name="backgroundColor" default-value="literal:black" />
<parameter name="opacity" default-value="0.4" />
+
+ <parameter name="followScroll" default-value="true" />
+
+ <parameter name="closeOnBackgroundClick" default-value="false" />
+ <parameter name="blockDuration" default-value="0" />
+
+ <parameter name="lifeTime" default-value="0" />
+
+ <parameter name="toggle" default-value="literal:fade" />
+
+ <parameter name="toggleDuration" default-value="150" />
+
<inject property="script" type="script" object="Dialog.script"/>
</component-specification>
