From c15ae80365b3ed9e89908c991b424b5bdeeb4cef Mon Sep 17 00:00:00 2001 From: Philippe Date: Thu, 26 Apr 2012 10:07:15 +0200 Subject: [PATCH 1/5] Add check for admin-elements to allow frontend usage. --- web/js/sfWidgetFormDmUploadify.js | 34 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/web/js/sfWidgetFormDmUploadify.js b/web/js/sfWidgetFormDmUploadify.js index 580fc45..897d5d5 100644 --- a/web/js/sfWidgetFormDmUploadify.js +++ b/web/js/sfWidgetFormDmUploadify.js @@ -3,10 +3,12 @@ __set_up_uploadify_widget = function($uploadified) { var - $uploadified_form = $uploadified.parents('form'), - $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), - meta_data = $uploadified.metadata({type: 'html5'}), - link = $uploadified_form.attr('action').replace('+', '%2B'); + $uploadified_form = $uploadified.parents('form'), + $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), + meta_data = $uploadified.metadata({ + type: 'html5' + }), + link = $uploadified_form.attr('action').replace('+', '%2B'); $field_holder.children().remove('input, label'); @@ -16,7 +18,7 @@ 'for' : 'fileQueue', text : 'Upload Queue' }) - ).append( + ).append( $('
', { id : 'fileQueue', text: '', @@ -27,7 +29,7 @@ 'float' : 'right' } }) - )); + )); $uploadified.uploadify({ @@ -40,8 +42,12 @@ 'auto' : false, 'multi' : true, 'onAllComplete' : function(event, queueID, fileObj, response, data) { - $uploadified.closest('div.ui-dialog-content').dialog('close'); - $('#dm_admin_content').block(); + if($('div.ui-dialog-content').length){ + $uploadified.closest('div.ui-dialog-content').dialog('close'); + } + if ($('#dm_admin_content').length){ + $('#dm_admin_content').block(); + } window.location.reload(); }, 'onProgress' : function(event, queueID, fileObj, data) { @@ -57,11 +63,11 @@ $uploadified_form.bind('submit', function(e) { $uploadified.uploadifySettings('scriptData', $.extend({ - 'uploadify_session_name' : meta_data.session_name, - 'uploadify_session_id' : meta_data.session_id - }, - __get_form_fields_as_object($uploadified_form) - )); + 'uploadify_session_name' : meta_data.session_name, + 'uploadify_session_id' : meta_data.session_id + }, + __get_form_fields_as_object($uploadified_form) + )); $uploadified.uploadifyUpload(); @@ -85,7 +91,7 @@ $(document).ready(function() { - __set_up_uploadify_widget($('input.uploadify_file_field')); + __set_up_uploadify_widget($('input.uploadify_file_field')); }); From 734f55c6530d50deaef7f7d25ad1893d8f0dd66f Mon Sep 17 00:00:00 2001 From: Philippe Date: Thu, 26 Apr 2012 10:27:50 +0200 Subject: [PATCH 2/5] Add check for admin-elements to allow frontend usage. --- web/js/sfWidgetFormDmUploadify.js | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/web/js/sfWidgetFormDmUploadify.js b/web/js/sfWidgetFormDmUploadify.js index 897d5d5..1f3aa70 100644 --- a/web/js/sfWidgetFormDmUploadify.js +++ b/web/js/sfWidgetFormDmUploadify.js @@ -3,12 +3,10 @@ __set_up_uploadify_widget = function($uploadified) { var - $uploadified_form = $uploadified.parents('form'), - $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), - meta_data = $uploadified.metadata({ - type: 'html5' - }), - link = $uploadified_form.attr('action').replace('+', '%2B'); + $uploadified_form = $uploadified.parents('form'), + $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), + meta_data = $uploadified.metadata({type: 'html5'}), + link = $uploadified_form.attr('action').replace('+', '%2B'); $field_holder.children().remove('input, label'); @@ -18,7 +16,7 @@ 'for' : 'fileQueue', text : 'Upload Queue' }) - ).append( + ).append( $('
', { id : 'fileQueue', text: '', @@ -29,7 +27,7 @@ 'float' : 'right' } }) - )); + )); $uploadified.uploadify({ @@ -63,11 +61,11 @@ $uploadified_form.bind('submit', function(e) { $uploadified.uploadifySettings('scriptData', $.extend({ - 'uploadify_session_name' : meta_data.session_name, - 'uploadify_session_id' : meta_data.session_id - }, - __get_form_fields_as_object($uploadified_form) - )); + 'uploadify_session_name' : meta_data.session_name, + 'uploadify_session_id' : meta_data.session_id + }, + __get_form_fields_as_object($uploadified_form) + )); $uploadified.uploadifyUpload(); @@ -91,7 +89,7 @@ $(document).ready(function() { - __set_up_uploadify_widget($('input.uploadify_file_field')); + __set_up_uploadify_widget($('input.uploadify_file_field')); }); From 14d68137ac877c61e0b902a788614541a26c8ac9 Mon Sep 17 00:00:00 2001 From: Philippe Date: Thu, 26 Apr 2012 10:30:41 +0200 Subject: [PATCH 3/5] Revert "Add check for admin-elements to allow frontend usage." - due to formating changes by NetBeans This reverts commit 734f55c6530d50deaef7f7d25ad1893d8f0dd66f. --- web/js/sfWidgetFormDmUploadify.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/web/js/sfWidgetFormDmUploadify.js b/web/js/sfWidgetFormDmUploadify.js index 1f3aa70..897d5d5 100644 --- a/web/js/sfWidgetFormDmUploadify.js +++ b/web/js/sfWidgetFormDmUploadify.js @@ -3,10 +3,12 @@ __set_up_uploadify_widget = function($uploadified) { var - $uploadified_form = $uploadified.parents('form'), - $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), - meta_data = $uploadified.metadata({type: 'html5'}), - link = $uploadified_form.attr('action').replace('+', '%2B'); + $uploadified_form = $uploadified.parents('form'), + $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), + meta_data = $uploadified.metadata({ + type: 'html5' + }), + link = $uploadified_form.attr('action').replace('+', '%2B'); $field_holder.children().remove('input, label'); @@ -16,7 +18,7 @@ 'for' : 'fileQueue', text : 'Upload Queue' }) - ).append( + ).append( $('
', { id : 'fileQueue', text: '', @@ -27,7 +29,7 @@ 'float' : 'right' } }) - )); + )); $uploadified.uploadify({ @@ -61,11 +63,11 @@ $uploadified_form.bind('submit', function(e) { $uploadified.uploadifySettings('scriptData', $.extend({ - 'uploadify_session_name' : meta_data.session_name, - 'uploadify_session_id' : meta_data.session_id - }, - __get_form_fields_as_object($uploadified_form) - )); + 'uploadify_session_name' : meta_data.session_name, + 'uploadify_session_id' : meta_data.session_id + }, + __get_form_fields_as_object($uploadified_form) + )); $uploadified.uploadifyUpload(); @@ -89,7 +91,7 @@ $(document).ready(function() { - __set_up_uploadify_widget($('input.uploadify_file_field')); + __set_up_uploadify_widget($('input.uploadify_file_field')); }); From 6e85fafd3ec9dfa379b6dc88dd77b337b99863f1 Mon Sep 17 00:00:00 2001 From: Philippe Date: Thu, 26 Apr 2012 10:31:52 +0200 Subject: [PATCH 4/5] Revert "Add check for admin-elements to allow frontend usage." - due to Netbeans formating This reverts commit c15ae80365b3ed9e89908c991b424b5bdeeb4cef. --- web/js/sfWidgetFormDmUploadify.js | 34 +++++++++++++------------------ 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/web/js/sfWidgetFormDmUploadify.js b/web/js/sfWidgetFormDmUploadify.js index 897d5d5..580fc45 100644 --- a/web/js/sfWidgetFormDmUploadify.js +++ b/web/js/sfWidgetFormDmUploadify.js @@ -3,12 +3,10 @@ __set_up_uploadify_widget = function($uploadified) { var - $uploadified_form = $uploadified.parents('form'), - $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), - meta_data = $uploadified.metadata({ - type: 'html5' - }), - link = $uploadified_form.attr('action').replace('+', '%2B'); + $uploadified_form = $uploadified.parents('form'), + $field_holder = $uploadified.parent().clone().attr('id', 'a-new-and-unique-id'), + meta_data = $uploadified.metadata({type: 'html5'}), + link = $uploadified_form.attr('action').replace('+', '%2B'); $field_holder.children().remove('input, label'); @@ -18,7 +16,7 @@ 'for' : 'fileQueue', text : 'Upload Queue' }) - ).append( + ).append( $('
', { id : 'fileQueue', text: '', @@ -29,7 +27,7 @@ 'float' : 'right' } }) - )); + )); $uploadified.uploadify({ @@ -42,12 +40,8 @@ 'auto' : false, 'multi' : true, 'onAllComplete' : function(event, queueID, fileObj, response, data) { - if($('div.ui-dialog-content').length){ - $uploadified.closest('div.ui-dialog-content').dialog('close'); - } - if ($('#dm_admin_content').length){ - $('#dm_admin_content').block(); - } + $uploadified.closest('div.ui-dialog-content').dialog('close'); + $('#dm_admin_content').block(); window.location.reload(); }, 'onProgress' : function(event, queueID, fileObj, data) { @@ -63,11 +57,11 @@ $uploadified_form.bind('submit', function(e) { $uploadified.uploadifySettings('scriptData', $.extend({ - 'uploadify_session_name' : meta_data.session_name, - 'uploadify_session_id' : meta_data.session_id - }, - __get_form_fields_as_object($uploadified_form) - )); + 'uploadify_session_name' : meta_data.session_name, + 'uploadify_session_id' : meta_data.session_id + }, + __get_form_fields_as_object($uploadified_form) + )); $uploadified.uploadifyUpload(); @@ -91,7 +85,7 @@ $(document).ready(function() { - __set_up_uploadify_widget($('input.uploadify_file_field')); + __set_up_uploadify_widget($('input.uploadify_file_field')); }); From bb85423f954572d9668e2606eeeef8552e6daf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mang=C3=A9?= Date: Thu, 26 Apr 2012 11:35:45 +0300 Subject: [PATCH 5/5] Add check for admin-elements to allow frontend usage. --- web/js/sfWidgetFormDmUploadify.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web/js/sfWidgetFormDmUploadify.js b/web/js/sfWidgetFormDmUploadify.js index 580fc45..7cf9a0b 100644 --- a/web/js/sfWidgetFormDmUploadify.js +++ b/web/js/sfWidgetFormDmUploadify.js @@ -40,8 +40,12 @@ 'auto' : false, 'multi' : true, 'onAllComplete' : function(event, queueID, fileObj, response, data) { - $uploadified.closest('div.ui-dialog-content').dialog('close'); - $('#dm_admin_content').block(); + if ($uploadified.closest('div.ui-dialog-content').length){ + $uploadified.closest('div.ui-dialog-content').dialog('close'); + } + if ($('#dm_admin_content').length){ + $('#dm_admin_content').block(); + } window.location.reload(); }, 'onProgress' : function(event, queueID, fileObj, data) {