summaryrefslogtreecommitdiff
path: root/lib/scripts/toolbar.js
diff options
context:
space:
mode:
authorghi <dokuwiki@imz.re>2015-02-17 11:08:15 +0100
committerghi <dokuwiki@imz.re>2015-02-17 11:08:15 +0100
commit7d0b7e5ed7aa0f9c56def8f6c9866aa4fc8315b8 (patch)
tree08330b0a548a402caeb02ee7a185e745386ad45d /lib/scripts/toolbar.js
parentd6dc28be40fb3202a3df69458db164e20999ac2b (diff)
parentf8803275a58a05b29e4029cc539a6f8c60ad2ea5 (diff)
downloadrpg-7d0b7e5ed7aa0f9c56def8f6c9866aa4fc8315b8.tar.gz
rpg-7d0b7e5ed7aa0f9c56def8f6c9866aa4fc8315b8.tar.bz2
Merge https://github.com/splitbrain/dokuwiki into html_showrev_output
Diffstat (limited to 'lib/scripts/toolbar.js')
-rw-r--r--lib/scripts/toolbar.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 88cae1e8c..1bb02b406 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -101,7 +101,7 @@ function tb_format(btn, props, edid) {
function tb_formatln(btn, props, edid) {
var sample = props.sample || props.title,
opts,
- selection = getSelection(jQuery('#'+edid)[0]);
+ selection = DWgetSelection(jQuery('#'+edid)[0]);
sample = fixtxt(sample);
props.open = fixtxt(props.open);
@@ -199,8 +199,9 @@ function addBtnActionPicker($btn, props, edid) {
jQuery(picker).attr('aria-hidden', 'true');
$btn.click(
- function() {
+ function(e) {
pickerToggle(pickerid,$btn);
+ e.preventDefault();
return '';
}
);
@@ -219,9 +220,10 @@ function addBtnActionPicker($btn, props, edid) {
*/
function addBtnActionLinkwiz($btn, props, edid) {
dw_linkwiz.init(jQuery('#'+edid));
- jQuery($btn).click(function(){
+ jQuery($btn).click(function(e){
dw_linkwiz.val = props;
dw_linkwiz.toggle();
+ e.preventDefault();
return '';
});
return 'link__wiz';