diff options
| author | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-20 14:30:57 +0100 |
|---|---|---|
| committer | Hakan Sandell <sandell.hakan@gmail.com> | 2010-11-20 14:30:57 +0100 |
| commit | 8f0a521756228d15469d2a712fa1010b64a1d53a (patch) | |
| tree | 38ce28a99433403fa18d2bce871abc7290c8be54 /lib/scripts | |
| parent | ba9418bca378a6759305e3b388926df4f5a0af9c (diff) | |
| parent | 85dcda20ffd82becbe69a7ca5d99e4b6fd99c9ea (diff) | |
| download | rpg-8f0a521756228d15469d2a712fa1010b64a1d53a.tar.gz rpg-8f0a521756228d15469d2a712fa1010b64a1d53a.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/media.js | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 5b9372b68..b90f7047b 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -215,14 +215,6 @@ var media_manager = { return false; } - // FIXME these lines deactivate the media options dialog and restore - // the old behavior according to FS#2047 - //opener.insertTags('wiki__text','{{'+id+'|','}}',''); - //if(!media_manager.keepopen) window.close(); - //opener.focus(); - //return false; - - media_manager.ext = false; var dot = id.lastIndexOf("."); if (dot != -1) { @@ -357,6 +349,7 @@ var media_manager = { media_manager.popup = document.createElement('div'); media_manager.popup.setAttribute('id','media__popup'); + media_manager.popup.style.display = 'none'; var root = document.getElementById('media__manager'); if (root === null) return; |