diff --git a/dev/App/User.js b/dev/App/User.js index 9361f2af0..bce396df3 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -1151,7 +1151,6 @@ AppUser.prototype.setFolders = function (oData) { var - aList = [], bUpdate = false, fNormalizeFolder = function (sFolderFullNameRaw) { return ('' === sFolderFullNameRaw || Consts.Values.UnuseOptionValue === sFolderFullNameRaw || @@ -1170,8 +1169,7 @@ AppStore.threadsAllowed(!!Settings.settingsGet('UseImapThread') && oData.Result.IsThreadsSupported && true); - aList = this.folderResponseParseRec(Data.namespace, oData.Result['@Collection']); - Data.folderList(aList); + Data.folderList(this.folderResponseParseRec(Data.namespace, oData.Result['@Collection'])); if (oData.Result['SystemFolders'] && '' === '' + Settings.settingsGet('SentFolder') + diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js index cc9f3b632..866b4557b 100644 --- a/dev/Common/HtmlEditor.js +++ b/dev/Common/HtmlEditor.js @@ -101,7 +101,7 @@ */ HtmlEditor.prototype.clearSignatureSigns = function (sText) { - return sText.replace(/(\u0002|\u0003|\u0004|\u0005)/g, ''); + return sText.replace(/(\u0002|\u0003|\u200C|\u200D)/g, ''); }; /** diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js index 9a9b53139..16f817244 100644 --- a/dev/Common/Selector.js +++ b/dev/Common/Selector.js @@ -351,7 +351,6 @@ key('up, shift+up, down, shift+down, home, end, pageup, pagedown, insert, space', sKeyScope, function (event, handler) { if (event && handler && handler.shortcut) { - // TODO var iKey = 0; switch (handler.shortcut) { diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js index 2869afecb..c762e15ab 100644 --- a/dev/Common/Utils.js +++ b/dev/Common/Utils.js @@ -1009,6 +1009,10 @@ ; sText = sHtml + // specials for signature + .replace(/\u0002\u0002/g, '\u200C\u200C') + .replace(/\u0003\u0003/g, '\u200D\u200D') + .replace(/
]*>([\s\S\r\n]*)<\/pre>/gmi, convertPre) .replace(/[\s]+/gm, ' ') .replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue) @@ -1154,6 +1158,11 @@ sPlain = aText.join("\n"); sPlain = sPlain + + // specials for signature + .replace(/\u200C\u200C/g, '\u0002\u0002') + .replace(/\u200D\u200D/g, '\u0003\u0003') + // .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n') .replace(/&/g, '&') .replace(/>/g, '>').replace(/ .b-sub-folders .e-item .e-link { + padding-left: @folderItemPadding; + } } html.rl-left-panel-disabled { diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index d902975cf..b6dcd6c9a 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -73,6 +73,10 @@ select { line-height: 11px; } +.btn.btn-thin { + padding: 3px 9px; +} + .btn.btn-ellipsis { text-overflow: ellipsis; overflow: hidden; diff --git a/dev/View/Popup/Template.js b/dev/View/Popup/Template.js index e59f8e0bd..315b5bde9 100644 --- a/dev/View/Popup/Template.js +++ b/dev/View/Popup/Template.js @@ -116,7 +116,6 @@ if (this.editor) { this.editor.setPlain('', false); - this.editor.setReadOnly(true); } }; diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 2c86ff306..bf4060b92 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -43,6 +43,8 @@ this.folderListSystem = Data.folderListSystem; this.foldersChanging = Data.foldersChanging; + this.foldersListWithSingleInboxRootFolder = Data.foldersListWithSingleInboxRootFolder; + this.leftPanelDisabled = Globals.leftPanelDisabled; this.iDropOverTimer = 0; diff --git a/package.json b/package.json index 6ec71e77d..223af2ac6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.8.1", - "release": "260", + "release": "261", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Template.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Template.php index 0d4b1e7b0..b99c581da 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Template.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Model/Template.php @@ -81,7 +81,6 @@ class Template public function SetPopulateAlways($bPopulateAlways) { $this->bPopulateAlways = !!$bPopulateAlways; - } /** @@ -123,12 +122,18 @@ class Template } } - return array( + $aResult = array( 'ID' => $this->Id(), 'Name' => $this->Name(), - 'Populated' => $bPopulated, 'Body' => $sBody ); + + if ($bAjax) + { + $aResult['Populated'] = $bPopulated; + } + + return $aResult; } /** diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html index 1359619c3..193c8ed0f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailFolderList.html @@ -1,4 +1,5 @@ -+