amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-20 22:05:57 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix reply and compose message links

Browse Source
This commit is contained in:
Francis Lachapelle
2015-12-07 14:07:48 -05:00
parent 04e0286992
commit ee71829134
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UI/Templates/MailerUI/UIxMailViewTemplate.wox
View File

@@ -111,7 +111,7 @@
</sg-avatar-image>
<div class="md-list-item-text">
<span>{{ viewer.message.from[0].name }}</span><br/>
<a class="md-caption" href="#"
<a href="#" class="md-caption"
ng-bind="viewer.message.from[0].email"
ng-click="viewer.newMessage($event, viewer.message.from[0])"><!-- from --></a>
</div>
@@ -122,17 +122,17 @@
<label class="pseudo-input-label">
<var:string label:value="To"/>
</label>
<div class="pseudo-input-field" ng-hide="viewer.message.$showDetailedRecipients">
<a href="#" ng-click="viewer.message.showDetailedRecipients()">{{viewer.message.$shortRecipients()}}</a>
<div class="pseudo-input-field" ng-hide="viewer.$showDetailedRecipients">
<a href="#" ng-click="viewer.showDetailedRecipients($event)">{{viewer.message.$shortRecipients()}}</a>
</div>
<div class="pseudo-input-field" ng-show="viewer.message.$showDetailedRecipients">
<div class="pseudo-input-field" ng-show="viewer.$showDetailedRecipients">
<span ng-repeat="recipient in viewer.message.to">
<a href="#" ng-bind="recipient.full"
ng-click="viewer.newMessage($event, recipient)"><!-- recipient --></a>
</span>
</div>
</div>
<div class="pseudo-input-container--compact" ng-show="viewer.message.$showDetailedRecipients">
<div class="pseudo-input-container--compact" ng-show="viewer.$showDetailedRecipients">
<label class="pseudo-input-label" ng-show="viewer.message.cc.length > 0">
<var:string label:value="Cc"/>
</label>

10
UI/WebServerResources/js/Mailer/Message.service.js
View File

@@ -16,7 +16,6 @@
this.$mailbox = mailbox;
this.$hasUnsafeContent = false;
this.$loadUnsafeContent = false;
this.$showDetailedRecipients = false;
this.editable = {to: [], cc: [], bcc: []};
this.selected = false;
@@ -248,15 +247,6 @@
this.$loadUnsafeContent = true;
};
/**
* @function showDetailedRecipients
* @memberof Message.prototype
* @desc Mark the message to show all to/cc recipients.
*/
Message.prototype.showDetailedRecipients = function() {
this.$showDetailedRecipients = true;
};
/**
* @function $content
* @memberof Message.prototype

10
UI/WebServerResources/js/Mailer/MessageController.js
View File

@@ -17,6 +17,8 @@
vm.service = Message;
vm.tags = { searchText: '', selected: '' };
vm.showFlags = stateMessage.flags && stateMessage.flags.length > 0;
vm.$showDetailedRecipients = false;
vm.showDetailedRecipients = showDetailedRecipients;
vm.doDelete = doDelete;
vm.close = close;
vm.reply = reply;
@@ -39,6 +41,12 @@
});
});
function showDetailedRecipients($event) {
vm.$showDetailedRecipients = true;
$event.stopPropagation();
$event.preventDefault();
}
function doDelete() {
stateMailbox.$deleteMessages([stateMessage.uid]).then(function() {
// Remove message from list of messages
@@ -137,6 +145,8 @@
function newMessage($event, recipient) {
var message = vm.account.$newMessage();
showMailEditor($event, message, [recipient]);
$event.stopPropagation();
$event.preventDefault();
}
function saveMessage() {