From c472bad9de398442c30ec1410d07284f0db8b821 Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Fri, 19 Aug 2011 20:56:43 +0300
Subject: issue #44 new uploader in the media popup

---
 lib/scripts/fileuploaderextended.js | 8 +++++++-
 lib/scripts/media.js                | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index 36fc3ec63..f4a3219bb 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -167,7 +167,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
 
         if (result.success){
             qq.addClass(item, this._classes.success);
-            $link = '<a href="' + result.link + '">' + nameInput.value + '</a>';
+            $link = '<a href="' + result.link + '" name="h_:' + result.id + '" class="select">' + nameInput.value + '</a>';
             jQuery(fileElement).html($link);
 
         } else {
@@ -175,6 +175,12 @@ qq.extend(qq.FileUploaderExtended.prototype, {
             var fail = this._find(item, 'failedText');
             if (result.error) qq.setText(fail, result.error);
         }
+
+        if (document.getElementById('media__content') && !document.getElementById('mediamanager__done_form')) {
+            var button = '<form method="post" action="' + document.location +'" id="mediamanager__done_form"><div>';
+            button += '<input class="button" type="submit" value="' + LANG.media_done_btn + '"></div></form>'
+            jQuery('#mediamanager__uploader').append(button);
+        }
     }
 
 });
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 36dadf232..997321a65 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -43,7 +43,8 @@ var dw_mediamanager = {
                 .delegate('a.select', 'click', dw_mediamanager.select)
                 // Attach deletion confirmation dialog to the delete buttons
                 .delegate('#media__content a.btn_media_delete', 'click',
-                          dw_mediamanager.confirmattach);
+                          dw_mediamanager.confirmattach)
+                .delegate('#mediamanager__done_form', 'submit', dw_mediamanager.list);
 
         $tree.dw_tree({toggle_selector: 'img',
                        load_data: function (show_sublist, $clicky) {
@@ -670,7 +671,6 @@ var dw_mediamanager = {
     prepare_content: function ($content) {
         // hide syntax example
         $content.find('div.example:visible').hide();
-        dw_mediamanager.initFlashUpload();
     },
 
     /**
-- 
cgit v1.2.3