issue #44 new fileuploader completely replaces the old one

1 files changed, 19 insertions, 40 deletions

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 5ba3b38be..b4f1c0322 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -69,7 +69,6 @@ var dw_mediamanager = {
         jQuery('#mediamanager__form_sort').find('input[type=submit]').hide();
         dw_mediamanager.image_diff();
         dw_mediamanager.init_ajax_uploader();
-        createUploader();
 
         // changing opened tab in the file list panel
         jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list)
@@ -427,7 +426,6 @@ var dw_mediamanager = {
                 dw_mediamanager.set_filelist_view(dw_mediamanager.view, false);
                 dw_mediamanager.image_diff();
                 dw_mediamanager.init_ajax_uploader();
-                createUploader();
             },
             'html'
         );
@@ -635,23 +633,27 @@ var dw_mediamanager = {
         });
     },
 
+    params_toarray: function (str) {
+        var vars = [], hash;
+        var hashes = str.split('&');
+        for(var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    },
+
     init_ajax_uploader: function () {
-        var $form = jQuery('#dw__upload');
-        if(!$form.length) return;
+        if (!jQuery('#mediamanager__uploader').length) return;
 
-        jQuery(document.createElement('img'))
-            .attr('src', DOKU_BASE+'lib/images/multiupload.png')
-            .attr('title', LANG.mu_btn)
-            .attr('alt', LANG.mu_btn)
-            .css('cursor', 'pointer')
-            .click(
-                function () {
-                    //$form.html('<div id="mediamanager__uploader"></div>');
-                    $form.hide();
-                    jQuery('#mediamanager__uploader').show();
-                }
-            )
-            .appendTo($form);
+        var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload';
+        params = dw_mediamanager.params_toarray(params);
+
+        var uploader = new qq.FileUploaderExtended({
+            element: document.getElementById('mediamanager__uploader'),
+            action: DOKU_BASE + 'lib/exe/ajax.php',
+            params: params
+        });
     },
 
     prepare_content: function ($content) {
@@ -934,29 +936,6 @@ function hasFlash(version){
     return ver >= version;
 }
 
-function getUrlVars(str) {
-    var vars = [], hash;
-    var hashes = str.split('&');
-    for(var i = 0; i < hashes.length; i++) {
-        hash = hashes[i].split('=');
-        vars[hash[0]] = hash[1];
-    }
-    return vars;
-}
-
-function createUploader(){
-    if (!jQuery('#dw__upload').length || !jQuery('#mediamanager__uploader').length) return;
-
-    var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload';
-    params = getUrlVars(params);
-
-    var uploader = new qq.FileUploaderExtended({
-        element: document.getElementById('mediamanager__uploader'),
-        action: DOKU_BASE + 'lib/exe/ajax.php',
-        params: params
-    });
-}
-
 jQuery(document).ready(function() {
     dw_mediamanager.update_resizable();
     dw_mediamanager.layout_width = jQuery("#mediamanager__layout").width();