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

Update ckeditor

Browse source
This commit is contained in:
RainLoop Team 2014-08-31 00:37:36 +04:00
parent c7108a74e0
commit abdd452be6
102 changed files with 1524 additions and 1389 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/Common/Globals.js
View file

@ -158,6 +158,8 @@
'hu': 'hu',
'is': 'is',
'it': 'it',
'ja': 'ja',
'ja-jp': 'ja',
'ko': 'ko',
'ko-kr': 'ko',
'lv': 'lv',
@ -167,8 +169,11 @@
'pt': 'pt',
'pt-pt': 'pt',
'pt-br': 'pt-br',
'ru': 'ru',
'ro': 'ro',
'ru': 'ru',
'sk': 'sk',
'tr': 'tr',
'ua': 'ru',
'zh': 'zh',
'zh-cn': 'zh-cn'
};

11
dev/ViewModels/Popups/PopupsComposeViewModel.js
View file

@ -1,7 +1,7 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
@ -740,7 +740,6 @@
sDate = '',
sSubject = '',
oText = null,
oSubText = null,
sText = '',
sReplyTitle = '',
aResplyAllParts = [],
@ -798,8 +797,8 @@
oText = $(oMessage.body).clone();
Utils.removeBlockquoteSwitcher(oText);
oSubText = oText.find('[data-html-editor-font-wrapper=true]');
sText = oSubText && oSubText[0] ? oSubText.html() : oText.html();
oText.find('[data-html-editor-font-wrapper]').removeAttr('data-html-editor-font-wrapper');
sText = oText.html();
switch (sComposeType)
{
@ -1008,11 +1007,11 @@
PopupsComposeViewModel.prototype.tryToClosePopup = function ()
{
var
var
self = this,
PopupsAskViewModel = require('View:Popup:Ask')
;
if (!kn.isPopupVisible(PopupsAskViewModel))
{
kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'), function () {