Author: Crafty_Shadow
Date: 2010-02-04 10:06:35 +0100 (Thu, 04 Feb 2010)
New Revision: 27547
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
Log:
[dmMediaUploadifyerPlugin] Cleaning up the js a bit
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
===================================================================
--- plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
2010-02-04 09:00:07 UTC (rev 27546)
+++ plugins/dmMediaUploadifyerPlugin/trunk/web/js/dmAdminMediaUploadifyCtrl.js
2010-02-04 09:06:35 UTC (rev 27547)
@@ -12,27 +12,6 @@
}).bind('dmAjaxResponse', function()
{
$dialog.prepare();
- __uploadify_widget_init();
- /*
- $("form", $dialog).dmAjaxForm({
- beforeSubmit: function()
- {
- $dialog.block();
- },
- success: function(data)
- {
- if (!data.match(/</))
- {
- $library.block();
- location.href = data;
- }
- else
- {
- $dialog.unblock().html(data).trigger('dmAjaxResponse');
- }
- }
- });
- */
});
return false;
Modified:
plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
===================================================================
--- plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
2010-02-04 09:00:07 UTC (rev 27546)
+++ plugins/dmMediaUploadifyerPlugin/trunk/web/js/sfWidgetFormDmUploadify.js
2010-02-04 09:06:35 UTC (rev 27547)
@@ -1,7 +1,6 @@
_set_up_uploadify_widget = function($uploadified)
{
$uploadified_form = $uploadified.parents('form');
-
var meta_data = $uploadified.metadata({type: 'html5'});
@@ -32,7 +31,7 @@
'script' : $uploadified_form.attr('action'),
'cancelImg' : '/dmMediaUploadifyerPlugin/images/cancel.png',
'queueID' : 'fileQueue',
-// 'simUploadLimit' : 3,
+ 'simUploadLimit' : 3,
'fileDataName' : $uploadified.attr('name'),
'auto' : false,
'multi' : true,
@@ -45,10 +44,8 @@
}
});
- console.log($uploadified.attr('name'));
-
+
$uploadified_form.bind('submit', function(e) {
- //console.log('Live submit');
e.preventDefault();
varrr = jQuery.extend({
@@ -57,7 +54,6 @@
},
__get_form_fields_as_object($uploadified_form)
);
- //console.log(varrr);
$uploadified.uploadifySettings('scriptData', jQuery.extend({
'uploadify_session_name' : meta_data.session_name,
@@ -71,7 +67,7 @@
return false;
});
-}
+};
__get_form_fields_as_object = function($form) {
fields = $form.serializeArray();
@@ -83,25 +79,19 @@
});
return result;
-}
+};
-__uploadify_widget_init = function()
-{
+
+__uploadify_widget_init = function() {
$uploadified = jQuery('input.uploadify_file_field');
$uploadified.each(function(){
_set_up_uploadify_widget($uploadified);
});
-
-}
+};
jQuery(document).ready(function() {
-
-// console.log('Loaded upladify stuff');
-
__uploadify_widget_init()
- //watch_events(jQuery('input.uploadify_file_field').parents('form'))
-
});
--
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.
