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

ownCloud new package (with built-in RainLoop Webmail)

Browse source 
Remove VERSION file dependence.
Small fixes
This commit is contained in:
RainLoop Team 2014-05-30 05:42:22 +04:00
parent 169bd45f31
commit fb18e4e799
145 changed files with 500 additions and 5462 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dev/Boots/AbstractApp.js
View file

@ -7,13 +7,13 @@
function AbstractApp()
{
KnoinAbstractBoot.call(this);
this.oSettings = null;
this.oPlugins = null;
this.oLocal = null;
this.oLink = null;
this.oSubs = {};
this.isLocalAutocomplete = true;
this.popupVisibilityNames = ko.observableArray([]);
@ -69,12 +69,12 @@ AbstractApp.prototype.oSubs = {};
*/
AbstractApp.prototype.download = function (sLink)
{
var
var
oLink = null,
oE = null,
sUserAgent = navigator.userAgent.toLowerCase()
;
if (sUserAgent && (sUserAgent.indexOf('chrome') > -1 || sUserAgent.indexOf('chrome') > -1))
{
oLink = document.createElement('a');
@ -102,7 +102,7 @@ AbstractApp.prototype.download = function (sLink)
this.iframe.attr('src', sLink);
// window.document.location.href = sLink;
}
return true;
};
@ -182,12 +182,12 @@ AbstractApp.prototype.loginAndLogoutReload = function (bLogout, bClose)
bLogout = Utils.isUnd(bLogout) ? false : !!bLogout;
bClose = Utils.isUnd(bClose) ? false : !!bClose;
if (bLogout && bClose && window.close)
{
window.close();
}
if (bLogout && '' !== sCustomLogoutLink && window.location.href !== sCustomLogoutLink)
{
_.delay(function () {
@ -331,7 +331,7 @@ AbstractApp.prototype.bootstart = function ()
$html.removeClass('ssm-state-desktop');
}
});
ssm.addState({
'id': 'desktop-large',
'minWidth': 1400,

14
dev/Common/NewHtmlEditorWrapper.js
View file

@ -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) {}
}
};