From b062e9b1902b701fc28f4675432d2fb966857d8c Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Thu, 16 Apr 2015 21:55:13 +0400 Subject: [PATCH 001/106] Composer fixes --- dev/Common/Enums.js | 1 + dev/Common/HtmlEditor.js | 55 +++++++------------ dev/External/ko.js | 29 ++++++---- dev/Model/Attachment.js | 12 +++- dev/View/Admin/Login.js | 1 - dev/View/Popup/Compose.js | 2 + dev/View/User/Login.js | 4 -- .../app/libraries/MailSo/Mail/MailClient.php | 20 ++++++- .../0.0.0/app/libraries/RainLoop/Actions.php | 23 ++++++-- 9 files changed, 86 insertions(+), 61 deletions(-) diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js index 36c56ad5e..e08450a44 100644 --- a/dev/Common/Enums.js +++ b/dev/Common/Enums.js @@ -22,6 +22,7 @@ 'Sheet': 'sheet', 'Presentation': 'presentation', 'Certificate': 'certificate', + 'CertificateBin': 'certificate-bin', 'Archive': 'archive' }; diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js index 8e9f25c69..842702c51 100644 --- a/dev/Common/HtmlEditor.js +++ b/dev/Common/HtmlEditor.js @@ -32,7 +32,6 @@ this.resize = _.throttle(_.bind(this.resize, this), 100); this.__inited = false; - this.__initedData = null; this.init(); } @@ -206,10 +205,6 @@ this.focus(); } } - else - { - this.__initedData = [true, sHtml, bFocus]; - } }; HtmlEditor.prototype.setPlain = function (sPlain, bFocus) @@ -233,10 +228,6 @@ this.focus(); } } - else - { - this.__initedData = [false, sPlain, bFocus]; - } }; HtmlEditor.prototype.init = function () @@ -318,37 +309,29 @@ self.focusTrigger(); }); - if (self.fOnReady) - { - self.editor.on('instanceReady', function () { + self.editor.on('instanceReady', function () { - if (self.editor.removeMenuItem) - { - self.editor.removeMenuItem('cut'); - self.editor.removeMenuItem('copy'); - self.editor.removeMenuItem('paste'); - } + if (self.editor.removeMenuItem) + { + self.editor.removeMenuItem('cut'); + self.editor.removeMenuItem('copy'); + self.editor.removeMenuItem('paste'); + } - self.editor.setKeystroke(window.CKEDITOR.CTRL + 65 /* A */, 'selectAll'); + self.editor.setKeystroke(window.CKEDITOR.CTRL + 65 /* A */, 'selectAll'); + + self.__resizable = true; + self.__inited = true; + + self.resize(); + + if (self.fOnReady) + { self.fOnReady(); - self.__resizable = true; - self.__inited = true; - self.resize(); - - if (self.__initedData) - { - if (self.__initedData[0]) - { - self.setHtml(self.__initedData[1], self.__initedData[2]); - } - else - { - self.setPlain(self.__initedData[1], self.__initedData[2]); - } - } - }); - } + } + + }); } ; diff --git a/dev/External/ko.js b/dev/External/ko.js index b2e1e4712..04315255f 100644 --- a/dev/External/ko.js +++ b/dev/External/ko.js @@ -24,32 +24,41 @@ 'init': function (oElement, fValueAccessor) { var - fValue = fValueAccessor(), oEditor = null, + fValue = fValueAccessor(), + fUpdateEditorValue = function () { - if (oEditor) + if (fValue && fValue.__editor) { - oEditor.setHtmlOrPlain(fValue()); + fValue.__editor.setHtmlOrPlain(fValue()); } }, + fUpdateKoValue = function () { - if (oEditor && oEditor.__inited) + if (fValue && fValue.__editor) { - fValue(oEditor.getDataWithHtmlMark()); + fValue(fValue.__editor.getDataWithHtmlMark()); } }, + + fOnReady = function () { + fValue.__editor = oEditor; + fUpdateEditorValue(); + }, + HtmlEditor = require('Common/HtmlEditor') ; - if (fValue) + if (ko.isObservable(fValue) && HtmlEditor) { - oEditor = new HtmlEditor(oElement, fUpdateKoValue, fUpdateEditorValue, fUpdateKoValue); - fValue.__editor = oEditor; + oEditor = new HtmlEditor(oElement, fUpdateKoValue, fOnReady, fUpdateKoValue); + fValue.__fetchEditorValue = fUpdateKoValue; - fValue.__updateEditorValue = fUpdateEditorValue; fValue.subscribe(fUpdateEditorValue); - fUpdateEditorValue(); + +// ko.utils.domNodeDisposal.addDisposeCallback(oElement, function () { +// }); } } }; diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js index d4dc6911e..0534494c1 100644 --- a/dev/Model/Attachment.js +++ b/dev/Model/Attachment.js @@ -189,7 +189,8 @@ */ AttachmentModel.prototype.hasPreview = function () { - return this.isImage() || (this.isPdf() && Globals.bAllowPdfPreview) || this.isText() || this.isFramed(); + return this.isImage() || (this.isPdf() && Globals.bAllowPdfPreview) || + this.isText() || this.isFramed(); }; /** @@ -370,12 +371,17 @@ sResult = Enums.FileType.Pdf; break; case -1 < Utils.inArray(sMimeType, [ - 'application/pgp-signature', 'application/pkcs7-signature', 'application/pgp-keys' + 'application/pgp-signature', 'application/pgp-keys' ]) || -1 < Utils.inArray(sExt, [ 'asc', 'pem', 'ppk' ]): sResult = Enums.FileType.Certificate; break; + case -1 < Utils.inArray(sMimeType, ['application/pkcs7-signature']) || + -1 < Utils.inArray(sExt, ['p7s']): + + sResult = Enums.FileType.CertificateBin; + break; case -1 < Utils.inArray(aMimeTypeParts[1], [ 'rtf', 'msword', 'vnd.msword', 'vnd.openxmlformats-officedocument.wordprocessingml.document', 'vnd.openxmlformats-officedocument.wordprocessingml.template', @@ -447,6 +453,7 @@ sClass = 'icon-file-zip'; break; case Enums.FileType.Certificate: + case Enums.FileType.CertificateBin: sClass = 'icon-file-certificate'; break; case Enums.FileType.Sheet: @@ -509,6 +516,7 @@ sClass = 'icon-file-zip'; break; case Enums.FileType.Certificate: + case Enums.FileType.CertificateBin: sClass = 'icon-file-certificate'; break; case Enums.FileType.Sheet: diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js index e6a64c8ec..84d506e86 100644 --- a/dev/View/Admin/Login.js +++ b/dev/View/Admin/Login.js @@ -87,7 +87,6 @@ { if (oData.Result) { - this.formHidden(true); require('App/Admin').loginAndLogoutReload(true); } else if (oData.ErrorCode) diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 42b8bf4ab..68acf1632 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -1,4 +1,6 @@ +/* global require, module */ + (function () { 'use strict'; diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js index f2ea8c45b..e5e7111b1 100644 --- a/dev/View/User/Login.js +++ b/dev/View/User/Login.js @@ -213,12 +213,10 @@ } else if (oData.Admin) { - this.formHidden(true); require('App/User').redirectToAdminPanel(); } else { - this.formHidden(true); require('App/User').loginAndLogoutReload(false); } } @@ -382,8 +380,6 @@ if (0 === iErrorCode) { self.submitRequest(true); - self.formHidden(true); - require('App/User').loginAndLogoutReload(false); } else diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php index ce428e586..f3f0041a1 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php @@ -1921,6 +1921,7 @@ class MailClient * @param bool $bUseSortIfSupported = false * @param bool $bUseThreadSortIfSupported = false * @param bool $bUseESearchOrESortRequest = false + * @param string $sThreadUid = '' * * @return \MailSo\Mail\MessageCollection * @@ -1929,7 +1930,8 @@ class MailClient * @throws \MailSo\Imap\Exceptions\Exception */ public function MessageList($sFolderName, $iOffset = 0, $iLimit = 10, $sSearch = '', $sPrevUidNext = '', $oCacher = null, - $bUseSortIfSupported = false, $bUseThreadSortIfSupported = false, $bUseESearchOrESortRequest = false) + $bUseSortIfSupported = false, $bUseThreadSortIfSupported = false, $bUseESearchOrESortRequest = false, + $sThreadUid = '') { $sSearch = \trim($sSearch); if (!\MailSo\Base\Validator::RangeInt($iOffset, 0) || @@ -1958,6 +1960,11 @@ class MailClient $bUseThreadSortIfSupported = $bUseThreadSortIfSupported ? ($this->oImapClient->IsSupported('THREAD=REFS') || $this->oImapClient->IsSupported('THREAD=REFERENCES') || $this->oImapClient->IsSupported('THREAD=ORDEREDSUBJECT')) : false; + if (!empty($sThreadUid) && !$bUseThreadSortIfSupported) + { + throw new \MailSo\Base\Exceptions\InvalidArgumentException(); + } + if (!$oCacher || !($oCacher instanceof \MailSo\Cache\CacheClient)) { $oCacher = null; @@ -1986,6 +1993,12 @@ class MailClient $bIndexAsUid = false; $aIndexOrUids = array(); +// $mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher, true); +// if (\is_array($mThreads)) +// { +// +// } + if (0 < \strlen($sSearch)) { $aIndexOrUids = $this->getSearchUidsResult($sSearch, @@ -2263,7 +2276,10 @@ class MailClient { $aSubscribedFolders = $this->oImapClient->FolderSubscribeList($sParent, $sListPattern); } - catch (\Exception $oException) {} + catch (\Exception $oException) + { + unset($oException); + } } $aImapSubscribedFoldersHelper = null; diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 713062acf..46e8f5524 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -2640,7 +2640,7 @@ class Actions \sleep(1); return $this->TrueResponse(__FUNCTION__); } - + /** * @return array * @@ -5509,11 +5509,12 @@ class Actions $sSearch = ''; $sUidNext = ''; $bUseThreads = false; + $sThreadUid = ''; $sRawKey = $this->GetActionParam('RawKey', ''); $aValues = $this->getDecodedClientRawKeyValue($sRawKey, 9); - if (\is_array($aValues) && 9 === \count($aValues)) + if (\is_array($aValues) && 7 < \count($aValues)) { $sFolder =(string) $aValues[0]; $iOffset = (int) $aValues[1]; @@ -5522,6 +5523,11 @@ class Actions $sUidNext = (string) $aValues[6]; $bUseThreads = (bool) $aValues[7]; + if ($bUseThreads) + { + $sThreadUid = ''; // TODO + } + $this->verifyCacheByKey($sRawKey); } else @@ -5532,6 +5538,11 @@ class Actions $sSearch = $this->GetActionParam('Search', ''); $sUidNext = $this->GetActionParam('UidNext', ''); $bUseThreads = '1' === (string) $this->GetActionParam('UseThreads', '0'); + + if ($bUseThreads) + { + $sThreadUid = (string) $this->GetActionParam('ThreadUid', ''); + } } if (0 === strlen($sFolder)) @@ -5552,8 +5563,8 @@ class Actions $sFolder, $iOffset, $iLimit, $sSearch, $sUidNext, $this->cacherForUids(), !!$this->Config()->Get('labs', 'use_imap_sort', false), - $bUseThreads, - !!$this->Config()->Get('labs', 'use_imap_esearch_esort', false) + $bUseThreads, !!$this->Config()->Get('labs', 'use_imap_esearch_esort', false), + $sThreadUid ); } catch (\Exception $oException) @@ -7724,10 +7735,10 @@ class Actions $iUid = (int) (isset($aValues['Uid']) ? $aValues['Uid'] : 0); $sMimeIndex = (string) (isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : ''); - header('Content-Type: text/plain', true); + \header('Content-Type: text/plain', true); return $this->MailClient()->MessageMimeStream(function ($rResource) { - if (is_resource($rResource)) + if (\is_resource($rResource)) { \MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource); } From b00959b2d0b0c96031d9f353b3c47fe50dcebd41 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Thu, 16 Apr 2015 22:02:10 +0400 Subject: [PATCH 002/106] Fix pt-br translation file. --- rainloop/v/0.0.0/langs/admin/pt-br.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rainloop/v/0.0.0/langs/admin/pt-br.ini b/rainloop/v/0.0.0/langs/admin/pt-br.ini index f85961252..dfca120f9 100644 --- a/rainloop/v/0.0.0/langs/admin/pt-br.ini +++ b/rainloop/v/0.0.0/langs/admin/pt-br.ini @@ -38,8 +38,8 @@ LABEL_ALLOW_TEMPLATES = "Permitir templates" ALERT_WARNING = "Aviso!" HTML_ALERT_WEAK_PASSWORD = "Você está usando a senha administrativa padrão.
-Por motivo de segurança por favor -troque a senha +Por motivo de segurança por favor +troque a senha agora." [TAB_LOGIN] @@ -156,7 +156,7 @@ TYPE_BASIC_HINT = "Esse domínio não está licenciado para uso comercial (com r TYPE_BASIC_HINT_2 = "Esse domínio não pode ser licenciado." HTML_ALERT_TOP_1 = "RainLoop Webmail é licenciado sob" HTML_ALERT_TOP_2 = "Você é livre para usá-lo em seus projetos pessoais." -HTML_ALERT_TOP_3 = "Uso comercial (com recursos adicionais) do RainLoop Webmail +HTML_ALERT_TOP_3 = "Uso comercial (com recursos adicionais) do RainLoop Webmail requer uma assinatura." TYPE_PREMIUM = "Premium" TYPE_PREMIUM_LIFETIME = "Lifetime" @@ -237,7 +237,7 @@ TOOLTIP_ABOUT_TITLE = "Sobre" BUTTON_YES = "Sim" BUTTON_NO = "Não" DESC_WANT_CLOSE_THIS_WINDOW = "Você tem certeza que deseja fechar esta janela?" -DESC_WANT_DELETE_MESSAGES = Você tem certeza que deseja apagar a(s) mensagem(s)?" +DESC_WANT_DELETE_MESSAGES = "Você tem certeza que deseja apagar a(s) mensagem(s)?" [POPUPS_LANGUAGES] TITLE_LANGUAGES = "Selecionar idioma" From c73eb768160277f82bb2cb594fc53cd238ba450c Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Fri, 17 Apr 2015 17:56:29 +0400 Subject: [PATCH 003/106] Release fixes --- dev/Common/HtmlEditor.js | 15 ++------- dev/Remote/User/Ajax.js | 22 ++++++++----- dev/Settings/Admin/Branding.js | 32 +++++++++---------- dev/Stores/Language.js | 7 ++-- dev/View/Popup/Compose.js | 20 ++++++++++++ dev/View/Popup/Languages.js | 9 +++--- package.json | 2 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 12 ++++--- .../Views/Admin/AdminSettingsBranding.html | 2 +- 9 files changed, 67 insertions(+), 54 deletions(-) diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js index 842702c51..5653c675d 100644 --- a/dev/Common/HtmlEditor.js +++ b/dev/Common/HtmlEditor.js @@ -261,7 +261,7 @@ } oConfig.enterMode = window.CKEDITOR.ENTER_BR; - oConfig.shiftEnterMode = window.CKEDITOR.ENTER_BR; + oConfig.shiftEnterMode = window.CKEDITOR.ENTER_P; oConfig.language = Globals.oHtmlEditorLangsMap[sLanguage] || 'en'; if (window.CKEDITOR.env) @@ -269,17 +269,6 @@ window.CKEDITOR.env.isCompatible = true; } -// oConfig.allowedContent = { -// $1: { -// elements: window.CKEDITOR.dtd, -// attributes: true, -// styles: true, -// classes: true -// } -// }; -// -// oConfig.disallowedContent = 'script; style; iframe; frame; *[on*]'; - window.CKEDITOR.dtd.$removeEmpty['p'] = 1; self.editor = window.CKEDITOR.appendTo(self.$element[0], oConfig); @@ -330,7 +319,7 @@ { self.fOnReady(); } - + }); } ; diff --git a/dev/Remote/User/Ajax.js b/dev/Remote/User/Ajax.js index 20ee13045..6e77f856e 100644 --- a/dev/Remote/User/Ajax.js +++ b/dev/Remote/User/Ajax.js @@ -333,19 +333,23 @@ * @param {number=} iLimit = 20 * @param {string=} sSearch = '' * @param {boolean=} bSilent = false + * @param {string=} sThreadUid = '' */ - RemoteUserAjax.prototype.messageList = function (fCallback, sFolderFullNameRaw, iOffset, iLimit, sSearch, bSilent) + RemoteUserAjax.prototype.messageList = function (fCallback, sFolderFullNameRaw, iOffset, iLimit, sSearch, bSilent, sThreadUid) { sFolderFullNameRaw = Utils.pString(sFolderFullNameRaw); var - sFolderHash = Cache.getFolderHash(sFolderFullNameRaw) + sFolderHash = Cache.getFolderHash(sFolderFullNameRaw), + bUseThreads = AppStore.threadsAllowed() && SettingsStore.useThreads(), + sInboxUidNext = Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '' ; bSilent = Utils.isUnd(bSilent) ? false : !!bSilent; iOffset = Utils.isUnd(iOffset) ? 0 : Utils.pInt(iOffset); iLimit = Utils.isUnd(iOffset) ? 20 : Utils.pInt(iLimit); sSearch = Utils.pString(sSearch); + sThreadUid = Utils.pString(sThreadUid); if ('' !== sFolderHash && ('' === sSearch || -1 === sSearch.indexOf('is:'))) { @@ -358,9 +362,9 @@ sSearch, AppStore.projectHash(), sFolderHash, - Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '', - AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0', - '' + sInboxUidNext, + bUseThreads ? '1' : '0', + bUseThreads ? sThreadUid : '' ].join(String.fromCharCode(0))), bSilent ? [] : ['MessageList']); } else @@ -370,9 +374,11 @@ 'Offset': iOffset, 'Limit': iLimit, 'Search': sSearch, - 'UidNext': Cache.getFolderInboxName() === sFolderFullNameRaw ? Cache.getFolderUidNext(sFolderFullNameRaw) : '', - 'UseThreads': AppStore.threadsAllowed() && SettingsStore.useThreads() ? '1' : '0' - }, '' === sSearch ? Consts.Defaults.DefaultAjaxTimeout : Consts.Defaults.SearchAjaxTimeout, '', bSilent ? [] : ['MessageList']); + 'UidNext': sInboxUidNext, + 'UseThreads': bUseThreads ? '1' : '0', + 'ThreadUid': bUseThreads ? sThreadUid : '' + }, '' === sSearch ? Consts.Defaults.DefaultAjaxTimeout : Consts.Defaults.SearchAjaxTimeout, + '', bSilent ? [] : ['MessageList']); } }; diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js index 748a68d79..b76661ebe 100644 --- a/dev/Settings/Admin/Branding.js +++ b/dev/Settings/Admin/Branding.js @@ -144,29 +144,27 @@ }, 50); } - else - { - _.delay(function () { - var - f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self), - f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self) - ; + _.delay(function () { - self.title.subscribe(function (sValue) { - Remote.saveAdminConfig(f1, { - 'Title': Utils.trim(sValue) - }); + var + f1 = Utils.settingsSaveHelperSimpleFunction(self.title.trigger, self), + f2 = Utils.settingsSaveHelperSimpleFunction(self.loadingDesc.trigger, self) + ; + + self.title.subscribe(function (sValue) { + Remote.saveAdminConfig(f1, { + 'Title': Utils.trim(sValue) }); + }); - self.loadingDesc.subscribe(function (sValue) { - Remote.saveAdminConfig(f2, { - 'LoadingDescription': Utils.trim(sValue) - }); + self.loadingDesc.subscribe(function (sValue) { + Remote.saveAdminConfig(f2, { + 'LoadingDescription': Utils.trim(sValue) }); + }); - }, 50); - } + }, 50); }; module.exports = BrandingAdminSettings; diff --git a/dev/Stores/Language.js b/dev/Stores/Language.js index 2659f42a0..4b3b1aa9b 100644 --- a/dev/Stores/Language.js +++ b/dev/Stores/Language.js @@ -22,14 +22,11 @@ this.language = ko.observable('') .extend({'limitedList': this.languages}); - this.userLanguage = ko.observable('') - .extend({'limitedList': this.languages}); - this.languageAdmin = ko.observable('') .extend({'limitedList': this.languagesAdmin}); - this.userLanguageAdmin = ko.observable('') - .extend({'limitedList': this.languagesAdmin}); + this.userLanguage = ko.observable(''); + this.userLanguageAdmin = ko.observable(''); } LanguageStore.prototype.populate = function () diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 68acf1632..b9de52b02 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -1099,6 +1099,26 @@ oText.find('.rlBlockquoteSwitcher').off('.rlBlockquoteSwitcher').remove(); oText.find('[data-html-editor-font-wrapper]').removeAttr('data-html-editor-font-wrapper'); + (function () { + + var oTmp = null, iLimit = 0; + + while (true) + { + iLimit++; + + oTmp = oText.children(); + if (10 > iLimit && oTmp.is('div') && 1 === oTmp.length) + { + oTmp.children().unwrap(); + continue; + } + + break; + } + + }()); + sText = oText.html(); } diff --git a/dev/View/Popup/Languages.js b/dev/View/Popup/Languages.js index cf32623c9..e82bc9cf8 100644 --- a/dev/View/Popup/Languages.js +++ b/dev/View/Popup/Languages.js @@ -24,15 +24,16 @@ var self = this; this.fLang = null; - this.sUserLanguage = ''; + this.userLanguage = ko.observable(''); this.langs = ko.observableArray([]); this.languages = ko.computed(function () { + var sUserLanguage = self.userLanguage(); return _.map(self.langs(), function (sLanguage) { return { 'key': sLanguage, - 'user': sLanguage === self.sUserLanguage, + 'user': sLanguage === sUserLanguage, 'selected': ko.observable(false), 'fullName': Utils.convertLangName(sLanguage) }; @@ -66,7 +67,7 @@ LanguagesPopupView.prototype.onShow = function (fLanguage, aLangs, sUserLanguage) { this.fLang = fLanguage; - this.sUserLanguage = sUserLanguage || ''; + this.userLanguage(sUserLanguage || ''); this.langs(aLangs); }; @@ -74,7 +75,7 @@ LanguagesPopupView.prototype.onHide = function () { this.fLang = null; - this.sUserLanguage = ''; + this.userLanguage(''); this.langs([]); }; diff --git a/package.json b/package.json index 66ced8835..4dba13d46 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.8.3", - "release": "302", + "release": "304", "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/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 46e8f5524..0946c1682 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1709,8 +1709,9 @@ class Actions $aResult['LanguageAdmin'] = $this->ValidateLanguage($sLanguageAdmin, '', true); $aResult['UserLanguageRaw'] = $this->detectUserLanguage(); - $aResult['UserLanguage'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], $aResult['Language'], false); - $aResult['UserLanguageAdmin'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], $aResult['LanguageAdmin'], true); + + $aResult['UserLanguage'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], '', false, true, true); + $aResult['UserLanguageAdmin'] = $this->ValidateLanguage($aResult['UserLanguageRaw'], '', true, true, true); $aResult['LangLink'] = './?/Lang/0/'.($bAdmin ? 'Admin' : 'App').'/'. ($bAdmin ? $aResult['LanguageAdmin'] : $aResult['Language']).'/'.$sStaticCache.'/'; @@ -5525,7 +5526,7 @@ class Actions if ($bUseThreads) { - $sThreadUid = ''; // TODO + $sThreadUid = isset($aValues[8]) ? (string) $aValues[8] : ''; } $this->verifyCacheByKey($sRawKey); @@ -8380,10 +8381,11 @@ class Actions * @param string $sDefault = '' * @param bool $bAdmin = false * @param bool $bSearchShortName = false + * @param bool $bAllowEmptyResult = false * * @return string */ - public function ValidateLanguage($sLanguage, $sDefault = '', $bAdmin = false, $bSearchShortName = false) + public function ValidateLanguage($sLanguage, $sDefault = '', $bAdmin = false, $bSearchShortName = false, $bAllowEmptyResult = false) { $sResult = ''; $aLang = $this->GetLanguages($bAdmin); @@ -8409,7 +8411,7 @@ class Actions $sResult = $sDefault; } - if (empty($sResult)) + if (empty($sResult) && !$bAllowEmptyResult) { $sResult = $this->Config()->Get('webmail', $bAdmin ? 'language_admin' : 'language', 'en'); $sResult = \in_array($sResult, $aLang) ? $sResult : 'en'; diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html index 378b1cda3..2b1f3f84f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html @@ -144,7 +144,7 @@ -
+
From b656b6365bcf3f09537fb71e747563c2f3412d72 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Mon, 20 Apr 2015 23:49:51 +0400 Subject: [PATCH 004/106] New thread list logic (step 1) --- dev/App/User.js | 5 +- dev/Common/Links.js | 13 +- dev/Remote/User/Ajax.js | 4 +- dev/Screen/User/MailBox.js | 12 +- dev/Stores/User/Message.js | 2 + dev/View/User/MailBox/MessageList.js | 4 +- .../app/libraries/MailSo/Mail/MailClient.php | 211 ++++++++++++------ .../MailSo/Mail/MessageCollection.php | 8 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 4 +- .../libraries/RainLoop/Config/Application.php | 1 - 10 files changed, 186 insertions(+), 78 deletions(-) diff --git a/dev/App/User.js b/dev/App/User.js index 616451270..bb622b736 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -214,12 +214,13 @@ ); } - }, FolderStore.currentFolderFullNameRaw(), iOffset, SettingsStore.messagesPerPage(), MessageStore.messageListSearch()); + }, FolderStore.currentFolderFullNameRaw(), iOffset, SettingsStore.messagesPerPage(), + MessageStore.messageListSearch(), MessageStore.messageListThreadUid()); }; AppUser.prototype.recacheInboxMessageList = function () { - Remote.messageList(Utils.emptyFunction, Cache.getFolderInboxName(), 0, SettingsStore.messagesPerPage(), '', true); + Remote.messageList(Utils.emptyFunction, Cache.getFolderInboxName(), 0, SettingsStore.messagesPerPage(), '', '', true); }; /** diff --git a/dev/Common/Links.js b/dev/Common/Links.js index da26296b0..ac0e57c7c 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -257,23 +257,30 @@ * @param {string} sFolder * @param {number=} iPage = 1 * @param {string=} sSearch = '' + * @param {string=} sThreadUid = '' * @return {string} */ - Links.prototype.mailBox = function (sFolder, iPage, sSearch) + Links.prototype.mailBox = function (sFolder, iPage, sSearch, sThreadUid) { iPage = Utils.isNormal(iPage) ? Utils.pInt(iPage) : 1; sSearch = Utils.pString(sSearch); - var sResult = this.sBase + 'mailbox/'; + var + sResult = this.sBase + 'mailbox/', + iThreadUid = Utils.pInt(sThreadUid) + ; + if ('' !== sFolder) { - sResult += encodeURI(sFolder); + sResult += encodeURI(sFolder) + (0 < iThreadUid ? '|' + iThreadUid : ''); } + if (1 < iPage) { sResult = sResult.replace(/[\/]+$/, ''); sResult += '/p' + iPage; } + if ('' !== sSearch) { sResult = sResult.replace(/[\/]+$/, ''); diff --git a/dev/Remote/User/Ajax.js b/dev/Remote/User/Ajax.js index 6e77f856e..e7c8ee969 100644 --- a/dev/Remote/User/Ajax.js +++ b/dev/Remote/User/Ajax.js @@ -332,10 +332,10 @@ * @param {number=} iOffset = 0 * @param {number=} iLimit = 20 * @param {string=} sSearch = '' - * @param {boolean=} bSilent = false * @param {string=} sThreadUid = '' + * @param {boolean=} bSilent = false */ - RemoteUserAjax.prototype.messageList = function (fCallback, sFolderFullNameRaw, iOffset, iLimit, sSearch, bSilent, sThreadUid) + RemoteUserAjax.prototype.messageList = function (fCallback, sFolderFullNameRaw, iOffset, iLimit, sSearch, sThreadUid, bSilent) { sFolderFullNameRaw = Utils.pString(sFolderFullNameRaw); diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index 64bb526cf..c69dce10a 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -75,15 +75,23 @@ MailBoxUserScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch) { var - sFolderFullNameRaw = Cache.getFolderFullNameRaw(sFolderHash), - oFolder = Cache.getFolderFromCacheList(sFolderFullNameRaw) + sThreadUid = sFolderHash.replace(/^(.+)\|([\d]+)$/, '$2'), + oFolder = Cache.getFolderFromCacheList(Cache.getFolderFullNameRaw( + sFolderHash.replace(/\|([\d]+)$/, ''))) ; if (oFolder) { + if (sFolderHash === sThreadUid) + { + sThreadUid = ''; + } + FolderStore.currentFolder(oFolder); + MessageStore.messageListPage(iPage); MessageStore.messageListSearch(sSearch); + MessageStore.messageListThreadUid(sThreadUid); require('App/User').reloadMessageList(); } diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js index 55c503324..becf5fea4 100644 --- a/dev/Stores/User/Message.js +++ b/dev/Stores/User/Message.js @@ -41,6 +41,7 @@ this.messageListCount = ko.observable(0); this.messageListSearch = ko.observable(''); + this.messageListThreadUid = ko.observable(''); this.messageListPage = ko.observable(1); this.messageListError = ko.observable(''); @@ -813,6 +814,7 @@ this.messageListCount(iCount); this.messageListSearch(Utils.isNormal(oData.Result.Search) ? oData.Result.Search : ''); this.messageListPage(window.Math.ceil((iOffset / SettingsStore.messagesPerPage()) + 1)); + this.messageListThreadUid(Utils.isNormal(oData.Result.ThreadUid) ? Utils.pString(oData.Result.ThreadUid) : ''); this.messageListEndFolder(Utils.isNormal(oData.Result.Folder) ? oData.Result.Folder : ''); this.messageListEndSearch(Utils.isNormal(oData.Result.Search) ? oData.Result.Search : ''); diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index cd254167f..7eab8a1fc 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -62,6 +62,7 @@ this.selectorMessageFocused = MessageStore.selectorMessageFocused; this.isMessageSelected = MessageStore.isMessageSelected; this.messageListSearch = MessageStore.messageListSearch; + this.messageListThreadUid = MessageStore.messageListThreadUid; this.messageListError = MessageStore.messageListError; this.folderMenuForMove = FolderStore.folderMenuForMove; @@ -611,7 +612,8 @@ kn.setHash(Links.mailBox( FolderStore.currentFolderFullNameHash(), oPage.value, - MessageStore.messageListSearch() + MessageStore.messageListSearch(), + MessageStore.messageListThreadUid() )); } }; diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php index f3f0041a1..e2450810d 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php @@ -1911,6 +1911,88 @@ class MailClient return $oMessageCollection->GetAsArray(); } + /** + * @param \MailSo\Cache\CacheClient|null $oCacher + * @param string $sSearch + * @param string $sFolderName + * @param string $sFolderHash + * + * @return array + * + * @throws \MailSo\Base\Exceptions\InvalidArgumentException + * @throws \MailSo\Net\Exceptions\Exception + * @throws \MailSo\Imap\Exceptions\Exception + */ + public function GetUids($oCacher, $sSearch, $sFolderName, $sFolderHash) + { + $aResultUids = false; + $bUidsFromCacher = false; + $bUseCacheAfterSearch = true; + + $sSerializedHash = ''; + $sSerializedLog = ''; + + $bUseSortIfSupported = !!$this->oImapClient->IsSupported('SORT'); + + if (0 < \strlen($sSearch)) + { + $bUseSortIfSupported = false; + } + + $sSearchCriterias = $this->getImapSearchCriterias($sSearch, 0, $bUseCacheAfterSearch); + if ($bUseCacheAfterSearch && $oCacher && $oCacher->IsInited()) + { + $sSerializedHash = 'GetUids/'. + ($bUseSortIfSupported ? 'S': 'N').'/'. + $this->GenerateImapClientHash().'/'. + $sFolderName.'/'.$sSearchCriterias; + + $sSerializedLog = '"'.$sFolderName.'" / '.$sSearchCriterias.''; + + $sSerialized = $oCacher->Get($sSerializedHash); + if (!empty($sSerialized)) + { + $aSerialized = @\json_decode($sSerialized, true); + if (\is_array($aSerialized) && isset($aSerialized['FolderHash'], $aSerialized['Uids']) && + $sFolderHash === $aSerialized['FolderHash'] && + \is_array($aSerialized['Uids']) + ) + { + if ($this->oLogger) + { + $this->oLogger->Write('Get Serialized UIDS from cache ('.$sSerializedLog.') [count:'.\count($aSerialized['Uids']).']'); + } + + $aResultUids = $aSerialized['Uids']; + $bUidsFromCacher = true; + } + } + } + + if (!\is_array($aResultUids)) + { + $aResultUids = $bUseSortIfSupported ? + $this->oImapClient->MessageSimpleSort(array('REVERSE ARRIVAL'), $sSearchCriterias, true) : + $this->oImapClient->MessageSimpleSearch($sSearchCriterias, true) + ; + + if (!$bUidsFromCacher && $bUseCacheAfterSearch && \is_array($aResultUids) && $oCacher && $oCacher->IsInited() && 0 < \strlen($sSerializedHash)) + { + $oCacher->Set($sSerializedHash, @\json_encode(array( + 'FolderHash' => $sFolderHash, + 'Uids' => $aResultUids + ))); + + if ($this->oLogger) + { + $this->oLogger->Write('Save Serialized UIDS to cache ('.$sSerializedLog.') [count:'.\count($aResultUids).']'); + } + } + } + + return $aResultUids; + } + /** * @param string $sFolderName * @param int $iOffset = 0 @@ -1930,8 +2012,7 @@ class MailClient * @throws \MailSo\Imap\Exceptions\Exception */ public function MessageList($sFolderName, $iOffset = 0, $iLimit = 10, $sSearch = '', $sPrevUidNext = '', $oCacher = null, - $bUseSortIfSupported = false, $bUseThreadSortIfSupported = false, $bUseESearchOrESortRequest = false, - $sThreadUid = '') + $bUseSortIfSupported = false, $bUseThreadSortIfSupported = false, $sThreadUid = '') { $sSearch = \trim($sSearch); if (!\MailSo\Base\Validator::RangeInt($iOffset, 0) || @@ -1947,10 +2028,14 @@ class MailClient $oMessageCollection->Offset = $iOffset; $oMessageCollection->Limit = $iLimit; $oMessageCollection->Search = $sSearch; + $oMessageCollection->ThreadUid = $sThreadUid; - $aThreads = array(); + $aUids = array(); + $mAllSortedUids = null; + $mAllThreads = null; + + $iThreadUid = empty($sThreadUid) ? 0 : (int) $sThreadUid; - $iMessageCount = 0; $iMessageRealCount = 0; $iMessageUnseenCount = 0; $sUidNext = '0'; @@ -1971,11 +2056,15 @@ class MailClient } $this->initFolderValues($sFolderName, $iMessageRealCount, $iMessageUnseenCount, $sUidNext); - $iMessageCount = $iMessageRealCount; $oMessageCollection->FolderHash = $this->GenerateFolderHash($sFolderName, $iMessageRealCount, $iMessageUnseenCount, $sUidNext); $oMessageCollection->UidNext = $sUidNext; - $oMessageCollection->NewMessages = $this->getFolderNextMessageInformation($sFolderName, $sPrevUidNext, $sUidNext); + + if (empty($sThreadUid) && 0 < \strlen($sPrevUidNext) && 'INBOX' === $sFolderName) + { + $oMessageCollection->NewMessages = $this->getFolderNextMessageInformation( + $sFolderName, $sPrevUidNext, $sUidNext); + } $bSearch = false; $bMessageListOptimization = 0 < \MailSo\Config::$MessageListCountLimitTrigger && @@ -1985,104 +2074,98 @@ class MailClient { $bUseSortIfSupported = false; $bUseThreadSortIfSupported = false; - $bUseESearchOrESortRequest = false; } if (0 < $iMessageRealCount) { - $bIndexAsUid = false; - $aIndexOrUids = array(); + $mAllSortedUids = $this->GetUids($oCacher, '', $oMessageCollection->FolderName, $oMessageCollection->FolderHash); -// $mThreads = $this->MessageListThreadsMap($sFolderName, $sFolderHash, array(), $oCacher, true); -// if (\is_array($mThreads)) -// { -// -// } + $mAllThreads = $bUseThreadSortIfSupported ? $this->MessageListThreadsMap( + $oMessageCollection->FolderName, $oMessageCollection->FolderHash, $mAllSortedUids, $oCacher) : null; - if (0 < \strlen($sSearch)) + if ($bUseThreadSortIfSupported && 0 < $iThreadUid && \is_array($mAllThreads)) { - $aIndexOrUids = $this->getSearchUidsResult($sSearch, - $oMessageCollection->FolderName, $oMessageCollection->FolderHash, - $bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher); + $aUids = array(); + $aUids = \is_array($mAllThreads[$iThreadUid]) ? + $mAllThreads[$iThreadUid] : array(); - $bIndexAsUid = true; + if (\in_array($iThreadUid, $mAllSortedUids)) + { + \array_unshift($aUids, $iThreadUid); + } + } + else if ($bUseThreadSortIfSupported && \is_array($mAllThreads)) + { + $aUids = \array_keys($mAllThreads); } else { - if ($bUseThreadSortIfSupported && 1 < $iMessageCount) + $bUseThreadSortIfSupported = false; + $aUids = $mAllSortedUids; + } + + if (0 < \strlen($sSearch) && \is_array($aUids)) + { + $aSearchedUids = $this->GetUids($oCacher, $sSearch, $oMessageCollection->FolderName, $oMessageCollection->FolderHash); + if (\is_array($aSearchedUids) && 0 < \count($aSearchedUids)) { - $aIndexOrUids = $this->getSearchUidsResult('', - $oMessageCollection->FolderName, $oMessageCollection->FolderHash, - $bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher); + $aFlippedSearchedUids = \array_flip($aSearchedUids); - $aThreads = $this->MessageListThreadsMap( - $oMessageCollection->FolderName, $oMessageCollection->FolderHash, - $aIndexOrUids, $oCacher); + $bSearch = true; + $aNewUids = array(); - $aNewIndexOrUids = array(); - foreach ($aIndexOrUids as $iUid) + foreach ($aUids as $iUid) { - if (isset($aThreads[$iUid])) + if (isset($aFlippedSearchedUids[$iUid])) { - $aNewIndexOrUids[] = $iUid; + $aNewUids[] = $iUid; + } + else if ($bUseThreadSortIfSupported && 0 === $iThreadUid && isset($mAllThreads[$iUid]) && \is_array($mAllThreads[$iUid])) + { + foreach ($mAllThreads[$iUid] as $iSubUid) + { + if (isset($aFlippedSearchedUids[$iSubUid])) + { + $aNewUids[] = $iUid; + continue; + } + } } } - $aIndexOrUids = $aNewIndexOrUids; - unset($aNewIndexOrUids); - - $iMessageCount = \count($aIndexOrUids); - $bIndexAsUid = true; + $aUids = \array_unique($aNewUids); + unset($aNewUids); } else { - $aIndexOrUids = array(1); - $bIndexAsUid = false; - - if (1 < $iMessageCount) - { - if (0 === \MailSo\Config::$MessageListDateFilter && - ($bMessageListOptimization || !$bUseSortIfSupported)) - { - $aIndexOrUids = \array_reverse(\range(1, $iMessageCount)); - } - else - { - $aIndexOrUids = $this->getSearchUidsResult('', - $oMessageCollection->FolderName, $oMessageCollection->FolderHash, - $bUseSortIfSupported, $bUseESearchOrESortRequest, $oCacher); - - $bIndexAsUid = true; - } - } + $aUids = array(); } } - if (\is_array($aIndexOrUids)) + if (\is_array($aUids)) { $oMessageCollection->MessageCount = $iMessageRealCount; $oMessageCollection->MessageUnseenCount = $iMessageUnseenCount; - $oMessageCollection->MessageResultCount = 0 === \strlen($sSearch) - ? $iMessageCount : \count($aIndexOrUids); + $oMessageCollection->MessageResultCount = \count($aUids); - if (0 < \count($aIndexOrUids)) + if (0 < \count($aUids)) { $iOffset = (0 > $iOffset) ? 0 : $iOffset; - $aRequestIndexOrUids = \array_slice($aIndexOrUids, $iOffset, $iLimit); + $aRequestUids = \array_slice($aUids, $iOffset, $iLimit); - $this->MessageListByRequestIndexOrUids($oMessageCollection, $aRequestIndexOrUids, $bIndexAsUid); + $this->MessageListByRequestIndexOrUids($oMessageCollection, $aRequestUids, true); } } } - if (!$bSearch && $bUseThreadSortIfSupported && 0 < \count($aThreads)) + if ($bUseThreadSortIfSupported && 0 === $iThreadUid && \is_array($mAllThreads) && 0 < \count($mAllThreads)) { - $oMessageCollection->ForeachList(function (/* @var $oMessage \MailSo\Mail\Message */ $oMessage) use ($aThreads) { + $oMessageCollection->ForeachList(function (/* @var $oMessage \MailSo\Mail\Message */ $oMessage) use ($mAllThreads) { $iUid = $oMessage->Uid(); - if (isset($aThreads[$iUid]) && \is_array($aThreads[$iUid]) && 0 < \count($aThreads[$iUid])) + if (isset($mAllThreads[$iUid]) && \is_array($mAllThreads[$iUid]) && 0 < \count($mAllThreads[$iUid])) { - $aSubThreads = $aThreads[$iUid]; + $aSubThreads = $mAllThreads[$iUid]; \array_unshift($aSubThreads, $iUid); $oMessage->SetThreads(\array_map('trim', $aSubThreads)); diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php index 34c8cf884..ec176924a 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php @@ -62,6 +62,11 @@ class MessageCollection extends \MailSo\Base\Collection */ public $UidNext; + /** + * @var string + */ + public $ThreadUid; + /** * @var array */ @@ -108,8 +113,9 @@ class MessageCollection extends \MailSo\Base\Collection $this->Limit = 0; $this->Search = ''; $this->UidNext = ''; + $this->ThreadUid = ''; $this->NewMessages = array(); - + $this->LastCollapsedThreadUids = array(); return $this; diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 0946c1682..37aa0afc0 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -5564,7 +5564,7 @@ class Actions $sFolder, $iOffset, $iLimit, $sSearch, $sUidNext, $this->cacherForUids(), !!$this->Config()->Get('labs', 'use_imap_sort', false), - $bUseThreads, !!$this->Config()->Get('labs', 'use_imap_esearch_esort', false), + $bUseThreads, $sThreadUid ); } @@ -9372,8 +9372,8 @@ class Actions 'Folder' => $mResponse->FolderName, 'FolderHash' => $mResponse->FolderHash, 'UidNext' => $mResponse->UidNext, + 'ThreadUid' => $mResponse->ThreadUid, 'NewMessages' => $this->responseObject($mResponse->NewMessages), -// 'LastCollapsedThreadUids' => $mResponse->LastCollapsedThreadUids, 'Offset' => $mResponse->Offset, 'Limit' => $mResponse->Limit, 'Search' => $mResponse->Search diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 64eca8f7b..8dcb131ce 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -282,7 +282,6 @@ Enables caching in the system'), 'use_app_debug_js' => array(false), 'use_app_debug_css' => array(false), 'use_imap_sort' => array(true), - 'use_imap_esearch_esort' => array(true), 'use_imap_force_selection' => array(false), 'use_imap_list_subscribe' => array(true), 'use_imap_thread' => array(true), From 03d26bc4c638fea94c0e22f271f0d9c6efcc8169 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Tue, 21 Apr 2015 02:39:14 +0400 Subject: [PATCH 005/106] New thread list logic (step 2) --- dev/App/User.js | 13 -- dev/Common/Links.js | 2 +- dev/Common/Selector.js | 9 +- dev/Promises/User/Ajax.js | 34 --- dev/Remote/User/Ajax.js | 42 ---- dev/Screen/User/MailBox.js | 12 +- dev/Stores/User/Message.js | 50 +--- dev/Styles/MessageList.less | 24 +- dev/Styles/_FontasticToBoot.less | 2 +- dev/View/User/MailBox/MessageList.js | 49 ++++ dev/View/User/MailBox/MessageView.js | 221 +----------------- .../app/libraries/MailSo/Mail/MailClient.php | 11 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 75 +----- .../Common/PopupsKeyboardShortcutsHelp.html | 16 +- .../templates/Views/User/MailMessageList.html | 10 +- .../Views/User/MailMessageListItem.html | 11 +- .../MailMessageListItemNoPreviewPane.html | 11 +- .../templates/Views/User/MailMessageView.html | 64 ----- 18 files changed, 139 insertions(+), 517 deletions(-) diff --git a/dev/App/User.js b/dev/App/User.js index bb622b736..55efe8b3f 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -153,20 +153,7 @@ Cache.initMessageFlagsFromCache(oMessage); }); - _.each(MessageStore.messageThreadList(), function (oMessage) { - Cache.initMessageFlagsFromCache(oMessage); - }); - Cache.initMessageFlagsFromCache(MessageStore.message()); - - this.reloadFlagsCurrentMessageThreadListFromCache(); - }; - - AppUser.prototype.reloadFlagsCurrentMessageThreadListFromCache = function () - { - _.each(MessageStore.messageThreadList(), function (oMessage) { - Cache.initMessageFlagsFromCache(oMessage); - }); }; /** diff --git a/dev/Common/Links.js b/dev/Common/Links.js index ac0e57c7c..1383694e8 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -272,7 +272,7 @@ if ('' !== sFolder) { - sResult += encodeURI(sFolder) + (0 < iThreadUid ? '|' + iThreadUid : ''); + sResult += encodeURI(sFolder) + (0 < iThreadUid ? '~' + iThreadUid : ''); } if (1 < iPage) diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js index 0918e42b1..be7ed462c 100644 --- a/dev/Common/Selector.js +++ b/dev/Common/Selector.js @@ -633,13 +633,20 @@ var iOffset = 20, + aList = this.list(), oFocused = $(this.sItemFocusedSelector, this.oContentScrollable), oPos = oFocused.position(), iVisibleHeight = this.oContentVisible.height(), iFocusedHeight = oFocused.outerHeight() ; - if (oPos && (oPos.top < 0 || oPos.top + iFocusedHeight > iVisibleHeight)) + if (aList && aList[0] && aList[0].focused()) + { + this.oContentScrollable.scrollTop(0); + + return true; + } + else if (oPos && (oPos.top < 0 || oPos.top + iFocusedHeight > iVisibleHeight)) { if (oPos.top < 0) { diff --git a/dev/Promises/User/Ajax.js b/dev/Promises/User/Ajax.js index 6dec2b76f..e37362cfa 100644 --- a/dev/Promises/User/Ajax.js +++ b/dev/Promises/User/Ajax.js @@ -29,44 +29,10 @@ function UserAjaxUserPromises() { AbstractAjaxPromises.call(this); - - this.messageListSimpleHash = ''; - this.messageListSimpleCache = null; } _.extend(UserAjaxUserPromises.prototype, AbstractAjaxPromises.prototype); - UserAjaxUserPromises.prototype.messageListSimple = function (sFolder, aUids, fTrigger) - { - var self = this, sHash = sFolder + '~' + aUids.join('/'); - if (sHash === this.messageListSimpleHash && this.messageListSimpleCache) - { - return this.fastResolve(this.messageListSimpleCache); - } - - return this.abort('MessageListSimple') - .postRequest('MessageListSimple', fTrigger, { - 'Folder': sFolder, - 'Uids': aUids - }).then(function (oData) { - - self.messageListSimpleHash = sHash; - self.messageListSimpleCache = _.compact(_.map(oData.Result, function (aItem) { - return MessageSimpleModel.newInstanceFromJson(aItem); - })); - - return self.messageListSimpleCache; - - }, function (iError) { - - self.messageListSimpleHash = ''; - self.messageListSimpleCache = null; - - return self.fastReject(iError); - }) - ; - }; - UserAjaxUserPromises.prototype.foldersReload = function (fTrigger) { return this.abort('Folders') diff --git a/dev/Remote/User/Ajax.js b/dev/Remote/User/Ajax.js index e7c8ee969..9aa3408f0 100644 --- a/dev/Remote/User/Ajax.js +++ b/dev/Remote/User/Ajax.js @@ -313,19 +313,6 @@ }); }; - /** - * @param {?Function} fCallback - * @param {string} sFolderFullNameRaw - * @param {Array} aUids - */ - RemoteUserAjax.prototype.messageListSimple = function (fCallback, sFolderFullNameRaw, aUids) - { - return this.defaultRequest(fCallback, 'MessageListSimple', { - 'Folder': Utils.pString(sFolderFullNameRaw), - 'Uids': aUids - }, Consts.Defaults.DefaultAjaxTimeout, '', ['MessageListSimple']); - }; - /** * @param {?Function} fCallback * @param {string} sFolderFullNameRaw @@ -420,35 +407,6 @@ return false; }; - /** - * @param {?Function} fCallback - * @param {string} sFolderFullNameRaw - * @param {number} iUid - * @return {boolean} - */ - RemoteUserAjax.prototype.messageThreadsFromCache = function (fCallback, sFolderFullNameRaw, iUid) - { - sFolderFullNameRaw = Utils.pString(sFolderFullNameRaw); - iUid = Utils.pInt(iUid); - - if (Cache.getFolderFromCacheList(sFolderFullNameRaw) && 0 < iUid) - { - var sFolderHash = Cache.getFolderHash(sFolderFullNameRaw); - if (sFolderHash) - { - this.defaultRequest(fCallback, 'MessageThreadsFromCache', { - 'Folder': sFolderFullNameRaw, - 'FolderHash': sFolderHash, - 'Uid': iUid - }); - - return true; - } - } - - return false; - }; - /** * @param {?Function} fCallback * @param {Array} aExternals diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js index c69dce10a..a08625507 100644 --- a/dev/Screen/User/MailBox.js +++ b/dev/Screen/User/MailBox.js @@ -75,9 +75,9 @@ MailBoxUserScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch) { var - sThreadUid = sFolderHash.replace(/^(.+)\|([\d]+)$/, '$2'), + sThreadUid = sFolderHash.replace(/^(.+)~([\d]+)$/, '$2'), oFolder = Cache.getFolderFromCacheList(Cache.getFolderFullNameRaw( - sFolderHash.replace(/\|([\d]+)$/, ''))) + sFolderHash.replace(/~([\d]+)$/, ''))) ; if (oFolder) @@ -88,7 +88,7 @@ } FolderStore.currentFolder(oFolder); - + MessageStore.messageListPage(iPage); MessageStore.messageListSearch(sSearch); MessageStore.messageListThreadUid(sThreadUid); @@ -171,9 +171,9 @@ ; return [ - [/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}], - [/^([a-zA-Z0-9]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}], - [/^([a-zA-Z0-9]+)\/(.+)\/?$/, {'normalize_': fNormD}], + [/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)\/(.+)\/?$/, {'normalize_': fNormS}], + [/^([a-zA-Z0-9~]+)\/p([1-9][0-9]*)$/, {'normalize_': fNormS}], + [/^([a-zA-Z0-9~]+)\/(.+)\/?$/, {'normalize_': fNormD}], [/^([^\/]*)$/, {'normalize_': fNormS}] ]; }; diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js index becf5fea4..2632a5f9a 100644 --- a/dev/Stores/User/Message.js +++ b/dev/Stores/User/Message.js @@ -43,10 +43,12 @@ this.messageListSearch = ko.observable(''); this.messageListThreadUid = ko.observable(''); this.messageListPage = ko.observable(1); + this.messageListPageBeforeThread = ko.observable(1); this.messageListError = ko.observable(''); this.messageListEndFolder = ko.observable(''); this.messageListEndSearch = ko.observable(''); + this.messageListEndThreadUid = ko.observable(''); this.messageListEndPage = ko.observable(1); this.messageListLoading = ko.observable(false); @@ -64,17 +66,12 @@ this.message.viewTrigger = ko.observable(false); - this.messageThreadList = ko.observableArray([]); - - this.messageLastThreadUidsData = ko.observable(null); - this.messageError = ko.observable(''); this.messageCurrentLoading = ko.observable(false); - this.messageThreadLoading = ko.observable(false); this.messageLoading = ko.computed(function () { - return !!(this.messageCurrentLoading() || this.messageThreadLoading()); + return this.messageCurrentLoading(); }, this); this.messageLoadingThrottle = ko.observable(false).extend({'throttle': 50}); @@ -94,8 +91,12 @@ MessageUserStore.prototype.computers = function () { + var self = this; + this.messageListEndHash = ko.computed(function () { - return this.messageListEndFolder() + '|' + this.messageListEndSearch() + '|' + this.messageListEndPage(); + return this.messageListEndFolder() + '|' + this.messageListEndSearch() + + '|' + this.messageListEndThreadUid() + + '|' + this.messageListEndPage(); }, this); this.messageListPageCount = ko.computed(function () { @@ -108,7 +109,8 @@ 'read': this.messageListSearch, 'write': function (sValue) { kn.setHash(Links.mailBox( - FolderStore.currentFolderFullNameHash(), 1, Utils.trim(sValue.toString()) + FolderStore.currentFolderFullNameHash(), 1, + Utils.trim(sValue.toString()), self.messageListThreadUid() )); }, 'owner': this @@ -666,14 +668,6 @@ } }; - MessageUserStore.prototype.selectThreadMessage = function (sFolder, sUid) - { - if (Remote.message(this.onMessageResponse, sFolder, sUid)) - { - this.messageThreadLoading(true); - } - }; - MessageUserStore.prototype.populateMessageBody = function (oMessage) { if (oMessage) @@ -695,7 +689,6 @@ this.hideMessageBodies(); this.messageCurrentLoading(false); - this.messageThreadLoading(false); if (Enums.StorageResultType.Success === sResult && oData && oData.Result) { @@ -817,7 +810,8 @@ this.messageListThreadUid(Utils.isNormal(oData.Result.ThreadUid) ? Utils.pString(oData.Result.ThreadUid) : ''); this.messageListEndFolder(Utils.isNormal(oData.Result.Folder) ? oData.Result.Folder : ''); - this.messageListEndSearch(Utils.isNormal(oData.Result.Search) ? oData.Result.Search : ''); + this.messageListEndSearch(this.messageListSearch()); + this.messageListEndThreadUid(this.messageListThreadUid()); this.messageListEndPage(this.messageListPage()); this.messageListDisableAutoSelect(true); @@ -827,26 +821,6 @@ Cache.clearNewMessageCache(); - if (AppStore.threadsAllowed() && SettingsStore.useThreads()) - { - oMessage = this.message(); - if (oMessage) - { - Remote.messageThreadsFromCache(function (sResult, oData) { - - if (Enums.StorageResultType.Success === sResult && oData && oData.Result && oData.Result.ThreadUids) - { - self.messageLastThreadUidsData({ - 'Folder': oData.Result.Folder, - 'Uid': oData.Result.Uid, - 'Uids': oData.Result.ThreadUids - }); - } - - }, oMessage.folderFullNameRaw, oMessage.uid); - } - } - if (oFolder && (bCached || bUnreadCountChange || SettingsStore.useThreads())) { require('App/User').folderInformation(oFolder.fullNameRaw, aList); diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less index 4c7dba60a..eba936ca0 100644 --- a/dev/Styles/MessageList.less +++ b/dev/Styles/MessageList.less @@ -178,6 +178,15 @@ html.rl-no-preview-pane { border-bottom: 1px solid #eee; } + .listThreadUidDesc { + font-size: 16px; + padding: 7px 20px 5px 20px; + border-bottom: 1px solid #eee; + background-color: #FCF8E3; + cursor: pointer; + text-align: center; + } + .delimiter { display: block; height: 1px; @@ -313,6 +322,12 @@ html.rl-no-preview-pane { &.e-single-line .dateParent { } + .threadsParent { + display: inline-block; + float: right; + position: relative; + } + .attachmentParent { display: inline-block; float: right; @@ -398,8 +413,13 @@ html.rl-no-preview-pane { background-color: #999; color: #fff; border-radius: 6px; - padding: 1px 6px 1px 5px; - margin-right: 5px; + padding: 1px 2px 1px 5px; + margin-right: 2px; + + [class^="icon-"], + [class*=" icon-"] { + font-size: 14px; + } } } diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less index 9e61f787a..70b25dae9 100644 --- a/dev/Styles/_FontasticToBoot.less +++ b/dev/Styles/_FontasticToBoot.less @@ -142,7 +142,7 @@ border-color: transparent; border-top-color: #999; - animation: rotation .8s infinite linear; + animation: rotation .8s infinite ease-in-out; } &.big { diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 7eab8a1fc..373e5dc27 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -70,6 +70,7 @@ this.mainMessageListSearch = MessageStore.mainMessageListSearch; this.messageListEndFolder = MessageStore.messageListEndFolder; + this.messageListEndThreadUid = MessageStore.messageListEndThreadUid; this.messageListChecked = MessageStore.messageListChecked; this.messageListCheckedOrSelected = MessageStore.messageListCheckedOrSelected; @@ -389,6 +390,15 @@ this.inputMessageListSearchFocus(false); }; + MessageListMailBoxUserView.prototype.cancelThreadUid = function () + { + kn.setHash(Links.mailBox( + FolderStore.currentFolderFullNameHash(), + MessageStore.messageListPageBeforeThread(), + MessageStore.messageListSearch() + )); + }; + /** * @param {string} sToFolderFullNameRaw * @param {boolean} bCopy @@ -618,6 +628,21 @@ } }; + MessageListMailBoxUserView.prototype.gotoThread = function (oMessage) + { + if (oMessage) + { + MessageStore.messageListPageBeforeThread(MessageStore.messageListPage()); + + kn.setHash(Links.mailBox( + FolderStore.currentFolderFullNameHash(), + 1, + MessageStore.messageListSearch(), + oMessage.uid + )); + } + }; + MessageListMailBoxUserView.prototype.onBuild = function (oDom) { var self = this; @@ -643,6 +668,9 @@ .on('click', '.messageList .messageListItem .flagParent', function () { self.flagMessages(ko.dataFor(this)); }) + .on('click', '.messageList .messageListItem .threads-len', function () { + self.gotoThread(ko.dataFor(this)); + }) ; this.initUploaderForAppend(); @@ -725,6 +753,22 @@ return false; }); + key('t', [Enums.KeyState.MessageList], function () { + + var oMessage = self.selectorMessageSelected(); + if (!oMessage) + { + oMessage = self.selectorMessageFocused(); + } + + if (oMessage && 0 < oMessage.threadsLen()) + { + self.gotoThread(oMessage); + } + + return false; + }); + // move key('m', Enums.KeyState.MessageList, function () { self.moveDropdownTrigger(true); @@ -761,6 +805,11 @@ self.cancelSearch(); return false; } + else if ('' !== self.messageListEndThreadUid()) + { + self.cancelThreadUid(); + return false; + } }); // change focused state diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index fdba28c18..c6399e990 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -229,164 +229,6 @@ this.viewIsImportant = ko.observable(false); this.viewIsFlagged = ko.observable(false); -// THREADS - this.viewThreads = ko.observableArray([]); - this.viewThreads.trigger = ko.observable(false); - - this.viewThreadMessages = MessageStore.messageThreadList; - - this.viewThreadMessages.error = ko.observable(''); - this.viewThreadMessages.showMore = ko.observable(false); - this.viewThreadMessages.limit = 6; - - this.viewThreadMessages.subscribe(function (aList) { - - var iSelectedIndex = -1; - - this.viewThreadMessages.error(''); - if (aList && 0 < aList.length) - { - _.each(aList, function (oM, iIndex) { - if (oM && oM.selected()) - { - iSelectedIndex = iIndex; - } - }); - - this.viewThreadMessages.showMore(this.viewThreadMessages.limit >= aList.length); - - if (-1 < iSelectedIndex && !this.viewThreadMessages.showMore() && - this.viewThreadMessages.limit < iSelectedIndex) - { - this.viewThreadMessages.showMore(true); - } - - this.selectSelectedThreadMessage(); - require('App/User').reloadFlagsCurrentMessageListAndMessageFromCache(); - } - - }, this); - - MessageStore.messageLastThreadUidsData.subscribe(function (oData) { - if (oData && oData['Uids']) - { - oData['Uid'] = Utils.pString(oData['Uid']); - if (this.viewFolder === oData['Folder'] && this.viewUid === oData['Uid']) - { - this.viewThreads(oData['Uids']); - this.viewThreads.trigger(!this.viewThreads.trigger()); - } - - var oMessage = MessageStore.message(); - if (oMessage && oMessage.folderFullNameRaw === oData['Folder'] && oMessage.uid === oData['Uid']) - { - oMessage.threads(oData['Uids']); - } - - oMessage = _.find(MessageStore.messageList(), function (oMessage) { - return oMessage && oMessage.folderFullNameRaw === oData['Folder'] && oMessage.uid === oData['Uid']; - }); - - if (oMessage && oMessage.folderFullNameRaw === oData['Folder'] && oMessage.uid === oData['Uid']) - { - oMessage.threads(oData['Uids']); - } - } - }, this); - - this.viewThreads.status = ko.computed(function () { - - this.viewThreads.trigger(); - - var - iIndex = 0, - aResult = [false, '', '', '', ''], - aThreads = this.viewThreads.peek(), - iLen = aThreads.length - ; - - if (1 < iLen) - { - iIndex = Utils.inArray(this.viewUid, aThreads); - if (-1 < iIndex) - { - aResult[0] = true; - aResult[1] = (iIndex + 1) + '/' + iLen; - aResult[2] = aThreads[iIndex]; - aResult[3] = 0 < iIndex && aThreads[iIndex - 1] ? aThreads[iIndex - 1] : ''; - aResult[4] = aThreads[iIndex + 1] ? aThreads[iIndex + 1] : ''; - } - } - - return aResult; - - }, this).extend({'notify': 'always'}); - - this.viewThreadsControlVisibility = ko.computed(function () { - return !!this.viewThreads.status()[0]; - }, this); - - this.viewThreadsControlDesc = ko.computed(function () { - return this.viewThreads.status()[1]; - }, this); - - this.viewThreadsControlBackAllow = ko.computed(function () { - return '' !== this.viewThreads.status()[4] && !this.messageLoadingThrottle(); - }, this); - - this.viewThreadsControlForwardAllow = ko.computed(function () { - return '' !== this.viewThreads.status()[3] && !this.messageLoadingThrottle(); - }, this); - - this.threadBackCommand = Utils.createCommand(this, function () { - var aStatus = this.viewThreads.status(); - this.openThreadMessage(aStatus[4]); - }, this.viewThreadsControlBackAllow); - - this.threadForwardCommand = Utils.createCommand(this, function () { - var aStatus = this.viewThreads.status(); - this.openThreadMessage(aStatus[3]); - }, this.viewThreadsControlForwardAllow); - - this.threadsDropdownTrigger = ko.observable(false); - - this.threadListCommand = Utils.createCommand(this, function () { - - var - self = this, - sFolder = this.viewFolder, - sUid = this.viewUid, - aUids = this.viewThreads(), - aStatus = this.viewThreads.status() - ; - - if (aStatus && aStatus[0]) - { - self.viewThreadMessages([]); - - Promises.messageListSimple(sFolder, aUids, this.messageListOfThreadsLoading).then(function (aList) { - - _.each(aList, function (oItem) { - if (oItem && oItem.uid) - { - oItem.selected(sUid === oItem.uid); - } - }); - - self.viewThreadMessages(aList); - - }).fail(function (iErrorCode) { - self.viewThreadMessages([]); - self.viewThreadMessages.error(Translator.getNotification( - iErrorCode, '', Enums.Notification.CantGetMessageList)); - }).done(); - } - - }, function () { - return !this.messageLoadingThrottle() && - !this.messageListOfThreadsLoading(); - }); - // PGP this.viewPgpPassword = ko.observable(''); this.viewPgpSignedVerifyStatus = ko.computed(function () { @@ -472,9 +314,6 @@ this.viewIsImportant(oMessage.isImportant()); this.viewIsFlagged(oMessage.flagged()); - this.viewThreads(oMessage.threads()); - this.viewThreads.trigger(!this.viewThreads.trigger()); - sLastEmail = oMessage.fromAsSingleEmail(); Cache.getUserPic(sLastEmail, function (sPic, sEmail) { if (sPic !== self.viewUserPic() && sLastEmail === sEmail) @@ -495,8 +334,6 @@ this.viewUid = ''; this.viewHash = ''; - this.viewThreads([]); - this.scrollMessageToTop(); } @@ -555,15 +392,6 @@ kn.extendAsViewModel(['View/User/MailBox/MessageView', 'View/App/MailBox/MessageView', 'MailBoxMessageViewViewModel'], MessageViewMailBoxUserView); _.extend(MessageViewMailBoxUserView.prototype, AbstractView.prototype); - MessageViewMailBoxUserView.prototype.openThreadMessage = function (sUid) - { - var oMessage = this.message(); - if (oMessage && sUid) - { - MessageStore.selectThreadMessage(oMessage.folderFullNameRaw, sUid); - } - }; - MessageViewMailBoxUserView.prototype.isPgpActionVisible = function () { return Enums.SignedVerifyStatus.Success !== this.viewPgpSignedVerifyStatus(); @@ -791,32 +619,6 @@ } } }) - .on('click', '.thread-list .more-threads', function (e) { - - var oLast = null; - if (!e || 0 === e.clientX) // probably enter - { - // It's a bad bad hack :( - oLast = $('.thread-list .e-item.thread-list-message.real-msg.more-that:first a.e-link', oDom); - } - - self.viewThreadMessages.showMore(true); - self.threadsDropdownTrigger(true); - - if (oLast && oLast[0]) - { - oLast.focus(); - } - - return false; - }) - .on('click', '.thread-list .thread-list-message', function () { - var oMessage = ko.dataFor(this); - if (oMessage && oMessage.folder && oMessage.uid) - { - self.openThreadMessage(oMessage.uid); - } - }) .on('click', '.attachmentsPlace .attachmentItem .attachmentNameParent', function () { var @@ -970,35 +772,16 @@ } }); - key('t', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { - if (MessageStore.message() && self.viewThreadsControlVisibility()) - { - self.threadsDropdownTrigger(true); - self.threadListCommand(); - return false; - } - }); - - key('ctrl+up, command+up', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { + key('ctrl+up, command+up, ctrl+left, command+left', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { self.goUpCommand(); return false; }); - key('ctrl+down, command+down', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { + key('ctrl+down, command+down, ctrl+right, command+right', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { self.goDownCommand(); return false; }); - key('ctrl+left, command+left', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { - self.threadForwardCommand(); - return false; - }); - - key('ctrl+right, command+right', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () { - self.threadBackCommand(); - return false; - }); - // print key('ctrl+p, command+p', Enums.KeyState.MessageView, function () { if (self.message()) diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php index e2450810d..14faa9903 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php @@ -1916,6 +1916,7 @@ class MailClient * @param string $sSearch * @param string $sFolderName * @param string $sFolderHash + * @param bool $bUseSortIfSupported = false * * @return array * @@ -1923,7 +1924,7 @@ class MailClient * @throws \MailSo\Net\Exceptions\Exception * @throws \MailSo\Imap\Exceptions\Exception */ - public function GetUids($oCacher, $sSearch, $sFolderName, $sFolderHash) + public function GetUids($oCacher, $sSearch, $sFolderName, $sFolderHash, $bUseSortIfSupported = false) { $aResultUids = false; $bUidsFromCacher = false; @@ -1932,7 +1933,7 @@ class MailClient $sSerializedHash = ''; $sSerializedLog = ''; - $bUseSortIfSupported = !!$this->oImapClient->IsSupported('SORT'); + $bUseSortIfSupported = $bUseSortIfSupported ? !!$this->oImapClient->IsSupported('SORT') : false; if (0 < \strlen($sSearch)) { @@ -2078,7 +2079,11 @@ class MailClient if (0 < $iMessageRealCount) { - $mAllSortedUids = $this->GetUids($oCacher, '', $oMessageCollection->FolderName, $oMessageCollection->FolderHash); + $mAllSortedUids = $this->GetUids($oCacher, '', $oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported); + + $bUseSortIfSupported = $bUseSortIfSupported ? $this->oImapClient->IsSupported('SORT') : false; + +// $bUseThreadSortIfSupported = $bUseThreadSortIfSupported ? $mAllThreads = $bUseThreadSortIfSupported ? $this->MessageListThreadsMap( $oMessageCollection->FolderName, $oMessageCollection->FolderHash, $mAllSortedUids, $oCacher) : null; diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 37aa0afc0..8183a243b 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -5455,45 +5455,6 @@ class Actions return $this->DefaultResponse(__FUNCTION__, $aResult); } - /** - * @return array - * - * @throws \MailSo\Base\Exceptions\Exception - */ - public function DoMessageThreadsFromCache() - { - $sFolder = $this->GetActionParam('Folder', ''); - $sFolderHash = $this->GetActionParam('FolderHash', ''); - $sUid = (string) $this->GetActionParam('Uid', ''); - - if (0 === \strlen($sFolder) || 0 === \strlen($sUid)) - { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); - } - - $aResult = array( - 'Folder' => $sFolder, - 'Uid' => $sUid, - 'FolderHash' => $sFolderHash, - 'ThreadUids' => null - ); - - $oCache = $this->cacherForUids(); - if ($oCache && $this->Config()->Get('labs', 'use_imap_thread', false)) - { - $aThreadUids = $this->MailClient()->MessageThreadUidsFromCache( - $sFolder, $sFolderHash, $sUid, $oCache - ); - - if (\is_array($aThreadUids) && 1 < \count($aThreadUids)) - { - $aResult['ThreadUids'] = $aThreadUids; - } - } - - return $this->DefaultResponse(__FUNCTION__, $aResult); - } - /** * @return array * @@ -5501,7 +5462,7 @@ class Actions */ public function DoMessageList() { -// \sleep(1); + \sleep(1); // throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList); $sFolder = ''; @@ -5581,40 +5542,6 @@ class Actions return $this->DefaultResponse(__FUNCTION__, $oMessageList); } - /** - * @return array - * - * @throws \MailSo\Base\Exceptions\Exception - */ - public function DoMessageListSimple() - { -// \sleep(2); -// throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList); - - $sFolder = $this->GetActionParam('Folder', ''); - $aUids = $this->GetActionParam('Uids', null); - - if (0 === \strlen($sFolder) || !\is_array($aUids)) - { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::InvalidInputArgument); - } - - $this->initMailClientConnection(); - - $aMessageList = array(); - - try - { - $aMessageList = $this->MailClient()->MessageListSimple($sFolder, $aUids); - } - catch (\Exception $oException) - { - throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList, $oException); - } - - return $this->DefaultResponse(__FUNCTION__, $aMessageList); - } - /** * @param \RainLoop\Model\Account $oAccount * @param bool $bWithDraftInfo = true diff --git a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html index 93b5391da..0ded19103 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html +++ b/rainloop/v/0.0.0/app/templates/Views/Common/PopupsKeyboardShortcutsHelp.html @@ -42,12 +42,12 @@ Ctrl + A, Cmd + A Z Delete, Shift + Delete, # + T M Q U I / - Esc Enter Enter →, Tab @@ -60,14 +60,12 @@ - - - - - - - - + + + + + +
Toggle fullscreen modeEnter
Toggle message blockquotesB
Next message in threadCtrl + ←, Cmd + ←
Previous message in threadCtrl + →, Cmd + →
PrintCtrl + P, Cmd + P
Exit fullscreen modeEsc
Close message (No preview pane layout)Esc
Switch focus back to message listTab, Shift + Tab, Esc
Enter
B
Ctrl + P, Cmd + P
Esc
Esc
Tab, Shift + Tab, Esc
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html index dbc806cfe..6c96d5104 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -137,12 +137,14 @@
+
+ +    + +
× - - : +
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItem.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItem.html index c269f835c..a83231b3a 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItem.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItem.html @@ -18,15 +18,20 @@
+
+ + + + + + +
    - - -  
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html index e8a81aa9c..e16ec903b 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageListItemNoPreviewPane.html @@ -7,6 +7,14 @@
+
+ + + + + + +
@@ -24,9 +32,6 @@
    - - -  
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html index ee19b8d48..a4310c4ac 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -188,67 +188,6 @@
-
- - - - -
- - - -