[otrs-cvs] otrs/var/httpd/htdocs/js Core.Form.ErrorTooltips.js, 1.7, 1.8 Core.UI.RichTextEditor.js, 1.22, 1.23

Comments:
Update of /home/cvs/otrs/var/httpd/htdocs/js
In directory lancelot:/tmp/cvs-serv16780/var/httpd/htdocs/js

Modified Files:
	Core.Form.ErrorTooltips.js Core.UI.RichTextEditor.js 
Log Message:
Upgraded CKEditor to version 4.0.

Author: mn

Index: Core.Form.ErrorTooltips.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/Core.Form.ErrorTooltips.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -2 -u -d -r1.7 -r1.8
--- Core.Form.ErrorTooltips.js	24 May 2011 11:56:21 -0000	1.7
+++ Core.Form.ErrorTooltips.js	10 Dec 2012 09:53:24 -0000	1.8
@@ -1,5 +1,5 @@
 // --
 // Core.UI.Tooltips.js - provides provides Tooltip functions
-// Copyright (C) 2001-2011 OTRS AG, http://otrs.org/
+// Copyright (C) 2001-2012 OTRS AG, http://otrs.org/
 // --
 // $Id$
@@ -123,5 +123,5 @@
 
     function ShowRTETooltip(Event) {
-        ShowTooltip($('#cke_contents_' + Event.listenerData.ElementID), Event.listenerData.Message);
+        ShowTooltip($('#cke_' + Event.listenerData.ElementID + ' .cke_contents'), Event.listenerData.Message);
     }
 

Author: mn

Index: Core.UI.RichTextEditor.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/Core.UI.RichTextEditor.js,v
retrieving revision 1.22
retrieving revision 1.23
diff -2 -u -d -r1.22 -r1.23
--- Core.UI.RichTextEditor.js	27 Aug 2012 16:28:35 -0000	1.22
+++ Core.UI.RichTextEditor.js	10 Dec 2012 09:53:24 -0000	1.23
@@ -45,11 +45,7 @@
      */
     TargetNS.Init = function ($EditorArea) {
-        var ToolbarSet = 'Simple',
-            EditorID = '',
+        var EditorID = '',
             Editor,
             Instance;
-        if (CheckFormID().length) {
-            ToolbarSet = 'Full';
-        }
 
         if (isJQueryObject($EditorArea) && $EditorArea.length === 1) {
@@ -68,5 +64,5 @@
 
         CKEDITOR.on('instanceCreated', function (Editor) {
-            Editor.editor.addCss(Core.Config.Get('RichText.EditingAreaCSS'));
+            CKEDITOR.addCss(Core.Config.Get('RichText.EditingAreaCSS'));
             // Remove the validation error tooltip if content is added to the editor
             Editor.editor.on('change', function(evt) {
@@ -83,7 +79,5 @@
             resize_minWidth: Core.Config.Get('RichText.Width', 620),
             height: Core.Config.Get('RichText.Height', 320),
-            // disable builtin spellchecker.net pluging "scayt"
-            removePlugins : 'elementspath,scayt,menubutton,contextmenu',
-            skin: 'default',
+            removePlugins : 'elementspath,scayt,menubutton',
             forcePasteAsPlainText: false,
             format_tags: 'p;h1;h2;h3;h4;h5;h6;pre',
@@ -93,7 +87,5 @@
             contentsLangDirection: Core.Config.Get('RichText.TextDir', 'ltr'),
             disableNativeSpellChecker: false,
-            toolbar_Full: Core.Config.Get('RichText.ToolbarFull'),
-            toolbar_Simple: Core.Config.Get('RichText.ToolbarSimple'),
-            toolbar: ToolbarSet,
+            toolbar: CheckFormID().length ? Core.Config.Get('RichText.Toolbar') : Core.Config.Get('RichText.ToolbarWithoutImage'),
             filebrowserUploadUrl: Core.Config.Get('Baselink'),
             extraPlugins: Core.Config.Get('RichText.SpellChecker') ? 'aspell,onchange' : 'onchange'
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log