starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 18:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite phone => No more server lags

Browse Source
This commit is contained in:
Jérémie N'gadi
2017-09-02 00:35:35 +02:00
parent 175dea91ce
commit 3b9973fa9a
8 changed files with 266 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/scripts/app.js
+6
View File
@@ -36,6 +36,7 @@
let showMain = function() {
$('.screen').removeClass('active');
$('.screen *').attr('disabled', 'disabled');
}
let showRepertoire = function() {
@@ -58,6 +59,8 @@
let showAddContact = function() {
$('#contact').addClass('active');
$('.screen *').attr('disabled', 'disabled');
$('.screen.active *').removeAttr('disabled');
}
let hideAddContact = function() {
@@ -70,6 +73,8 @@
$('#writer').addClass('active');
$('#writer_number').val(cnum);
$('#writer .header-title').html(cname);
$('.screen *').attr('disabled', 'disabled');
$('.screen.active *').removeAttr('disabled');
}
let hideNewMessage = function() {
@@ -145,6 +150,7 @@
let showPhone = function(phoneData){
reloadPhone(phoneData);
$('#phone').show();
showMain();
isPhoneShowed = true;
}
html/scripts/app_de.js
+55 -49
View File
@@ -1,6 +1,6 @@
(function(){
let ContactTpl =
let ContactTpl =
'<div class="contact {{online}}">' +
'<div class="sender-info">' +
'<div class="center">' +
@@ -10,15 +10,15 @@
'<div class="actions"><span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span></div>' +
'</div>'
;
let MessageTpl =
let MessageTpl =
'<div class="message">' +
'<div class="sender-info">' +
'<div class="center">' +
'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
'</div>' +
'</div>' +
'<div class="body">{{message}}</div>' +
'</div>' +
'</div>' +
'<div class="body">{{message}}</div>' +
'<div class="actions"><span class="new-msg {{anonyme}} reply-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span><span class="gps {{activeGPS}} gps-btn" data-gpsX="{{gpsLocationX}}" data-gpsY="{{gpsLocationY}}"></span><span class="ok-btn {{showOK}}" data-contact-number="{{okNumberData}}" data-contact-job="{{jobData}}"></span></div>' +
'</div>'
;
@@ -33,52 +33,57 @@
let isMessageEditorOpen = false;
let isMessagesOpen = false;
let isPhoneShowed = false;
let showMain = function() {
$('.screen').removeClass('active');
$('.screen *').attr('disabled', 'disabled');
}
let showRepertoire = function() {
$('#repertoire').addClass('active');
}
let hideRepertoire = function() {
$('#repertoire').removeClass('active');
}
let showMessages = function(){
let showMessages = function(){
$('#messages').addClass('active');
isMessagesOpen = true;
}
let hideMessages = function(){
let hideMessages = function(){
$('#messages').removeClass('active');
isMessagesOpen = false;
}
let showAddContact = function() {
$('#contact').addClass('active');
$('.screen *').attr('disabled', 'disabled');
$('.screen.active *').removeAttr('disabled');
}
let hideAddContact = function() {
$('#contact').removeClass('active');
$('#contact_name').val('');
$('#contact_number').val('');
}
let showNewMessage = function(cnum, cname) {
$('#writer').addClass('active');
$('#writer_number').val(cnum);
$('#writer .header-title').html(cname);
$('.screen *').attr('disabled', 'disabled');
$('.screen.active *').removeAttr('disabled');
}
let hideNewMessage = function() {
let hideNewMessage = function() {
$('#writer').removeClass('active');
$('#writer_number').val('');
$('#writer_message').val('');
$('#writer .header-title').html('');
}
let showGPS = function(xPos, yPos) {
$.post('http://esx_phone/setGPS', JSON.stringify({
x: parseFloat(xPos),
@@ -88,13 +93,13 @@
}
let renderContacts = function(){
let contactHTML = '';
if(contacts.length > 0) {
for(let i=0; i<contacts.length; i++) {
let view = {
phoneNumber : contacts[i].value,
sender : contacts[i].label,
@@ -112,15 +117,15 @@
} else {
contactHTML = '<div class="contact no-item online"><p class="no-item">Keine Kontakte</p></div>';
}
$('#phone #repertoire .repertoire-list').html(contactHTML);
$('.contact.online .new-msg').click(function() {
showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
});
}
$('.contact.online .new-msg').click(function() {
showNewMessage($(this).attr('data-contact-number'));
});
@@ -145,18 +150,19 @@
let showPhone = function(phoneData){
reloadPhone(phoneData);
$('#phone').show();
showMain();
isPhoneShowed = true;
}
let hidePhone = function(){
let hidePhone = function(){
$('#phone').hide();
isPhoneShowed = false;
}
let messages = [];
let addMessage = function(phoneNumber, pmessage, pposition, panonyme, pjob){
messages.push({
value : phoneNumber,
message : pmessage,
@@ -166,20 +172,20 @@
})
let messageHTML = '';
if(messages.length > 0) {
for(let i=0; i<messages.length; i++) {
let fromName = "Unknown";
let fromNumber = messages[i].value;
let anonyme = null;
if(messages[i].job != "player")
fromName = messages[i].job;
if(messages[i].anonyme) {
if(messages[i].job == "player")
fromName = "Anonymous";
@@ -195,7 +201,7 @@
anonyme = '';
}
let view = {
anonyme : anonyme,
phoneNumber : fromNumber,
@@ -210,7 +216,7 @@
jobData : (messages[i].job == 'player') ? '' : messages[i].job,
showOK : (messages[i].job == 'player') ? '' : 'showOK'
}
let html = Mustache.render(MessageTpl, view);
messageHTML = html + messageHTML;
@@ -218,20 +224,20 @@
} else {
messageHTML = '<div class="message no-item"><p class="no-item">Keine Nachrichten</p></div>';
}
$('#phone #messages .messages-list').html(messageHTML);
$('.message .new-msg').click(function() {
showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
});
$('.message .gps').click(function() {
showGPS($(this).attr('data-gpsX'), $(this).attr('data-gpsY'));
});
$('.message .ok-btn').click(function() {
$.post('http://esx_phone/send', JSON.stringify({
message: $(this).attr('data-contact-job') + ": Receieved!",
message: $(this).attr('data-contact-job') + ": Received !",
number : $(this).attr('data-contact-number'),
anonyme: false
}))
@@ -250,7 +256,7 @@
}
let addSpecialContact = function(name, number, base64Icon){
let found = false
for(let i=0; i<specialContacts.length; i++)
@@ -319,7 +325,7 @@
}
default : {
let number = $(this).data('number');
let name = $(this).data('name');
@@ -333,9 +339,9 @@
}
$('#writer_send').click(function(){
let phoneNumber = null
if(typeof $('#writer_number').val() == 'number')
phoneNumber = parseInt($('#writer_number').val());
else if (typeof $('#writer_number').val() == 'string')
@@ -363,23 +369,23 @@
hideNewMessage();
hideMessages();
});
$('#btn-head-back-rep').click(function() {
hideRepertoire();
});
$('#btn-head-back-writer, #writer_cancel').click(function() {
hideNewMessage();
});
$('#btn-head-back-contact, #contact_cancel').click(function() {
hideAddContact();
});
$('#btn-head-new-message').click(function() {
showNewMessage('', 'Nouveau message');
});
$('#btn-head-new-contact').click(function() {
showAddContact();
});
@@ -401,7 +407,7 @@
}
default : {
let number = $(this).data('number');
let name = $(this).data('name');
html/scripts/app_en.js
+55 -49
View File
@@ -1,6 +1,6 @@
(function(){
let ContactTpl =
let ContactTpl =
'<div class="contact {{online}}">' +
'<div class="sender-info">' +
'<div class="center">' +
@@ -10,15 +10,15 @@
'<div class="actions"><span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span></div>' +
'</div>'
;
let MessageTpl =
let MessageTpl =
'<div class="message">' +
'<div class="sender-info">' +
'<div class="center">' +
'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
'</div>' +
'</div>' +
'<div class="body">{{message}}</div>' +
'</div>' +
'</div>' +
'<div class="body">{{message}}</div>' +
'<div class="actions"><span class="new-msg {{anonyme}} reply-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span><span class="gps {{activeGPS}} gps-btn" data-gpsX="{{gpsLocationX}}" data-gpsY="{{gpsLocationY}}"></span><span class="ok-btn {{showOK}}" data-contact-number="{{okNumberData}}" data-contact-job="{{jobData}}"></span></div>' +
'</div>'
;
@@ -33,52 +33,57 @@
let isMessageEditorOpen = false;
let isMessagesOpen = false;
let isPhoneShowed = false;
let showMain = function() {
$('.screen').removeClass('active');
$('.screen *').attr('disabled', 'disabled');
}
let showRepertoire = function() {
$('#repertoire').addClass('active');
}
let hideRepertoire = function() {
$('#repertoire').removeClass('active');
}
let showMessages = function(){
let showMessages = function(){
$('#messages').addClass('active');
isMessagesOpen = true;
}
let hideMessages = function(){
let hideMessages = function(){
$('#messages').removeClass('active');
isMessagesOpen = false;
}
let showAddContact = function() {
$('#contact').addClass('active');
$('.screen *').attr('disabled', 'disabled');
$('.screen.active *').removeAttr('disabled');
}
let hideAddContact = function() {
$('#contact').removeClass('active');
$('#contact_name').val('');
$('#contact_number').val('');
}
let showNewMessage = function(cnum, cname) {
$('#writer').addClass('active');
$('#writer_number').val(cnum);
$('#writer .header-title').html(cname);
$('.screen *').attr('disabled', 'disabled');
$('.screen.active *').removeAttr('disabled');
}
let hideNewMessage = function() {
let hideNewMessage = function() {
$('#writer').removeClass('active');
$('#writer_number').val('');
$('#writer_message').val('');
$('#writer .header-title').html('');
}
let showGPS = function(xPos, yPos) {
$.post('http://esx_phone/setGPS', JSON.stringify({
x: parseFloat(xPos),
@@ -88,13 +93,13 @@
}
let renderContacts = function(){
let contactHTML = '';
if(contacts.length > 0) {
for(let i=0; i<contacts.length; i++) {
let view = {
phoneNumber : contacts[i].value,
sender : contacts[i].label,
@@ -112,15 +117,15 @@
} else {
contactHTML = '<div class="contact no-item online"><p class="no-item">No contacts</p></div>';
}
$('#phone #repertoire .repertoire-list').html(contactHTML);
$('.contact.online .new-msg').click(function() {
showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
});
}
$('.contact.online .new-msg').click(function() {
showNewMessage($(this).attr('data-contact-number'));
});
@@ -145,18 +150,19 @@
let showPhone = function(phoneData){
reloadPhone(phoneData);
$('#phone').show();
showMain();
isPhoneShowed = true;
}
let hidePhone = function(){
let hidePhone = function(){
$('#phone').hide();
isPhoneShowed = false;
}
let messages = [];
let addMessage = function(phoneNumber, pmessage, pposition, panonyme, pjob){
messages.push({
value : phoneNumber,
message : pmessage,
@@ -166,20 +172,20 @@
})
let messageHTML = '';
if(messages.length > 0) {
for(let i=0; i<messages.length; i++) {
let fromName = "Unknown";
let fromNumber = messages[i].value;
let anonyme = null;
if(messages[i].job != "player")
fromName = messages[i].job;
if(messages[i].anonyme) {
if(messages[i].job == "player")
fromName = "Anonymous";
@@ -195,7 +201,7 @@
anonyme = '';
}
let view = {
anonyme : anonyme,
phoneNumber : fromNumber,
@@ -210,7 +216,7 @@
jobData : (messages[i].job == 'player') ? '' : messages[i].job,
showOK : (messages[i].job == 'player') ? '' : 'showOK'
}
let html = Mustache.render(MessageTpl, view);
messageHTML = html + messageHTML;
@@ -218,20 +224,20 @@
} else {
messageHTML = '<div class="message no-item"><p class="no-item">No messages</p></div>';
}
$('#phone #messages .messages-list').html(messageHTML);
$('.message .new-msg').click(function() {
showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
});
$('.message .gps').click(function() {
showGPS($(this).attr('data-gpsX'), $(this).attr('data-gpsY'));
});
$('.message .ok-btn').click(function() {
$.post('http://esx_phone/send', JSON.stringify({
message: $(this).attr('data-contact-job') + ": Receieved!",
message: $(this).attr('data-contact-job') + ": Received !",
number : $(this).attr('data-contact-number'),
anonyme: false
}))
@@ -250,7 +256,7 @@
}
let addSpecialContact = function(name, number, base64Icon){
let found = false
for(let i=0; i<specialContacts.length; i++)
@@ -319,7 +325,7 @@
}
default : {
let number = $(this).data('number');
let name = $(this).data('name');
@@ -333,9 +339,9 @@
}
$('#writer_send').click(function(){
let phoneNumber = null
if(typeof $('#writer_number').val() == 'number')
phoneNumber = parseInt($('#writer_number').val());
else if (typeof $('#writer_number').val() == 'string')
@@ -363,23 +369,23 @@
hideNewMessage();
hideMessages();
});
$('#btn-head-back-rep').click(function() {
hideRepertoire();
});
$('#btn-head-back-writer, #writer_cancel').click(function() {
hideNewMessage();
});
$('#btn-head-back-contact, #contact_cancel').click(function() {
hideAddContact();
});
$('#btn-head-new-message').click(function() {
showNewMessage('', 'Nouveau message');
});
$('#btn-head-new-contact').click(function() {
showAddContact();
});
@@ -401,7 +407,7 @@
}
default : {
let number = $(this).data('number');
let name = $(this).data('name');