vanilla ckeditor-3.2.1

[ckeditor.git] / _source / plugins / specialchar / dialogs / specialchar.js

diff --git a/_source/plugins/specialchar/dialogs/specialchar.js b/_source/plugins/specialchar/dialogs/specialchar.js
index 597f7e1..b419cf5 100644 (file)
--- a/_source/plugins/specialchar/dialogs/specialchar.js
+++ b/_source/plugins/specialchar/dialogs/specialchar.js
@@ -11,6 +11,30 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
         */\r
        var dialog,\r
                lang = editor.lang.specialChar;\r
+\r
+       var insertSpecialChar = function ( specialChar )\r
+       {\r
+               var selection = editor.getSelection(),\r
+                       ranges    = selection.getRanges(),\r
+                       range, textNode;\r
+\r
+               editor.fire( 'saveSnapshot' );\r
+\r
+               for ( var i = 0, len = ranges.length ; i < len ; i++ )\r
+               {\r
+                       range = ranges[ i ];\r
+                       range.deleteContents();\r
+\r
+                       textNode =  CKEDITOR.dom.element.createFromHtml( specialChar );\r
+                       range.insertNode( textNode );\r
+               }\r
+\r
+               range.moveToPosition( textNode, CKEDITOR.POSITION_AFTER_END );\r
+               range.select();\r
+\r
+               editor.fire( 'saveSnapshot' );\r
+       };\r
+\r
        var onChoice = function( evt )\r
        {\r
                var target, value;\r
@@ -23,7 +47,12 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
                {\r
                        target.removeClass( "cke_light_background" );\r
                        dialog.hide();\r
-                       editor.insertHtml( value );\r
+\r
+                       // Firefox has bug on insert chars into a element use its own API. (#5170)\r
+                       if ( CKEDITOR.env.gecko )\r
+                               insertSpecialChar( value );\r
+                       else\r
+                               editor.insertHtml( value );\r
                }\r
        };\r
 \r
@@ -81,6 +110,7 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
                var element = ev.getTarget();\r
                var relative, nodeToMove;\r
                var keystroke = ev.getKeystroke();\r
+               var rtl = editor.lang.dir == 'rtl';\r
 \r
                switch ( keystroke )\r
                {\r
@@ -119,7 +149,7 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
                                break;\r
 \r
                        // RIGHT-ARROW\r
-                       case 39 :\r
+                       case rtl ? 37 : 39 :\r
                        // TAB\r
                        case 9 :\r
                                // relative is TD\r
@@ -153,7 +183,7 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
                                break;\r
 \r
                        // LEFT-ARROW\r
-                       case 37 :\r
+                       case rtl ? 39 : 37 :\r
                        // SHIFT + TAB\r
                        case CKEDITOR.SHIFT + 9 :\r
                                // relative is TD\r
@@ -260,7 +290,7 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
                                                charDesc = charDesc || character;\r
 \r
                                                html.push(\r
-                                                       '<td class="cke_dark_background" style="cursor: default">' +\r
+                                                       '<td class="cke_dark_background" style="cursor: default" role="presentation">' +\r
                                                        '<a href="javascript: void(0);" role="option"' +\r
                                                        ' aria-posinset="' + ( i +1 ) + '"',\r
                                                        ' aria-setsize="' + size + '"',\r
@@ -284,7 +314,7 @@ CKEDITOR.dialog.add( 'specialchar', function( editor )
                                html.push( '</tr>' );\r
                        }\r
 \r
-                       html.push( '</tbody></table>', '<span id="specialchar_table_label" class="cke_voice_label">' + editor.lang.common.options +'</span>' );\r
+                       html.push( '</tbody></table>', '<span id="specialchar_table_label" class="cke_voice_label">' + lang.options +'</span>' );\r
 \r
                        this.getContentElement( 'info', 'charContainer' ).getElement().setHtml( html.join( '' ) );\r
                },\r