Update ckeditor

This commit is contained in:
RainLoop Team 2014-10-31 21:25:02 +04:00
parent 11b66abd17
commit 8747ea59ac
107 changed files with 1021 additions and 968 deletions

View file

@ -129,7 +129,7 @@
this.googlePreviewSupportedCache = !!Settings.settingsGet('AllowGoogleSocial') &&
!!Settings.settingsGet('AllowGoogleSocialPreview');
}
return this.googlePreviewSupportedCache;
};
@ -238,7 +238,7 @@
ko.components.register('TextArea', require('Component/TextArea'));
ko.components.register('Radio', require('Component/Radio'));
if (Settings.settingsGet('MaterialDesign'))
if (Settings.settingsGet('MaterialDesign') && Globals.bAnimationSupported)
{
ko.components.register('Checkbox', require('Component/MaterialDesign/Checkbox'));
}

View file

@ -103,7 +103,8 @@
/**
* @type {boolean}
*/
Globals.bAnimationSupported = !Globals.bMobileDevice && Globals.$html.hasClass('csstransitions');
Globals.bAnimationSupported = !Globals.bMobileDevice && Globals.$html.hasClass('csstransitions') &&
Globals.$html.hasClass('cssanimations');
/**
* @type {boolean}
@ -145,9 +146,7 @@
'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced',
'extraPlugins': 'plain',
'allowedContent': true,
'autoParagraph': false,
'font_defaultLabel': 'Arial',
'fontSize_defaultLabel': '13',
@ -158,6 +157,7 @@
* @type {Object}
*/
Globals.oHtmlEditorLangsMap = {
'bg': 'bg',
'de': 'de',
'es': 'es',
'fr': 'fr',
@ -168,6 +168,7 @@
'ja-jp': 'ja',
'ko': 'ko',
'ko-kr': 'ko',
'lt': 'lt',
'lv': 'lv',
'nl': 'nl',
'no': 'no',
@ -178,9 +179,11 @@
'ro': 'ro',
'ru': 'ru',
'sk': 'sk',
'sv': 'sv',
'tr': 'tr',
'ua': 'ru',
'zh': 'zh',
'zh-tw': 'zh',
'zh-cn': 'zh-cn'
};

View file

@ -441,7 +441,7 @@
}
});
if (bAnimate && !Globals.bMobileDevice)
if (bAnimate && Globals.bAnimationSupported)
{
$('.i18n-animation.i18n', oElement).letterfx({
'fx': 'fall fade', 'backwards': false, 'timing': 50, 'fx_duration': '50ms', 'letter_end': 'restore', 'element_end': 'restore'