Skip to content

Commit

Permalink
Install the new version of CKEditor 4.5.3
Browse files Browse the repository at this point in the history
Update our custom config file to add a few more toolbar buttons,
including 'source', which may be contentious.

This update also switches our theme and removes some plugins, such
as the "current DOM element" bar

The upgrade process looks like this:

[Update the copy of ckeditor in third-party. To do so, look at build-config.js]

$ cd share/web/static/RichText
$ rm -rf *
$ cp -a ../../../devel/third-party/ckeditor/* .
$ rm -rf README.md LICENSE.md samples/ build-config.js CHANGES.md
$ echo  "\n\n// RT override:\nbody { background-color: transparent;}\n\n" >> contents.css
$ git co config.js

[ Update config.js to add new plugins or massage toolbar ]

$ git add .
$ git commit
  • Loading branch information
obra committed Oct 5, 2015
1 parent ad22112 commit ac32f42
Show file tree
Hide file tree
Showing 314 changed files with 2,586 additions and 3,345 deletions.
1,264 changes: 0 additions & 1,264 deletions share/static/RichText/LICENSE.md

This file was deleted.

10 changes: 10 additions & 0 deletions share/static/RichText/adapters/jquery.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,822 changes: 970 additions & 852 deletions share/static/RichText/ckeditor.js

Large diffs are not rendered by default.

46 changes: 22 additions & 24 deletions share/static/RichText/config.js
Original file line number Diff line number Diff line change
@@ -1,47 +1,45 @@
/**
* @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license
*/
/** @license Copyright (c) 2003-2015, CKSource - Frederico Knabben.
* All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license */

CKEDITOR.editorConfig = function( config ) {
// Define changes to default configuration here. For example:
// config.language = 'fr';
// config.uiColor = '#AADC6E';
config.toolbar = 'Full';
// %REMOVE_START%
// The configuration options below are needed when running CKEditor from source files.
config.plugins = 'dialogui,dialog,a11yhelp,dialogadvtab,basicstyles,blockquote,clipboard,button,panelbutton,panel,floatpanel,colorbutton,menu,contextmenu,resize,toolbar,enterkey,entities,find,floatingspace,listblock,richcombo,font,format,htmlwriter,wysiwygarea,indent,justify,fakeobjects,link,indentlist,list,liststyle,magicline,pastetext,pastefromword,removeformat,selectall,sourcearea,specialchar,menubutton,tab,table,tabletools,undo,popup,autolink,horizontalrule';
config.skin = 'flat';
// %REMOVE_END%

config.toolbar_Full =
[

config.toolbar = 'Full';
config.toolbar_Full = [
['Cut','Copy','Paste','PasteText','PasteFromWord'],
['Undo','Redo','-','-','SelectAll','RemoveFormat'],
['Table','HorizontalRule','SpecialChar'],
['Table','HorizontalRule','SpecialChar','Link'],
'/',
['Bold','Italic','Underline','Strike'],
['NumberedList','BulletedList','-','Outdent','Indent'],
['NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
'/',
['Format','Font','FontSize'],
['TextColor'],
['Link']
['Source']
];

config.enterMode = CKEDITOR.ENTER_BR;
config.shiftEnterMode = CKEDITOR.ENTER_P;
config.enableTabKeyTools = true;
config.htmlEncodeOutput = false;

config.disableNativeSpellChecker = false;
config.browserContextMenuOnCtrl = true;


config.toolbarCanCollapse = true;
config.toolbarStartupExpanded = false;
config.font_names =
'Arial/Arial, Helvetica, sans-serif;' +
'Courier New/Courier New, Courier, monospace;' +
'Georgia/Georgia, serif;' +
'Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;' +
'Tahoma/Tahoma, Geneva, sans-serif;' +
'Times New Roman/Times New Roman, Times, serif;' +
'Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;' +
'Verdana/Verdana, Geneva, sans-serif';
'Arial/Arial, Helvetica, sans-serif;' +
'Courier New/Courier New, Courier, monospace;' +
'Georgia/Georgia, serif;' +
'Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;' +
'Tahoma/Tahoma, Geneva, sans-serif;' +
'Times New Roman/Times New Roman, Times, serif;' +
'Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;' +
'Verdana/Verdana, Geneva, sans-serif';
};
79 changes: 59 additions & 20 deletions share/static/RichText/contents.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/

body
Expand All @@ -13,15 +13,15 @@ body
color: #333;

/* Remove the background color to make it transparent */
background-color: transparent;
background-color: #fff;

margin: 20px;
}

.cke_editable
{
font-size: 13px;
line-height: 1.6em;
line-height: 1.6;
}

blockquote
Expand Down Expand Up @@ -64,7 +64,7 @@ ol,ul,dl
h1,h2,h3,h4,h5,h6
{
font-weight: normal;
line-height: 1.2em;
line-height: 1.2;
}

hr
Expand All @@ -73,27 +73,66 @@ hr
border-top: 1px solid #ccc;
}

img.right {
border: 1px solid #ccc;
float: right;
margin-left: 15px;
padding: 5px;
}

img.left {
border: 1px solid #ccc;
float: left;
margin-right: 15px;
padding: 5px;
img.right
{
border: 1px solid #ccc;
float: right;
margin-left: 15px;
padding: 5px;
}

img:hover {
opacity: .9;
filter: alpha(opacity = 90);
img.left
{
border: 1px solid #ccc;
float: left;
margin-right: 15px;
padding: 5px;
}

pre
{
white-space: pre-wrap; /* CSS 2.1 */
word-wrap: break-word; /* IE7 */
-moz-tab-size: 4;
tab-size: 4;
}

.marker
{
background-color: Yellow;
}

span[lang]
{
font-style: italic;
}

figure
{
text-align: center;
border: solid 1px #ccc;
border-radius: 2px;
background: rgba(0,0,0,0.05);
padding: 10px;
margin: 10px 20px;
display: inline-block;
}

figure > figcaption
{
text-align: center;
display: block; /* For IE8 */
}

a > img {
padding: 1px;
margin: 1px;
border: none;
outline: 1px solid #0782C1;
}


// RT override:
body { background-color: transparent;}


6 changes: 3 additions & 3 deletions share/static/RichText/lang/af.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/ar.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/bg.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/bn.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/bs.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/ca.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/cs.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/cy.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/da.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/de.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/el.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/en-au.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/en-ca.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/en-gb.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/en.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/eo.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/es.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/et.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/eu.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/fa.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/fi.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/fo.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/fr-ca.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/fr.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/gl.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/gu.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/he.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/hi.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/hr.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions share/static/RichText/lang/hu.js

Large diffs are not rendered by default.

Loading

0 comments on commit ac32f42

Please sign in to comment.