diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-02-14 10:33:53 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-02-14 10:33:53 +0100 |
| commit | 169773d08ac4e4aaaf48d31a998009690b5e2579 (patch) | |
| tree | 01647a59bcf366878b6fea4fbb238f0959aa49ec /lib/scripts/toolbar.js | |
| parent | 4383fddd0d80c2b3dbe49140b99c2e342a5e83f5 (diff) | |
| parent | 79fb388be6474bbcc2c2306bf229aca6d97bcd2a (diff) | |
| download | dokuwiki-169773d08ac4e4aaaf48d31a998009690b5e2579.tar.gz dokuwiki-169773d08ac4e4aaaf48d31a998009690b5e2579.zip | |
Merge branch 'toolbar' of git://github.com/hafron/dokuwiki into pull-request-535
* 'toolbar' of git://github.com/hafron/dokuwiki:
megre changes
add preventDefault to toolbar buttons
Diffstat (limited to 'lib/scripts/toolbar.js')
| -rw-r--r-- | lib/scripts/toolbar.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 09c374bc4..cb478fdb1 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -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'; |