Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

html editor optimizations (fixed #79)

Browse source
This commit is contained in:
RainLoop Team 2014-02-12 20:01:53 +04:00
parent 8da34e8d5f
commit e9b56e9477
104 changed files with 3874 additions and 3876 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dev/Common/Globals.js
View file

@ -88,34 +88,31 @@ Globals.oHtmlEditorDefaultConfig = {
'stylesSet': false,
'customConfig': '',
'contentsCss': '',
// 'height': '100%',
'toolbarGroups': [
{name: 'spec'},
{name: 'styles'},
{name: 'basicstyles', groups: ['basicstyles', 'cleanup']},
{name: 'colors'},
{name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align', 'bidi']},
{name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align']},
{name: 'links'},
{name: 'insert'}
{name: 'insert'},
{name: 'others'}
// {name: 'document', groups: ['mode', 'document', 'doctools']}
],
'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,Indent,Outdent',
'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image',
'removeDialogTabs': 'link:advanced;link:target;image:advanced',
'extraPlugins': 'plain',
'allowedContent': false,
'allowedContent': true,
'autoParagraph': false,
// 'enterMode': window.CKEDITOR.ENTER_BR,
// 'shiftEnterMode': window.CKEDITOR.ENTER_P,
// 'enterMode': window.CKEDITOR.ENTER_DIV,
'enterMode': window.CKEDITOR.ENTER_BR,
'shiftEnterMode': window.CKEDITOR.ENTER_BR,
'font_defaultLabel': 'Arial',
'fontSize_defaultLabel': '12px',
'fontSize_defaultLabel': '12',
'fontSize_sizes': '10/10px;12/12px;14/14px;16/16px;18/18px;20/20px;24/24px;28/28px;36/36px;48/48px'
};

10
dev/Common/NewHtmlEditorWrapper.js
View file

@ -43,7 +43,6 @@ NewHtmlEditorWrapper.prototype.focusTrigger = function ()
*/
NewHtmlEditorWrapper.prototype.isHtml = function ()
{
window.console.log(this.editor.mode);
return this.editor ? 'wysiwyg' === this.editor.mode : false;
};
@ -121,7 +120,14 @@ NewHtmlEditorWrapper.prototype.setPlain = function (sPlain, bFocus)
if (this.editor)
{
this.modeToggle(false);
this.editor.setData(sPlain);
if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain)
{
return this.editor.__plain.setRawData(sPlain);
}
else
{
this.editor.setData(sPlain);
}
if (bFocus)
{

4
dev/Styles/SettingsIdentities.less
View file

@ -9,8 +9,8 @@
.e-signature-place {
display: inline-block;
width: 700px;
height: 200px;
width: 680px;
height: 250px;
}
.list-table {

6
dev/Styles/SettingsIdentity.less
View file

@ -1,10 +1,8 @@
.b-settings-identity {
.e-signature-place {
display: inline-block;
width: 600px;
height: 200px;
width: 680px;
height: 250px;
}
}