diff options
| author | Adrian Lang <dokuwiki@adrianlang.de> | 2011-03-06 14:33:50 +0100 |
|---|---|---|
| committer | Adrian Lang <dokuwiki@adrianlang.de> | 2011-03-06 14:33:50 +0100 |
| commit | dea1115b59e771c401882590426074c08fed3a87 (patch) | |
| tree | ee4e7a05d6843c451d6d403d7c9dff03503beb08 /lib/scripts | |
| parent | 24a6c2354089305a4146c7f8802887aa895c2bd3 (diff) | |
| download | rpg-dea1115b59e771c401882590426074c08fed3a87.tar.gz rpg-dea1115b59e771c401882590426074c08fed3a87.tar.bz2 | |
Pass edid to the mediamanager
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/media.js | 4 | ||||
| -rw-r--r-- | lib/scripts/toolbar.js | 2 |
2 files changed, 4 insertions, 2 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(); diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 3f967448c..d458960ab 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -153,7 +153,7 @@ function tb_insert(btn, props, edid) { */ function tb_mediapopup(btn, props, edid) { window.open( - DOKU_BASE+props['url']+encodeURIComponent(NS), + DOKU_BASE+props['url']+encodeURIComponent(NS)+'&edid='+encodeURIComponent(edid), props['name'], props['options']); return false; |