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

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 56c185db7..76e6d124b 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -134,7 +134,10 @@ function pickerInsert(text,edid){
  */
 function addBtnActionSignature($btn, props, edid) {
     if(typeof SIG != 'undefined' && SIG != ''){
-        $btn.bind('click', bind(insertAtCarret,edid,SIG));
+        $btn.bind('click', function (e) {
+			insertAtCarret(edid,SIG);
+			e.preventDefault();
+		});
         return edid;
     }
     return '';
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';