diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-08-03 15:00:48 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-08-03 15:00:48 +0200 |
| commit | 7d8f3226a5cc8d52fb823089894cff8a3ad11eaa (patch) | |
| tree | af69fbc15498ee2775d1167304caaf2b1eaf6367 | |
| parent | 092b7683d60c4d6b25213d459346b60a87c21c62 (diff) | |
| parent | 354c39ffc9aa3bbd7d59d5e182a36d1f390c5b7e (diff) | |
| download | rpg-7d8f3226a5cc8d52fb823089894cff8a3ad11eaa.tar.gz rpg-7d8f3226a5cc8d52fb823089894cff8a3ad11eaa.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into changelogtestsonly
| -rw-r--r-- | lib/scripts/linkwiz.js | 24 | ||||
| -rw-r--r-- | lib/scripts/toolbar.js | 5 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/css/pagetools.less | 4 |
3 files changed, 23 insertions, 10 deletions
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index c55650d68..875d4a995 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -22,6 +22,8 @@ var dw_linkwiz = { var pos = $editor.position(); // create HTML Structure + if(dw_linkwiz.$wiz) + return; dw_linkwiz.$wiz = jQuery(document.createElement('div')) .dialog({ autoOpen: false, @@ -235,15 +237,25 @@ var dw_linkwiz = { link = ':' + link; } - var so = link.length+3; - link = '[['+link+'|'; - if(stxt) { - link += stxt; + var so = link.length; + var eo = 0; + if(dw_linkwiz.val){ + if(dw_linkwiz.val.open) { + so += dw_linkwiz.val.open.length; + link = dw_linkwiz.val.open+link; + } + if(stxt) { + link += '|'+stxt; + so += 1; + } + if(dw_linkwiz.val.close) { + link += dw_linkwiz.val.close; + eo = dw_linkwiz.val.close.length; + } } - link += ']]'; - pasteText(sel,link,{startofs: so, endofs: 2}); + pasteText(sel,link,{startofs: so, endofs: eo}); dw_linkwiz.hide(); // reset the entry to the parent namespace diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 5fc4d835e..88cae1e8c 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -217,9 +217,10 @@ function addBtnActionPicker($btn, props, edid) { * @return boolean If button should be appended * @author Andreas Gohr <gohr@cosmocode.de> */ -function addBtnActionLinkwiz(btn, props, edid) { +function addBtnActionLinkwiz($btn, props, edid) { dw_linkwiz.init(jQuery('#'+edid)); - jQuery(btn).click(function(){ + jQuery($btn).click(function(){ + dw_linkwiz.val = props; dw_linkwiz.toggle(); return ''; }); diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less index 850e75d7a..b65e6fc0d 100644 --- a/lib/tpl/dokuwiki/css/pagetools.less +++ b/lib/tpl/dokuwiki/css/pagetools.less @@ -114,7 +114,7 @@ height: auto; overflow: visible; padding: 5px 40px 5px 5px; - background-image: url(images/pagetools-sprite.png); + background-image: url(images/pagetools-sprite.png?v=2); } #dokuwiki__pagetools:hover ul li a:before, @@ -136,7 +136,7 @@ /* IE7 fixes, doesn't work without images */ #IE7 #dokuwiki__pagetools ul li a { - background-image: url(images/pagetools-sprite.png); + background-image: url(images/pagetools-sprite.png?v=2); } #IE7 #dokuwiki__pagetools:hover ul li a span, |