Fix EZP-21986: Removing an underline removes the surrounding custom tag

ezsystems · Dec 4, 2013 · 25f76e7 · 25f76e7
1 parent b0df914
commit 25f76e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/extension/ezoe/design/standard/javascript/themes/ez/editor_template.js b/extension/ezoe/design/standard/javascript/themes/ez/editor_template.js
@@ -339,9 +339,9 @@
                 ed.addShortcut('ctrl+9', '', ['FormatBlock', false, '<pre>']);
 
                 // eZ : underline is represented with a custom tag
-                // ie: <span class="ezoeItemCustomTag underline" type="custom">foo bar</span>
+                // ie: <u class="ezoeItemCustomTag underline" type="custom">foo bar</u>
                 ed.formatter.register({
-                    underline : {inline : 'span',
+                    underline : {inline : 'u',
                                  classes : 'ezoeItemCustomTag underline',
                                  attributes : {'type': 'custom'},
                                  exact: true,

diff --git a/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php b/extension/ezoe/ezxmltext/handlers/input/ezoexmlinput.php
@@ -1336,8 +1336,9 @@ function &inputTagXML( &$tag, $currentSectionLevel, $tdSectionLevel = null )
                 else if ( $inline === true )
                 {
                     if ( !$childTagText ) $childTagText = '&nbsp;';
-                    $output .= '<span class="ezoeItemCustomTag ' . $name . '" type="custom"' .
-                               $customAttributePart . $styleString . '>' . $childTagText . '</span>';
+                    $tagName = $name === 'underline' ? 'u' : 'span';
+                    $output .= '<' . $tagName . ' class="ezoeItemCustomTag ' . $name . '" type="custom"' .
+                               $customAttributePart . $styleString . '>' . $childTagText . '</' . $tagName . '>';
                 }
                 else if ( $inline )
                 {