From: <tho...@us...> - 2009-06-23 14:22:46
|
Revision: 9510 http://wonder.svn.sourceforge.net/wonder/?rev=9510&view=rev Author: thoepfner Date: 2009-06-23 13:53:17 +0000 (Tue, 23 Jun 2009) Log Message: ----------- WONDER-252 Remove the hardcoded "of" string in the progress summary of AjaxProgressBar http://issues.objectstyle.org/jira/browse/WONDER-252 Modified Paths: -------------- trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.api trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.wo/AjaxFileUpload.wod trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.api trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.html trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.wod trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxFileUpload.java trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxProgressBar.java Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.api =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.api 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.api 2009-06-23 13:53:17 UTC (rev 9510) @@ -26,5 +26,6 @@ <binding name="keepTempFile"/> <binding name="uploadLabel"/> <binding name="uploadFunctionName"/> + <binding name="progressOfText"/> </wo> </wodefinitions> Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.wo/AjaxFileUpload.wod =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.wo/AjaxFileUpload.wod 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxFileUpload.wo/AjaxFileUpload.wod 2009-06-23 13:53:17 UTC (rev 9510) @@ -69,6 +69,7 @@ cancelingText = cancelingText; startingText = startingText; refreshTime = ^refreshTime; + progressOfText = ^progressOfText; } Contents : WOComponentContent { Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.api =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.api 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.api 2009-06-23 13:53:17 UTC (rev 9510) @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <wodefinitions> <wo wocomponentcontent="false" class="AjaxProgressBar.java"> - <binding name = "id"/> - <binding name = "progressID"/> - <binding name = "progress"/> - <binding name = "startedFunction"/> - <binding name = "canceledFunction"/> - <binding name = "succeededFunction"/> - <binding name = "failedFunction"/> - <binding name = "finishedFunction"/> - <binding name = "cancelText"/> - <binding name = "startingText"/> - <binding name = "cancelingText"/> - <binding name = "finishedAction"/> - <binding name = "canceledAction"/> - <binding name = "succeededAction"/> - <binding name = "failedAction"/> - <binding name = "started"/> - <binding name = "allowCancel"/> - <binding name = "visibleBeforeStart"/> - <binding name = "visibleAfterDone"/> - <binding name = "refreshTime"/> - </wo> -</wodefinitions> \ No newline at end of file + <binding name="id"/> + <binding name="progressID"/> + <binding name="progress"/> + <binding name="startedFunction"/> + <binding name="canceledFunction"/> + <binding name="succeededFunction"/> + <binding name="failedFunction"/> + <binding name="finishedFunction"/> + <binding name="cancelText"/> + <binding name="startingText"/> + <binding name="cancelingText"/> + <binding name="finishedAction"/> + <binding name="canceledAction"/> + <binding name="succeededAction"/> + <binding name="failedAction"/> + <binding name="started"/> + <binding name="allowCancel"/> + <binding name="visibleBeforeStart"/> + <binding name="visibleAfterDone"/> + <binding name="refreshTime"/> + <binding name="progressOfText"/> + </wo> +</wodefinitions> Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.html =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.html 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.html 2009-06-23 13:53:17 UTC (rev 9510) @@ -27,7 +27,7 @@ </webobject> <webobject name = "ProgressStartedConditional"> <webobject name = "NotCanceledConditional"> - <webobject name = "Value" /> of <webobject name = "Maximum" /><webobject name = "HasStatusConditional">, <webobject name = "Status"/></webobject> + <webobject name = "Value" /> <webobject name="ProgressOfText"/> <webobject name = "Maximum" /><webobject name = "HasStatusConditional">, <webobject name = "Status"/></webobject> <webobject name = "AllowCancelConditional"> ( <webobject name = "CancelAction"><webobject name = "CancelText"/></webobject> ) </webobject> Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.wod =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.wod 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Components/AjaxProgressBar.wo/AjaxProgressBar.wod 2009-06-23 13:53:17 UTC (rev 9510) @@ -138,4 +138,8 @@ RefreshTime : WOString { value = refreshTime; +} + +ProgressOfText : WOString { + value = progressOfText; } \ No newline at end of file Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxFileUpload.java =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxFileUpload.java 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxFileUpload.java 2009-06-23 13:53:17 UTC (rev 9510) @@ -51,6 +51,7 @@ * @binding keepTempFile if true, don't delete the temp file that AjaxFileUpload creates * @binding uploadLabel the label to display on the Upload button ("Upload" by default) * @binding uploadFunctionName the upload button will instead be a function with the given name + * @binding progressOfText the text to display for the word "of" in the "[size] of [totalsize]" string during upload * * @author mschrag */ Modified: trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxProgressBar.java =================================================================== --- trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxProgressBar.java 2009-06-23 13:30:19 UTC (rev 9509) +++ trunk/Wonder/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxProgressBar.java 2009-06-23 13:53:17 UTC (rev 9510) @@ -27,6 +27,7 @@ * @binding cancelText the text to display for the cancel link * @binding cancelingText the text to display when the progress is being canceled * @binding startingText the text to display when the progress is starting + * @binding progressOfText the text to display for the word "of" in the "[size] of [totalsize]" string during upload * @binding finishedAction the action to fire when the progress finishes (cancel, failed, or succeeded) * @binding canceledAction the action to fire when the progress is canceled * @binding succeededAction the action to fire when the progress succeeded @@ -240,6 +241,14 @@ return cancelText; } + public String progressOfText() { + String progressOfText = (String) valueForBinding("progressOfText"); + if (progressOfText == null) { + progressOfText = "of"; + } + return progressOfText; + } + public String onChange() { return id() + "AjaxProgress.start()"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |