flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-07 07:56:23 +00:00
Code Issues Releases Wiki Activity

Tiny fixes

Browse Source
This commit is contained in:
Loic Blot 2018-09-06 20:06:37 +02:00 committed by Loïc Blot
parent 89c2561b95
commit b387333ee8
2 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
js/devel/conversation.js
View File

@ -8,7 +8,7 @@
* @copyright Loic Blot 2014-2018 * @copyright Loic Blot 2014-2018
*/ */
var ContactList = new Vue({ var Conversation = new Vue({
el: '#ocsms-app-content', el: '#ocsms-app-content',
data: { data: {
selectedContact: {}, selectedContact: {},
@ -20,45 +20,45 @@ var ContactList = new Vue({
}, },
methods: { methods: {
fetchConversation: function (contact) { fetchConversation: function (contact) {
// If contact is not null, we will fetch a conversation for a new contact // If contact is not null, we will fetch a conversation for a new contact
if (contact != null) { if (contact != null) {
this.selectedContact = contact; this.selectedContact = contact;
this.isConvLoading = true; this.isConvLoading = true;
}
this.messages = [];
this.lastConvMessageDate = 0;
var self = this;
$.getJSON(Sms.generateURL('/front-api/v1/conversation'), {'phoneNumber': $scope.selectedContact.nav},
function (jsondata, status) {
var phoneNumberLabel = self.selectedContact.nav;
if (typeof jsondata['phoneNumbers'] !== 'undefined') {
var phoneNumberList = arrayUnique(jsondata['phoneNumbers']);
phoneNumberLabel = phoneNumberList.toString();
}
// Reinit messages before showing conversation
app.formatConversation(jsondata);
$scope.$apply(function () {
if (typeof jsondata['contactName'] === 'undefined' || jsondata['contactName'] === '') {
self.selectedContact.label = phoneNumberLabel;
self.selectedContact.opt_numbers = "";
}
else {
self.selectedContact.label = jsondata['contactName'];
self.selectedContact.opt_numbers = phoneNumberLabel;
}
self.totalMessageCount = jsondata['msgCount'] !== undefined ? jsondata['msgCount'] : 0;
self.isConvLoading = false;
});
$('#ocsms-app-content').scrollTop(1E10);
} }
);
}; this.messages = [];
this.lastConvMessageDate = 0;
var self = this;
$.getJSON(Sms.generateURL('/front-api/v1/conversation'), {'phoneNumber': $scope.selectedContact.nav},
function (jsondata, status) {
var phoneNumberLabel = self.selectedContact.nav;
if (typeof jsondata['phoneNumbers'] !== 'undefined') {
var phoneNumberList = arrayUnique(jsondata['phoneNumbers']);
phoneNumberLabel = phoneNumberList.toString();
}
// Reinit messages before showing conversation
app.formatConversation(jsondata);
$scope.$apply(function () {
if (typeof jsondata['contactName'] === 'undefined' || jsondata['contactName'] === '') {
self.selectedContact.label = phoneNumberLabel;
self.selectedContact.opt_numbers = "";
}
else {
self.selectedContact.label = jsondata['contactName'];
self.selectedContact.opt_numbers = phoneNumberLabel;
}
self.totalMessageCount = jsondata['msgCount'] !== undefined ? jsondata['msgCount'] : 0;
self.isConvLoading = false;
});
$('#ocsms-app-content').scrollTop(1E10);
}
);
}
} }
}); });

22
templates/main.php
View File

@ -22,7 +22,7 @@ use \OCA\OcSms\Lib\CountryCodes;
<ul class="ng-cloak contact-list" v-if="!isContactsLoading"> <ul class="ng-cloak contact-list" v-if="!isContactsLoading">
<li v-for="contact in orderedContacts" peer-label="{{ contact.label }}" v-on:click="loadConversation(contact);" href="#"> <li v-for="contact in orderedContacts" peer-label="{{ contact.label }}" v-on:click="loadConversation(contact);" href="#">
<img class="ocsms-plavatar" ng-src="{{ contact.avatar }}" ng-show="contact.avatar !== undefined" /> <img class="ocsms-plavatar" ng-src="{{ contact.avatar }}" ng-show="contact.avatar !== undefined" />
<div class="ocsms-plavatar" ng-show="contact.avatar === undefined" ng-style="{'background-color': (contact.uid | peerColor)}">{{ contact.label | firstCharacter }}</div> <div class="ocsms-plavatar" v-if="contact.avatar === undefined" ng-style="{'background-color': (contact.uid | peerColor)}">{{ contact.label | firstCharacter }}</div>
<a class="ocsms-plname" style="{{ contact.unread > 0 ? 'font-weight:bold;' : ''}}" mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}">{{ contact.label }}{{ contact.unread > 0 ? ' (' + contact.unread + ') ' : '' }}</a> <a class="ocsms-plname" style="{{ contact.unread > 0 ? 'font-weight:bold;' : ''}}" mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}">{{ contact.label }}{{ contact.unread > 0 ? ' (' + contact.unread + ') ' : '' }}</a>
</li> </li>
</ul> </ul>
@ -69,13 +69,13 @@ use \OCA\OcSms\Lib\CountryCodes;
</div> </div>
<div id="ocsms-app-content"> <div id="ocsms-app-content">
<div id="app-content-loader" class="ng-cloak icon-loading" ng-show="isConvLoading"> <div id="app-content-loader" class="ng-cloak icon-loading" v-if="isConvLoading">
</div> </div>
<div id="app-content-header" class="ng-cloak" ng-show="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''" <div id="app-content-header" class="ng-cloak" v-if="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''"
ng-style="{'background-color': (selectedContact.uid | peerColor)}"> ng-style="{'background-color': (selectedContact.uid | peerColor)}">
<div id="ocsms-contact-avatar"> <div id="ocsms-contact-avatar">
<img class="ocsms-plavatar-big" ng-show="selectedContact.avatar !== undefined" ng-src="{{ selectedContact.avatar }}" /> <img class="ocsms-plavatar-big" v-if="selectedContact.avatar !== undefined" ng-src="{{ selectedContact.avatar }}" />
<div class="ocsms-plavatar-big" ng-show="selectedContact.avatar === undefined">{{ selectedContact.label | firstCharacter }}</div> <div class="ocsms-plavatar-big" v-if="selectedContact.avatar === undefined">{{ selectedContact.label | firstCharacter }}</div>
</div> </div>
<div id="ocsms-contact-details"> <div id="ocsms-contact-details">
<div id="ocsms-phone-label">{{ selectedContact.label }} </div> <div id="ocsms-phone-label">{{ selectedContact.label }} </div>
@ -83,17 +83,17 @@ use \OCA\OcSms\Lib\CountryCodes;
<div id="ocsms-phone-msg-nb"><?php p($l->t('%s message(s) shown of %s message(s) stored in database.', array( '{{ messages.length }}', '{{ totalMessageCount }}')));?></div> <div id="ocsms-phone-msg-nb"><?php p($l->t('%s message(s) shown of %s message(s) stored in database.', array( '{{ messages.length }}', '{{ totalMessageCount }}')));?></div>
</div> </div>
<div id="ocsms-contact-actions"> <div id="ocsms-contact-actions">
<div id="ocsms-conversation-removal" class="icon-delete icon-delete-white svn delete action" ng-click="removeConversation();"></div> <div id="ocsms-conversation-removal" class="icon-delete icon-delete-white svn delete action" v-on:click="removeConversation();"></div>
</div> </div>
</div> </div>
<div id="app-content-wrapper" ng-show="!isConvLoading"> <div id="app-content-wrapper" v-if="!isConvLoading">
<div ng-show="messages.length == 0" id="ocsms-empty-conversation"><?php p($l->t('Please select a conversation from the list to load it.'));?></div> <div v-if="messages.length == 0" id="ocsms-empty-conversation"><?php p($l->t('Please select a conversation from the list to load it.'));?></div>
<div ng-show="messages.length > 0" class="ng-cloak ocsms-messages-container"> <div v-if="messages.length > 0" class="ng-cloak ocsms-messages-container">
<div ng-repeat="message in messages | orderBy:'date'"> <div v-for="message in messages | orderBy:'date'">
<div class="msg-{{ message.type }}"> <div class="msg-{{ message.type }}">
<div>{{ message.content }}</div> <div>{{ message.content }}</div>
<div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" ng-click="removeConversationMessage(message.id);"></div> <div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" v-on:click="removeConversationMessage(message.id);"></div>
<div class="msg-date">{{ message.date | date:'medium' }}</div> <div class="msg-date">{{ message.date | date:'medium' }}</div>
</div> </div>
<div class="msg-spacer"></div> <div class="msg-spacer"></div>