Author: joshiausdemwald
Date: 2010-05-14 14:47:03 +0200 (Fri, 14 May 2010)
New Revision: 29464
Modified:
plugins/sfWidgetFormInputSWFUploadPlugin/lib/widget/sfWidgetFormInputSWFUpload.php
plugins/sfWidgetFormInputSWFUploadPlugin/package.xml
plugins/sfWidgetFormInputSWFUploadPlugin/web/js/swfupload-widget-handler.js
Log:
Packaged v 1.0.0
Modified:
plugins/sfWidgetFormInputSWFUploadPlugin/lib/widget/sfWidgetFormInputSWFUpload.php
===================================================================
---
plugins/sfWidgetFormInputSWFUploadPlugin/lib/widget/sfWidgetFormInputSWFUpload.php
2010-05-14 12:15:49 UTC (rev 29463)
+++
plugins/sfWidgetFormInputSWFUploadPlugin/lib/widget/sfWidgetFormInputSWFUpload.php
2010-05-14 12:47:03 UTC (rev 29464)
@@ -54,6 +54,8 @@
{
parent::configure($options, $attributes);
+ $this->addOption('reset_on_dialog', true);
+
$this->addOption('custom_javascripts', array());
$this->addOption('prevent_form_submit', true);
@@ -170,6 +172,8 @@
$prevent_form_submit = $this->getOption('prevent_form_submit') ? 'true' :
'false';
+ $reset_on_dialog = $this->getOption('reset_on_dialog') ? 'true' : 'false';
+
$output .= <<<EOF
<div class="swfupload-buttontarget" id="{$button_id}">
<noscript>
@@ -195,7 +199,8 @@
widget_id: "{$widget_id}",
send_serialized_values: $send_serialized_values,
collapse_queue_on_init: $collapse_queue_on_init,
- prevent_form_submit: $prevent_form_submit
+ prevent_form_submit: $prevent_form_submit,
+ reset_on_dialog: $reset_on_dialog
},
use_query_string : false,
requeue_on_error : false,
Modified: plugins/sfWidgetFormInputSWFUploadPlugin/package.xml
===================================================================
--- plugins/sfWidgetFormInputSWFUploadPlugin/package.xml 2010-05-14
12:15:49 UTC (rev 29463)
+++ plugins/sfWidgetFormInputSWFUploadPlugin/package.xml 2010-05-14
12:47:03 UTC (rev 29464)
@@ -10,9 +10,9 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-01-03</date>
+ <date>2010-05-14</date>
<version>
- <release>0.9.10</release>
+ <release>1.0.0</release>
<api>0.9.0</api>
</version>
<stability>
@@ -20,7 +20,7 @@
<api>stable</api>
</stability>
<license uri="http://www.symfony-project.org/license";>MIT license</license>
- <notes>Initial release</notes>
+ <notes>First stable release</notes>
<contents>
<dir name="/">
@@ -62,8 +62,6 @@
<file role="data" name="web/css/swfupload.css" />
-
-
<file role="data" name="README" />
<file role="data" name="LICENSE" />
</dir>
@@ -71,7 +69,7 @@
<dependencies>
<required>
<php>
- <min>5.1.7</min>
+ <min>5.2.3</min>
</php>
<pearinstaller>
<min>1.4.1</min>
@@ -80,7 +78,8 @@
<name>symfony</name>
<channel>pear.symfony-project.com</channel>
<min>1.1.0</min>
- <max>1.4.0</max>
+ <max>2.0.0</max>
+ <exclude>2.0.0</exclude>
</package>
</required>
</dependencies>
@@ -89,6 +88,21 @@
<changelog>
<release>
<version>
+ <release>1.0.0</release>
+ <api>0.9.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license>MIT license</license>
+ <date>2010-05-14</date>
+ <notes>
+ * Fixed package.xml problem
+ </notes>
+ </release>
+ <release>
+ <version>
<release>0.9.10</release>
<api>0.9.0</api>
</version>
Modified:
plugins/sfWidgetFormInputSWFUploadPlugin/web/js/swfupload-widget-handler.js
===================================================================
--- plugins/sfWidgetFormInputSWFUploadPlugin/web/js/swfupload-widget-handler.js
2010-05-14 12:15:49 UTC (rev 29463)
+++ plugins/sfWidgetFormInputSWFUploadPlugin/web/js/swfupload-widget-handler.js
2010-05-14 12:47:03 UTC (rev 29464)
@@ -601,7 +601,10 @@
}, this);
swfu_widget.addObserver(swfu_widget.handlers, 'file_dialog_start', function()
{
- this.reset();
+ if(this._swfupload.customSettings.reset_on_dialog)
+ this.reset();
+ else
+ this.resetCompleted();
}, this);
swfu_widget.addObserver(swfu_widget.handlers, 'file_queued', function(event)
{
@@ -720,6 +723,25 @@
this.setMessage('Queue empty');
}
+swfu_widget.SWFUploadProgress.prototype.resetCompleted = function()
+{
+ var remaining_files = {};
+ for(var i in this._files)
+ {
+ if(this._files[i]._isOk)
+ {
+ this._files_queued --;
+ this._files[i].reset();
+ }
+ else
+ {
+ remaining_files[i] = this._files[i];
+ }
+ }
+ this._files = remaining_files;
+ delete remaining_files;
+}
+
swfu_widget.SWFUploadProgress.prototype.getFilesQueued = function()
{
return this._files_queued;
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
