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

Added "Default text editor" options (Html forced and Plain forced) (Closes #341)

Browse source
This commit is contained in:
RainLoop Team 2014-10-30 03:07:48 +04:00
parent 5e8a57f6a3
commit 25c56937f6
29 changed files with 77 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Common/Enums.js
View file

@ -216,7 +216,9 @@
*/
Enums.EditorDefaultType = {
'Html': 'Html',
'Plain': 'Plain'
'Plain': 'Plain',
'HtmlForce': 'HtmlForce',
'PlainForce': 'PlainForce'
};
/**

10
dev/Settings/User/General.js
View file

@ -60,6 +60,16 @@
this.mppTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
this.isAnimationSupported = Globals.bAnimationSupported;
this.editorDefaultTypes = ko.computed(function () {
Globals.langChangeTrigger();
return [
{'id': Enums.EditorDefaultType.Html, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_AS_DEFAULT')},
{'id': Enums.EditorDefaultType.Plain, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_AS_DEFAULT')},
{'id': Enums.EditorDefaultType.HtmlForce, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCE_AS_DEFAULT')},
{'id': Enums.EditorDefaultType.PlainForce, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT')}
];
}, this);
}
GeneralUserSetting.prototype.toggleLayout = function ()

6
dev/View/Popup/Compose.js
View file

@ -921,7 +921,8 @@
this.editor(function (oEditor) {
oEditor.setHtml(sText, false);
if (!oMessage.isHtml())
if (Enums.EditorDefaultType.PlainForce === Data.editorDefaultType() ||
(!oMessage.isHtml() && Enums.EditorDefaultType.HtmlForce !== Data.editorDefaultType()))
{
oEditor.modeToggle(false);
}
@ -940,7 +941,8 @@
this.editor(function (oEditor) {
oEditor.setHtml(sText, false);
if (Enums.EditorDefaultType.Html !== Data.editorDefaultType())
if (Enums.EditorDefaultType.Html !== Data.editorDefaultType() &&
Enums.EditorDefaultType.HtmlForce !== Data.editorDefaultType())
{
oEditor.modeToggle(false);
}

11
rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
View file

@ -26,7 +26,7 @@
<span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_EDITOR"></span>
</label>
<div class="controls">
<div data-bind="component: {
<!-- <div data-bind="component: {
name: 'Radio',
params: {
value: editorDefaultType,
@ -35,6 +35,15 @@
'Plain': 'SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_AS_DEFAULT'
}
}
}"></div>-->
<div data-bind="component: {
name: 'Select',
params: {
options: editorDefaultTypes,
value: editorDefaultType,
optionsText: 'name',
optionsValue: 'id'
}
}"></div>
</div>
</div>

2
rainloop/v/0.0.0/langs/bg.ini
View file

@ -396,6 +396,8 @@ LABEL_LANGUAGE = "Език"
LABEL_EDITOR = "Текстов редактор по подразбиране"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Обикновен"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/de.ini
View file

@ -389,6 +389,8 @@ LABEL_LANGUAGE = "Sprache"
LABEL_EDITOR = "Standard-Text-Editor"
LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Text"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface-Animation"
LABEL_ANIMATION_FULL = "Komplett"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/en.ini
View file

@ -396,6 +396,8 @@ LABEL_LANGUAGE = "Language"
LABEL_EDITOR = "Default text editor"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/es.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Idioma"
LABEL_EDITOR = "Editor de texto predeterminado"
LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Texto plano"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Todo"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/fr.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Langue"
LABEL_EDITOR = "Éditeur de texte par défaut"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Brut"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/hu.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Language"
LABEL_EDITOR = "Default text editor"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/is.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Tungumál"
LABEL_EDITOR = "Sjálfgefinn textaritill"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Venjulegur"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/it.ini
View file

@ -389,6 +389,8 @@ LABEL_LANGUAGE = "Lingua"
LABEL_EDITOR = "Editor di testo di default"
LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Testo semplice"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Animazioni dell'interfaccia"
LABEL_ANIMATION_FULL = "Tutte"
LABEL_ANIMATION_NORMAL = "Normali"

2
rainloop/v/0.0.0/langs/ja-jp.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "言語"
LABEL_EDITOR = "メール形式"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "プレーンテキスト"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/ko-kr.ini
View file

@ -385,6 +385,8 @@ LABEL_LANGUAGE = "언어"
LABEL_EDITOR = "기본 본문 편집 도구"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html 편집기"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "텍스트 편집기"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "인터페이스 애니메이션"
LABEL_ANIMATION_FULL = "최대 애니메이션"
LABEL_ANIMATION_NORMAL = "보통 애니메이션"

2
rainloop/v/0.0.0/langs/lt.ini
View file

@ -396,6 +396,8 @@ LABEL_LANGUAGE = "Kalba"
LABEL_EDITOR = "Numatytas teksto redaktorius"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Paprastas"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Sąsajos animacija"
LABEL_ANIMATION_FULL = "Pilnai"
LABEL_ANIMATION_NORMAL = "Normaliai"

2
rainloop/v/0.0.0/langs/lv.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Valoda"
LABEL_EDITOR = "Galvenais teksta editors"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Teksts"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animation"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/nl.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Taal"
LABEL_EDITOR = "Standaard tekst editor"
LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Platte tekst"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animatie"
LABEL_ANIMATION_FULL = "Volledig"
LABEL_ANIMATION_NORMAL = "Normaal"

2
rainloop/v/0.0.0/langs/no.ini
View file

@ -387,6 +387,8 @@ LABEL_LANGUAGE = "Språk"
LABEL_EDITOR = "Standard teksteditor"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Ren tekst"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interface animasjon"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/pl.ini
View file

@ -395,6 +395,8 @@ LABEL_LANGUAGE = "Język"
LABEL_EDITOR = "Format wiadomości"
LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Zwykły tekst"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Animacja interfejsu"
LABEL_ANIMATION_FULL = "Pełna"
LABEL_ANIMATION_NORMAL = "Zwykła"

2
rainloop/v/0.0.0/langs/pt-br.ini
View file

@ -396,6 +396,8 @@ LABEL_LANGUAGE = "Idioma"
LABEL_EDITOR = "Editor de texto padrão"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Texto Simples"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Animação de interface"
LABEL_ANIMATION_FULL = "Completa"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/pt-pt.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Linguagem"
LABEL_EDITOR = "Editor de texto padrão"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Simples"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Animação de interface"
LABEL_ANIMATION_FULL = "Completa"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/ro.ini
View file

@ -387,6 +387,8 @@ LABEL_LANGUAGE = "Limbă"
LABEL_EDITOR = "Editor de text implicit"
LABEL_EDITOR_HTML_AS_DEFAULT = "Formatat"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Simplu"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Interfață animație"
LABEL_ANIMATION_FULL = "Complet"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/ru.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Язык"
LABEL_EDITOR = "Редактор текста по умолчанию"
LABEL_EDITOR_HTML_AS_DEFAULT = "Форматированный"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Простой"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Форматированный (форсированный)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Простой (форсированный)"
LABEL_ANIMATION = "Анимация интерфейса"
LABEL_ANIMATION_FULL = "Полная"
LABEL_ANIMATION_NORMAL = "Нормальная"

2
rainloop/v/0.0.0/langs/sk.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Jazyk"
LABEL_EDITOR = "Predvolený editor správ"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Text"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Animácie prostredia"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/sv.ini
View file

@ -396,6 +396,8 @@ LABEL_LANGUAGE = "Språk"
LABEL_EDITOR = "Textredigerare"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Enkel"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Animerat utseende"
LABEL_ANIMATION_FULL = "Full"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/tr.ini
View file

@ -394,6 +394,8 @@ LABEL_LANGUAGE = "Dil"
LABEL_EDITOR = "Varsayılan text editör"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Düz"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Arayüz animasyonu"
LABEL_ANIMATION_FULL = "Tam Ekran"
LABEL_ANIMATION_NORMAL = "Normal"

2
rainloop/v/0.0.0/langs/ua.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "Мова"
LABEL_EDITOR = "Редактор тексту за змовчуванням"
LABEL_EDITOR_HTML_AS_DEFAULT = "Форматований"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Простий"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "Анімація інтерфейсу"
LABEL_ANIMATION_FULL = "Повна"
LABEL_ANIMATION_NORMAL = "Нормальна"

2
rainloop/v/0.0.0/langs/zh-cn.ini
View file

@ -388,6 +388,8 @@ LABEL_LANGUAGE = "语言"
LABEL_EDITOR = "默认格式"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "界面动画"
LABEL_ANIMATION_FULL = "完整"
LABEL_ANIMATION_NORMAL = "正常"

2
rainloop/v/0.0.0/langs/zh-tw.ini
View file

@ -396,6 +396,8 @@ LABEL_LANGUAGE = "語言"
LABEL_EDITOR = "默認格式"
LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
LABEL_ANIMATION = "介面動畫"
LABEL_ANIMATION_FULL = "完整"
LABEL_ANIMATION_NORMAL = "正常"