mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 12:09:20 +03:00
ownCloud new package (with built-in RainLoop Webmail)
Remove VERSION file dependence. Small fixes
This commit is contained in:
parent
169bd45f31
commit
fb18e4e799
145 changed files with 500 additions and 5462 deletions
|
|
@ -14,10 +14,12 @@ function NewHtmlEditorWrapper(oElement, fOnBlur, fOnReady, fOnModeChange)
|
|||
self.fOnBlur = fOnBlur || null;
|
||||
self.fOnReady = fOnReady || null;
|
||||
self.fOnModeChange = fOnModeChange || null;
|
||||
|
||||
|
||||
self.$element = $(oElement);
|
||||
|
||||
self.init();
|
||||
|
||||
self.resize = _.throttle(_.bind(self.resize, self), 100);
|
||||
}
|
||||
|
||||
NewHtmlEditorWrapper.prototype.blurTrigger = function ()
|
||||
|
|
@ -148,7 +150,7 @@ NewHtmlEditorWrapper.prototype.init = function ()
|
|||
sLanguage = RL.settingsGet('Language'),
|
||||
bSource = !!RL.settingsGet('AllowHtmlEditorSourceButton')
|
||||
;
|
||||
|
||||
|
||||
if (bSource && oConfig.toolbarGroups && !oConfig.toolbarGroups.__SourceInited)
|
||||
{
|
||||
oConfig.toolbarGroups.__SourceInited = true;
|
||||
|
|
@ -157,7 +159,7 @@ NewHtmlEditorWrapper.prototype.init = function ()
|
|||
|
||||
oConfig.language = Globals.oHtmlEditorLangsMap[sLanguage] || 'en';
|
||||
self.editor = window.CKEDITOR.appendTo(self.$element[0], oConfig);
|
||||
|
||||
|
||||
self.editor.on('key', function(oEvent) {
|
||||
if (oEvent && oEvent.data && 9 === oEvent.data.keyCode)
|
||||
{
|
||||
|
|
@ -216,7 +218,11 @@ NewHtmlEditorWrapper.prototype.resize = function ()
|
|||
{
|
||||
if (this.editor && this.__resizable)
|
||||
{
|
||||
this.editor.resize(this.$element.width(), this.$element.innerHeight());
|
||||
try
|
||||
{
|
||||
this.editor.resize(this.$element.width(), this.$element.innerHeight());
|
||||
}
|
||||
catch (e) {}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue