Index: branches/5.3.x/core/admin_templates/js/inp_ckconfig.js =================================================================== diff -u -N -r15483 -r15908 --- branches/5.3.x/core/admin_templates/js/inp_ckconfig.js (.../inp_ckconfig.js) (revision 15483) +++ branches/5.3.x/core/admin_templates/js/inp_ckconfig.js (.../inp_ckconfig.js) (revision 15908) @@ -20,8 +20,10 @@ //CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ; -CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,MediaEmbed'; +CKEDITOR.config.entities = false; +CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize'; + //CKEDITOR.plugins.add('MySource'); //CKEDITOR.plugins.add('MyPreview'); //CKEDITOR.plugins.add('MyLink'); @@ -75,28 +77,28 @@ CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ; // p | div | br CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ; // p | div | br -CKEDITOR.config.keystrokes = [ - [ CKEDITOR.CTRL + 65 /*A*/, true ], - [ CKEDITOR.CTRL + 67 /*C*/, true ], - [ CKEDITOR.CTRL + 70 /*F*/, true ], - [ CKEDITOR.CTRL + 83 /*S*/, true ], - [ CKEDITOR.CTRL + 84 /*T*/, true ], - [ CKEDITOR.CTRL + 88 /*X*/, true ], - [ CKEDITOR.CTRL + 86 /*V*/, 'Paste' ], - [ CKEDITOR.CTRL + 45 /*INS*/, true ], - [ CKEDITOR.SHIFT + 45 /*INS*/, 'Paste' ], - [ CKEDITOR.CTRL + 88 /*X*/, 'Cut' ], - [ CKEDITOR.SHIFT + 46 /*DEL*/, 'Cut' ], - [ CKEDITOR.CTRL + 90 /*Z*/, 'Undo' ], - [ CKEDITOR.CTRL + 89 /*Y*/, 'Redo' ], - [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'Redo' ], - [ CKEDITOR.CTRL + 76 /*L*/, 'Link' ], - [ CKEDITOR.CTRL + 66 /*B*/, 'Bold' ], - [ CKEDITOR.CTRL + 73 /*I*/, 'Italic' ], - [ CKEDITOR.CTRL + 85 /*U*/, 'Underline' ], - [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 /*S*/, 'Save' ], - [ CKEDITOR.CTRL + CKEDITOR.ALT + 13 /*ENTER*/, 'FitWindow' ] -] ; +/*CKEDITOR.config.keystrokes = [ + [ CKEDITOR.CTRL + 65 *//*A*//*, true ], + [ CKEDITOR.CTRL + 67 *//*C*//*, true ], + [ CKEDITOR.CTRL + 70 *//*F*//*, true ], + [ CKEDITOR.CTRL + 83 *//*S*//*, true ], + [ CKEDITOR.CTRL + 84 *//*T*//*, true ], + [ CKEDITOR.CTRL + 88 *//*X*//*, true ], + [ CKEDITOR.CTRL + 86 *//*V*//*, 'Paste' ], + [ CKEDITOR.CTRL + 45 *//*INS*//*, true ], + [ CKEDITOR.SHIFT + 45 *//*INS*//*, 'Paste' ], + [ CKEDITOR.CTRL + 88 *//*X*//*, 'Cut' ], + [ CKEDITOR.SHIFT + 46 *//*DEL*//*, 'Cut' ], + [ CKEDITOR.CTRL + 90 *//*Z*//*, 'Undo' ], + [ CKEDITOR.CTRL + 89 *//*Y*//*, 'Redo' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 *//*Z*//*, 'Redo' ], + [ CKEDITOR.CTRL + 76 *//*L*//*, 'Link' ], + [ CKEDITOR.CTRL + 66 *//*B*//*, 'Bold' ], + [ CKEDITOR.CTRL + 73 *//*I*//*, 'Italic' ], + [ CKEDITOR.CTRL + 85 *//*U*//*, 'Underline' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 *//*S*//*, 'Save' ], + [ CKEDITOR.CTRL + CKEDITOR.ALT + 13 *//*ENTER*//*, 'FitWindow' ] +] ;*/ //CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form';