From c1c817c837b38a19c74812a6b3ff2cc1486794f9 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Tue, 31 Mar 2015 21:54:11 +0400 Subject: [PATCH] selector onUpUpOrDownDown event --- dev/Common/Selector.js | 13 +++++++++++++ dev/View/User/MailBox/MessageList.js | 3 +++ dev/View/User/MailBox/MessageView.js | 10 +--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js index 7aa53f4ab..0b6968268 100644 --- a/dev/Common/Selector.js +++ b/dev/Common/Selector.js @@ -401,6 +401,14 @@ return !!(this.oCallbacks['onAutoSelect'] || this.emptyTrueFunction)(); }; + /** + * @param {boolean} + */ + Selector.prototype.doUpUpOrDownDown = function (bUp) + { + (this.oCallbacks['onUpUpOrDownDown'] || this.emptyTrueFunction)(!!bUp); + }; + /** * @param {Object} oItem * @returns {string} @@ -484,6 +492,11 @@ } } }); + + if (!oResult && bForceSelect && (Enums.EventKeyCode.Down === iEventKeyCode || Enums.EventKeyCode.Up === iEventKeyCode)) + { + this.doUpUpOrDownDown(Enums.EventKeyCode.Up === iEventKeyCode); + } } else if (Enums.EventKeyCode.Home === iEventKeyCode || Enums.EventKeyCode.End === iEventKeyCode) { diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 6068c73ff..995e81fa3 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -255,6 +255,9 @@ return this.useAutoSelect(); }, this)); +// this.selector.on('onUpUpOrDownDown', _.bind(function (bV) { +// }, this)); + Events .sub('mailbox.message-list.selector.go-down', function () { this.selector.goDown(true); diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 4d97c63bd..7f04ec38a 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -474,15 +474,7 @@ }, this); this.fullScreenMode.subscribe(function (bValue) { - if (bValue) - { - Globals.$html.addClass('rl-message-fullscreen'); - } - else - { - Globals.$html.removeClass('rl-message-fullscreen'); - } - + Globals.$html.toggleClass('rl-message-fullscreen', bValue); Utils.windowResize(); });