From b2e93d2470fb199da5cdead65ccac6d80a9ced96 Mon Sep 17 00:00:00 2001 From: "Matt@MBP-PC.Home" Date: Tue, 3 Jul 2012 07:48:07 -0100 Subject: [PATCH] Fixed issue with Macro dialog not closed when inserting macro into RTE (http://twitter.com/kolchy/status/220068628140269570) --- .../tinymce3/plugins/umbracomacro/editor_plugin_src.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/umbraco.presentation/umbraco_client/tinymce3/plugins/umbracomacro/editor_plugin_src.js b/src/umbraco.presentation/umbraco_client/tinymce3/plugins/umbracomacro/editor_plugin_src.js index 43b0ea8b1f..35fc20fc14 100644 --- a/src/umbraco.presentation/umbraco_client/tinymce3/plugins/umbracomacro/editor_plugin_src.js +++ b/src/umbraco.presentation/umbraco_client/tinymce3/plugins/umbracomacro/editor_plugin_src.js @@ -76,12 +76,8 @@ var macroElement = ed.dom.getParent(ed.selection.getStart(), 'div.umbMacroHolder'); - if (macroElement) { - - // mark button if it's a macro - cm.setActive('umbracomacro', ed.dom.hasClass(currentSelection, 'umbMacroHolder') || ed.dom.hasClass(macroElement, 'umbMacroHolder')); - } - + // mark button if it's a macro + cm.setActive('umbracomacro', macroElement && ed.dom.hasClass(macroElement, 'umbMacroHolder')); }); },