diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-10-27 20:53:59 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-10-27 20:53:59 +0200 |
| commit | 55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8 (patch) | |
| tree | 1bf1359fee6044a704ac8465753e3c147d61e6e3 /lib/scripts | |
| parent | e8b9cf5ae263f3b97aaa389dddd9e7458cc0894c (diff) | |
| parent | baef77a2b52933a6dd7caf3f641ff5ce6e6164f3 (diff) | |
| download | rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.gz rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/hotkeys.js | 2 | ||||
| -rw-r--r-- | lib/scripts/linkwiz.js | 1 | ||||
| -rw-r--r-- | lib/scripts/media.js | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index ad608b227..bff28530d 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -52,7 +52,7 @@ function Hotkeys() { t.each(anchors, function(a) { if (a.accessKey != "") { t.addShortcut(t.modifier + '+' + a.accessKey, function() { - a.click(); + location.href = a.href; }); a.accessKey = ''; } diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index e4e92cdd2..fec43ad5e 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -31,6 +31,7 @@ var linkwiz = { linkwiz.wiz.style.left = (findPosX(textArea)+80)+'px'; linkwiz.wiz.style.marginLeft = '-10000px'; linkwiz.wiz.style.marginTop = '-10000px'; + linkwiz.wiz.style.position = 'absolute'; linkwiz.wiz.innerHTML = '<div id="link__wiz_header">'+ diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c8ddfa40a..8eb19ce6b 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -215,6 +215,14 @@ 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) { |