diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2011-04-02 03:36:26 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2011-04-02 03:36:26 +0100 |
| commit | efb973f8a33b893d0a4d46d6b733530833c4ad41 (patch) | |
| tree | 9386f06b90a4fc6a5c31183793df17851ca0da26 /lib/scripts/media.js | |
| parent | 344763ad4e90e41c8a94b0a69a527ff2d6319ab5 (diff) | |
| parent | a3f9f75c2624b73c4a57bf2a346ae71bf6a5fb98 (diff) | |
| download | rpg-efb973f8a33b893d0a4d46d6b733530833c4ad41.tar.gz rpg-efb973f8a33b893d0a4d46d6b733530833c4ad41.tar.bz2 | |
Merge branch 'master' of git@github.com:splitbrain/dokuwiki
Diffstat (limited to 'lib/scripts/media.js')
| -rw-r--r-- | lib/scripts/media.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index b90f7047b..57f599163 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -536,7 +536,9 @@ var media_manager = { } } } - opener.insertTags('wiki__text','{{'+alignleft+id+opts+alignright+'|','}}',''); + var edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); + edid = edid ? edid[1] : 'wiki__text'; + opener.insertTags(edid,'{{'+alignleft+id+opts+alignright+'|','}}',''); if(!media_manager.keepopen) window.close(); opener.focus(); |