Author: ornicar2
Date: 2010-02-11 02:01:34 +0100 (Thu, 11 Feb 2010)
New Revision: 27875
Added:
plugins/dmMediaUploadifyerPlugin/trunk/config/dm/
plugins/dmMediaUploadifyerPlugin/trunk/config/dm/assets.yml
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/lib/dmMediaUploadifyerConfig.class.php
plugins/dmMediaUploadifyerPlugin/trunk/lib/widget/sfWidgetFormDmUploadify.class.php
plugins/dmMediaUploadifyerPlugin/trunk/modules/dmMediaLibrary/actions/actions.class.php
plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
Log:
[Diem][dmMediaUploadifyerPlugin]
- made action use ->renderAsync
- added assets configuration
- fixed possible issues when using without a virtual host (although it's always
recommended to use one)
Added: plugins/dmMediaUploadifyerPlugin/trunk/config/dm/assets.yml
===================================================================
--- plugins/dmMediaUploadifyerPlugin/trunk/config/dm/assets.yml
(rev 0)
+++ plugins/dmMediaUploadifyerPlugin/trunk/config/dm/assets.yml 2010-02-11
01:01:34 UTC (rev 27875)
@@ -0,0 +1,14 @@
+js:
+
+ dmMediaUploadifyerPlugin:
+
+ adminCtrl: dmAdminMediaUploadifyCtrl
+ swfobject: swfobject
+ sfWidget: sfWidgetFormDmUploadify
+ uploadify: jquery.uploadify.v2.1.0.min
+
+css:
+
+ dmMediaUploadifyerPlugin:
+
+ uploadify: uploadify
\ No newline at end of file
Property changes on: plugins/dmMediaUploadifyerPlugin/trunk/config/dm/assets.yml
___________________________________________________________________
Added: svn:executable
+ *
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/lib/dmMediaUploadifyerConfig.class.php
===================================================================
---
plugins/dmMediaUploadifyerPlugin/trunk/lib/dmMediaUploadifyerConfig.class.php
2010-02-11 00:21:29 UTC (rev 27874)
+++
plugins/dmMediaUploadifyerPlugin/trunk/lib/dmMediaUploadifyerConfig.class.php
2010-02-11 01:01:34 UTC (rev 27875)
@@ -13,7 +13,7 @@
->set('.new_multiple_file.uploadify_dialog_me.s16.s16_file_add')
)->end();
-
dmContext::getInstance()->getResponse()->addJavascript('/dmMediaUploadifyerPlugin/js/dmAdminMediaUploadifyCtrl.js');
+
dmContext::getInstance()->getResponse()->addJavascript('dmMediaUploadifyerPlugin.adminCtrl');
}
}
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/lib/widget/sfWidgetFormDmUploadify.class.php
===================================================================
---
plugins/dmMediaUploadifyerPlugin/trunk/lib/widget/sfWidgetFormDmUploadify.class.php
2010-02-11 00:21:29 UTC (rev 27874)
+++
plugins/dmMediaUploadifyerPlugin/trunk/lib/widget/sfWidgetFormDmUploadify.class.php
2010-02-11 01:01:34 UTC (rev 27875)
@@ -32,7 +32,7 @@
protected function configure($options = array(), $attributes = array())
{
$this->addOption('upload_route', null); // will default to the form upload
action through jQuery traversing
- $this->addOption('uploadify_css',
'/dmMediaUploadifyerPlugin/css/uploadify.css');
+ $this->addOption('uploadify_css', 'dmMediaUploadifyerPlugin.uploadify');
$this->addOption('add_sessionid', false);
}
@@ -86,10 +86,9 @@
public function getJavascripts()
{
return array(
- '/dmMediaUploadifyerPlugin/js/swfobject.js',
- '/dmMediaUploadifyerPlugin/js/jquery.uploadify.v2.1.0.min.js',
- '/dmMediaUploadifyerPlugin/js/sfWidgetFormDmUploadify.js',
- $this->getOption('add_sessionid') ?
'/dm/core/lib/metadata/jquery.metadata.min.js' : null
+ 'dmMediaUploadifyerPlugin.swfobject',
+ 'dmMediaUploadifyerPlugin.uploadify',
+ 'dmMediaUploadifyerPlugin.sfWidget'
);
}
}
\ No newline at end of file
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/modules/dmMediaLibrary/actions/actions.class.php
===================================================================
---
plugins/dmMediaUploadifyerPlugin/trunk/modules/dmMediaLibrary/actions/actions.class.php
2010-02-11 00:21:29 UTC (rev 27874)
+++
plugins/dmMediaUploadifyerPlugin/trunk/modules/dmMediaLibrary/actions/actions.class.php
2010-02-11 01:01:34 UTC (rev 27875)
@@ -37,14 +37,11 @@
$uploadify_widget = new sfWidgetFormDmUploadify();
- return $this->renderText(
- $form->render('.dm_form.list.little action="'.$action.'"') .
- $this->getHelper()->tag('div.dm_encoded_assets.none', json_encode(array(
- 'css' => $uploadify_widget->getStylesheets(),
- 'js' => $uploadify_widget->getJavascripts(),
- ))) . '<script type="text/javascript">__uploadify_widget_init()</script>'
-
- );
+ return $this->renderAsync(array(
+ 'html' => $form->render('.dm_form.list.little action="'.$action.'"'),
+ 'css' => $uploadify_widget->getStylesheets(),
+ 'js' => $uploadify_widget->getJavascripts()
+ ));
}
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
===================================================================
--- plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
2010-02-11 00:21:29 UTC (rev 27874)
+++ plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
2010-02-11 01:01:34 UTC (rev 27875)
@@ -17,5 +17,4 @@
return false;
});
-
})(jQuery);
\ No newline at end of file
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
===================================================================
--- plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
2010-02-11 00:21:29 UTC (rev 27874)
+++ plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
2010-02-11 01:01:34 UTC (rev 27875)
@@ -25,11 +25,10 @@
})
));
-
$uploadified.uploadify({
- 'uploader' : '/dmMediaUploadifyerPlugin/swf/uploadify.swf',
+ 'uploader' :
dm_configuration.relative_url_root+'/dmMediaUploadifyerPlugin/swf/uploadify.swf',
'script' : $uploadified_form.attr('action'),
- 'cancelImg' : '/dmMediaUploadifyerPlugin/images/cancel.png',
+ 'cancelImg' :
dm_configuration.relative_url_root+'/dmMediaUploadifyerPlugin/images/cancel.png',
'queueID' : 'fileQueue',
'simUploadLimit' : 3,
'fileDataName' : $uploadified.attr('name'),
--
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.
