Merge remote-tracking branch 'origin/master' into diff_navigation

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';