From 16d2f46a310d10e529482fdce187c7e239e39347 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Thu, 19 Mar 2015 01:26:52 +0400 Subject: [PATCH] RC --- dev/Model/MessageFull.js | 29 +++++++++++-------- .../{MessageDynamic.js => MessageStates.js} | 27 +++++++++-------- dev/Styles/Compose.less | 20 ++++++++----- dev/View/Popup/Compose.js | 1 + package.json | 2 +- .../0.0.0/app/libraries/RainLoop/Actions.php | 4 +-- .../templates/Views/User/PopupsCompose.html | 6 ++-- 7 files changed, 51 insertions(+), 38 deletions(-) rename dev/Model/{MessageDynamic.js => MessageStates.js} (59%) diff --git a/dev/Model/MessageFull.js b/dev/Model/MessageFull.js index b975b7e1a..92bfa5623 100644 --- a/dev/Model/MessageFull.js +++ b/dev/Model/MessageFull.js @@ -47,6 +47,9 @@ this.attachmentsClass = ''; }; + /** + * @return {string} + */ MessageFullModel.prototype.getAttachmentsClass = function () { var sClass = ''; @@ -81,23 +84,25 @@ { var bResult = false; - if (oJson && 'Object/Message' === oJson['@Object'] && - MessageSimpleModel.prototype.initByJson.call(this, oJson)) + if (oJson && 'Object/Message' === oJson['@Object']) { - this.priority = Utils.pInt(oJson.Priority); - this.priority = Utils.inArray(this.priority, [Enums.MessagePriority.High, Enums.MessagePriority.Low]) ? - this.priority : Enums.MessagePriority.Normal; + if (MessageSimpleModel.prototype.initByJson.call(this, oJson)) + { + this.priority = Utils.pInt(oJson.Priority); + this.priority = Utils.inArray(this.priority, [Enums.MessagePriority.High, Enums.MessagePriority.Low]) ? + this.priority : Enums.MessagePriority.Normal; - this.hash = Utils.pString(oJson.Hash); - this.requestHash = Utils.pString(oJson.RequestHash); + this.hash = Utils.pString(oJson.Hash); + this.requestHash = Utils.pString(oJson.RequestHash); - this.proxy = !!oJson.ExternalProxy; + this.proxy = !!oJson.ExternalProxy; - this.hasAttachments = !!oJson.HasAttachments; - this.attachmentsMainType = Utils.pString(oJson.AttachmentsMainType); - this.attachmentsClass = this.getAttachmentsClass(); + this.hasAttachments = !!oJson.HasAttachments; + this.attachmentsMainType = Utils.pString(oJson.AttachmentsMainType); + this.attachmentsClass = this.getAttachmentsClass(); - bResult = true; + bResult = true; + } } return bResult; diff --git a/dev/Model/MessageDynamic.js b/dev/Model/MessageStates.js similarity index 59% rename from dev/Model/MessageDynamic.js rename to dev/Model/MessageStates.js index 7f9c3403b..cba0a2fd0 100644 --- a/dev/Model/MessageDynamic.js +++ b/dev/Model/MessageStates.js @@ -7,20 +7,20 @@ _ = require('_'), ko = require('ko'), - Enums = require('Common/Enums'), - Utils = require('Common/Utils'), +// Enums = require('Common/Enums'), +// Utils = require('Common/Utils'), +// +// MessageHelper = require('Helper/Message'), - MessageHelper = require('Helper/Message'), - - MessageSimpleModel = require('Model/MessageSimple') + AbstractModel = require('Knoin/AbstractModel') ; /** * @constructor */ - function MessageDynamicModel() + function MessageStatesModel() { - MessageSimpleModel.call(this, 'MessageDynamicModel'); + AbstractModel.call(this, 'MessageStatesModel'); this.flags = {}; this.states = {}; @@ -39,15 +39,18 @@ this.states.showReadReceipt = ko.observable(false); this.states.showExternalImages = ko.observable(false); - this.states.hasUnseenSubMessage = ko.observable(false); - this.states.hasFlaggedSubMessage = ko.observable(false); + this.states.hasUnseenSubMessages = ko.observable(false); + this.states.hasFlaggedSubMessages = ko.observable(false); this.threads = ko.observableArray([]); } - _.extend(MessageDynamicModel.prototype, MessageSimpleModel.prototype); + _.extend(MessageStatesModel.prototype, AbstractModel.prototype); - MessageDynamicModel.prototype.clear = function () + MessageStatesModel.prototype.flags = {}; + MessageStatesModel.prototype.states = {}; + + MessageStatesModel.prototype.clear = function () { this.flags.unseen(false); this.flags.deleted(false); @@ -58,6 +61,6 @@ this.threads([]); }; - module.exports = MessageDynamicModel; + module.exports = MessageStatesModel; }()); \ No newline at end of file diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less index 647ba6570..8c808a67f 100644 --- a/dev/Styles/Compose.less +++ b/dev/Styles/Compose.less @@ -182,19 +182,23 @@ .b-attachment-place { position: absolute; - height: 120px; + left: 5px; + right: 5px; + top: 5px; + bottom: 5px; + border: 2px #777 dashed; + z-index: 300; + line-height: 119px; text-align: center; - background-color: #fff; - z-index: 300; - left: 20px; - right: 20px; + background-color: #efefef; font-size: 24px; - &.drag-and-drop-over { - background: #777; - color: #fff; + border-radius: 10px; + + &.dragAndDropOver { + background-color: #fff; } } } \ No newline at end of file diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 16534d83a..ee185bea5 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -1609,6 +1609,7 @@ this.dragAndDropOver(false); }, this)) .on('onBodyDragEnter', _.bind(function () { + this.attachmentsPlace(true); this.dragAndDropVisible(true); }, this)) .on('onBodyDragLeave', _.bind(function () { diff --git a/package.json b/package.json index 86337bfe2..6e832e0e2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.8.2", - "release": "289", + "release": "290", "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 b1b668539..b67131867 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -1527,8 +1527,8 @@ class Actions $aResult['AllowDropboxSocial'] = (bool) $oConfig->Get('social', 'dropbox_enable', false); $aResult['DropboxApiKey'] = (string) $oConfig->Get('social', 'dropbox_api_key', ''); - $aResult['SubscriptionEnabled'] = \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain']) || - \MailSo\Base\Utils::ValidateIP($aResult['AdminDomain']); + $aResult['SubscriptionEnabled'] = \MailSo\Base\Utils::ValidateDomain($aResult['AdminDomain']); +// || \MailSo\Base\Utils::ValidateIP($aResult['AdminDomain']); $aResult['WeakPassword'] = $oConfig->ValidatePassword('12345'); $aResult['CoreAccess'] = $this->rainLoopCoreAccess(); diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html index db4f3294b..938f245df 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html @@ -155,9 +155,6 @@
-
- -