From 7e487fcf7005d1e1465ef6acb332cc1009676413 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 17 Jan 2014 16:58:45 +0100 Subject: renamed conflicting JavaScript functions FS#2915 --- lib/scripts/toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/toolbar.js') diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 88cae1e8c..09c374bc4 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); -- cgit v1.2.3 From 8af71b8cc80c9e5a62803443c04acd24ba725e42 Mon Sep 17 00:00:00 2001 From: Szymon Olewniczak Date: Fri, 7 Feb 2014 17:59:24 +0100 Subject: add preventDefault to toolbar buttons --- lib/scripts/toolbar.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/scripts/toolbar.js') diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 09c374bc4..47f5c0df7 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 = DWgetSelection(jQuery('#'+edid)[0]); + selection = getSelection(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'; -- cgit v1.2.3 From 79fb388be6474bbcc2c2306bf229aca6d97bcd2a Mon Sep 17 00:00:00 2001 From: Szymon Olewniczak Date: Fri, 7 Feb 2014 18:06:23 +0100 Subject: megre changes --- lib/scripts/toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/toolbar.js') diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 47f5c0df7..cb478fdb1 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); -- cgit v1.2.3 From 133181ec79ac75661d1f79d5f4f256fed821f72d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 14 Feb 2014 10:34:55 +0100 Subject: fixed whitespace errors introduced in #535 --- lib/scripts/toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/scripts/toolbar.js') diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index cb478fdb1..1bb02b406 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -201,7 +201,7 @@ function addBtnActionPicker($btn, props, edid) { $btn.click( function(e) { pickerToggle(pickerid,$btn); - e.preventDefault(); + e.preventDefault(); return ''; } ); @@ -223,7 +223,7 @@ function addBtnActionLinkwiz($btn, props, edid) { jQuery($btn).click(function(e){ dw_linkwiz.val = props; dw_linkwiz.toggle(); - e.preventDefault(); + e.preventDefault(); return ''; }); return 'link__wiz'; -- cgit v1.2.3