diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-08-19 20:56:43 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-08-19 20:56:43 +0300 |
| commit | c472bad9de398442c30ec1410d07284f0db8b821 (patch) | |
| tree | 263c0f5e952007b82079cd0ef76111a22ab3b7a8 /lib/scripts | |
| parent | d06c626c5f4a79cb833facf40bff089af2fcaa18 (diff) | |
| download | dokuwiki-c472bad9de398442c30ec1410d07284f0db8b821.tar.gz dokuwiki-c472bad9de398442c30ec1410d07284f0db8b821.zip | |
issue #44 new uploader in the media popup
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/fileuploaderextended.js | 8 | ||||
| -rw-r--r-- | lib/scripts/media.js | 4 |
2 files changed, 9 insertions, 3 deletions
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(); }, /** |