Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit d8127d6

Browse files
rcreaseyrcreasey
committed
First pass of integrating mongoose seems done.
1 parent 3b63dd2 commit d8127d6

29 files changed

Lines changed: 142 additions & 137 deletions

‎app/js/Data.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ var Data = {
2424
key: ''
2525
},
2626
self: {
27-
name: '',
28-
id: '',
27+
characterName: '',
28+
characterId: '',
2929
key: '',
3030
systemId: ''
3131
},

‎app/js/EventHandler.js‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,63 +38,62 @@ var EventHandler = {
3838
var reported = event.data;
3939
if ( reported.length === 1 ) {
4040
var hostile = reported[0];
41-
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
42-
+ hostile.characterId + ');">' + hostile.characterName + '</a> has been reported in '
43-
+ '<a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');">'
44-
+ hostile.systemName + '</a>';
41+
if (hostile) event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
42+
+ hostile.characterId + ');">' + hostile.characterName + '</a> has been reported in '
43+
+ '<a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');">'
44+
+ hostile.systemName + '</a>';
4545
} else {
4646
event.text = reported.length + ' hostiles have been reported in '
4747
+ '<a href="javascript:CCPEVE.showInfo(5, ' + reported[0].systemId + ');">'
4848
+ reported[0].systemName + '</a>';
4949
}
50-
event.text += ' by ' + '<a href="javascript:CCPEVE.showInfo(1377, '
51-
+ reported[0].reporterId + ');">' + reported[0].reporterName + '</a>';
50+
if (reported[0]) event.text += ' by ' + '<a href="javascript:CCPEVE.showInfo(1377, '
51+
+ reported[0].reporterId + ');">' + reported[0].reporterName + '</a>';
5252
event.blink = 'hostiles';
5353
event.alert = true;
5454

5555
} else if (event.type === 'reportClear') {
5656
var reported = event.data;
5757
event.text = '<a href="javascript:CCPEVE.showInfo(5, ' + reported.systemId + ');">'
58-
+ reported.systemName + '</a> was reported clear';
58+
+ reported.systemName + '</a> was reported clear';
5959
event.text += ' by ' + '<a href="javascript:CCPEVE.showInfo(1377, '
60-
+ reported.reporterId + ');">' + reported.reporterName + '</a>';
60+
+ reported.reporterId + ');">' + reported.reporterName + '</a>';
6161
event.blink = 'hostiles';
6262
event.alert = true;
6363

6464
} else if (event.type === 'updateHostile') {
6565
var hostile = event.data;
66-
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
67-
+ hostile.id + ');">' + hostile.name + '</a> has been identified in a '
68-
+ '<a href="javascript:CCPEVE.showInfo(' + hostile.shipTypeId + ');">' + hostile.shipType + '</a> in '
69-
+ '<a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');">' + hostile.systemName + '</a>';
66+
if (hostile) event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
67+
+ hostile.characterId + ');">' + hostile.characterName + '</a> has been identified in a '
68+
+ '<a href="javascript:CCPEVE.showInfo(' + hostile.shipTypeId + ');">' + hostile.shipType + '</a> in '
69+
+ '<a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');">' + hostile.systemName + '</a>';
7070
event.blink = 'hostiles';
7171
event.alert = true;
72-
7372
} else if (event.type === 'memberJoined') {
7473
var member = event.data;
7574
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
76-
+ member.id + ');">' + member.name + '</a> joined the Standing Fleet';
75+
+ member.characterId + ');">' + member.characterName + '</a> joined the Standing Fleet';
7776
event.blink = 'members';
7877
event.alert = true;
7978

8079
} else if (event.type === 'memberLeft') {
8180
var member = event.data;
8281
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
83-
+ member.id + ');">' + member.name + '</a> left the Standing FLeet';
82+
+ member.characterId + ');">' + member.characterName + '</a> left the Standing FLeet';
8483
event.blink = 'members';
8584
event.alert = true;
8685

8786
} else if (event.type === 'memberTimedOut') {
8887
var member = event.data;
8988
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
90-
+ member.id + ');">' + member.name + '</a> timed out';
89+
+ member.characterId + ');">' + member.characterName + '</a> timed out';
9190
event.blink = 'members';
9291
event.alert = true;
9392

9493
} else if (event.type === 'hostileTimedOut') {
9594
var hostile = event.data;
9695
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
97-
+ hostile.id + ');">' + hostile.name + '</a> faded in '
96+
+ hostile.characterId + ');">' + hostile.characterName + '</a> faded in '
9897
+ '<a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');">'
9998
+ hostile.systemName + '</a>';
10099
event.blink = 'hostiles';
@@ -103,7 +102,7 @@ var EventHandler = {
103102
} else if (event.type === 'scanPosted') {
104103
var scan = event.data;
105104
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
106-
+ scan.reporterId + ');">' + scan.reporter + '</a> shared scan results from '
105+
+ scan.reporterId + ');">' + scan.reporterName + '</a> shared scan results from '
107106
+ '<a href="javascript:CCPEVE.showInfo(5, ' + scan.systemId + ');">'
108107
+ scan.systemName + '</a>';
109108
event.blink = 'scans';
@@ -134,14 +133,14 @@ var EventHandler = {
134133
},
135134

136135
memberJoined: function (member) {
137-
MemberList.removeMember(member.id);
136+
MemberList.removeMember(member.characterId);
138137
MemberList.addMember(member);
139138
MemberList.sortAndRenderAll();
140139
SystemMap.refreshSystems();
141140
},
142141

143142
memberTimedOut: function (member) {
144-
MemberList.removeMember(member.id);
143+
MemberList.removeMember(member.characterId);
145144
MemberList.sortAndRenderAll();
146145
SystemMap.refreshSystems();
147146
},
@@ -153,7 +152,7 @@ var EventHandler = {
153152
},
154153

155154
memberLeft: function (member) {
156-
MemberList.removeMember(member.id)
155+
MemberList.removeMember(member.characterId)
157156
MemberList.sortAndRenderAll();
158157
SystemMap.refreshSystems();
159158
},
@@ -165,7 +164,7 @@ var EventHandler = {
165164
},
166165

167166
hostileTimedOut: function (hostile) {
168-
HostileList.removeMember(hostile.id);
167+
HostileList.removeMember(hostile.characterId);
169168
HostileList.sortAndRenderAll();
170169
SystemMap.refreshSystems();
171170
},
@@ -228,8 +227,8 @@ var EventHandler = {
228227
},
229228

230229
updateSystemMap: function (target) {
231-
if(Data.state.self.id === target.id) {
232-
if(Data.state.self.regionId !== Data.systems[target.systemId].regionID) {
230+
if(Data.state.self.characterId == target.characterId) {
231+
if(Data.state.self.regionId != Data.systems[target.systemId].regionID) {
233232
this.statusSelfSystem(target);
234233
SystemMap.redraw();
235234
}

‎app/js/HostileList.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ var HostileList = {
88

99
clearBySystem: function (systemId) {
1010
log('Clearing system ' + systemId);
11-
Data.hostiles = $.map(Data.hostiles, function(h) { return h.systemId !== systemId ? h : null; });
11+
Data.hostiles = $.map(Data.hostiles, function(h) { return h.systemId !== +systemId ? h : null; });
1212
Data.ui.hostiles_list.empty();
1313
},
1414

1515
addHostile: function (hostileToAdd) {
16-
log('Adding hostile: ' + hostileToAdd.name + '...');
17-
HostileList.removeHostile(hostileToAdd.id);
16+
log('Adding hostile: ' + hostileToAdd.characterName + '...');
17+
HostileList.removeHostile(hostileToAdd.characterId);
1818
Data.hostiles.push(hostileToAdd);
1919
},
2020

2121
removeHostile: function (hostileToRemoveId) {
2222
var hostileToRemove = HostileList.findHostile(hostileToRemoveId);
2323
if (hostileToRemove) {
24-
log('Removing hostile: ' + hostileToRemove.name + '...');
24+
log('Removing hostile: ' + hostileToRemove.characterName + '...');
2525
Data.hostiles.splice(Data.hostiles.indexOf(hostileToRemove), 1);
2626
}
2727
},
2828

2929
findHostile: function (hostileId) {
3030
for (var index in Data.hostiles) {
31-
if (Data.hostiles[index].id === hostileId) return Data.hostiles[index];
31+
if (Data.hostiles[index].characterId === +hostileId) return Data.hostiles[index];
3232
}
3333
return false;
3434
},
@@ -39,9 +39,9 @@ var HostileList = {
3939
},
4040

4141
renderSingleHostile: function (hostile) {
42-
log('Rendering hostile: ' + hostile.name + ' (single)...');
42+
log('Rendering hostile: ' + hostile.characterName + ' (single)...');
4343
HostileList.addUiProperties(hostile);
44-
var existingHostileElement = Data.ui.hostiles_list.find('#hostile-' + hostile.id);
44+
var existingHostileElement = Data.ui.hostiles_list.find('#hostile-' + hostile.characterId);
4545
if (existingHostileElement.length) {
4646
existingHostileElement.after($(hostile.html)).remove();
4747
} else {
@@ -64,7 +64,7 @@ var HostileList = {
6464

6565
Data.ui.hostiles_list.empty();
6666
Data.hostiles.forEach(function (hostile) {
67-
log('Rendering hostile: ' + hostile.name + ' (batch)...');
67+
log('Rendering hostile: ' + hostile.characterName + ' (batch)...');
6868
HostileList.addUiProperties(hostile);
6969
Data.ui.hostiles_list.append($(hostile.html));
7070
});

‎app/js/Main.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ function submitHostileDetailsClick(button) {
197197

198198
function submitHostileDetails(key, id, name, shipType, shipName) {
199199
UIPanels.showLoadingPanel('Uploading status...', function () {
200-
var details = {type: 'hostile', key: key, id: id, name: name, shipType: shipType, shipName: shipName};
200+
var details = {type: 'hostile', key: key, characterId: id, characterName: name, shipType: shipType, shipName: shipName};
201201

202202
Server.postDetails(details, function(error, data) {
203203
UIPanels.hidePanel(function () {
@@ -208,8 +208,8 @@ function submitHostileDetails(key, id, name, shipType, shipName) {
208208

209209
EventList.addEvent({ type: 'info', class: status.text,
210210
text: 'Details were reported on <strong>' +
211-
'<a href="javascript:CCPEVE.showInfo(1377, ' + details.id + ')">' +
212-
details.name + '</a> by you.' });
211+
'<a href="javascript:CCPEVE.showInfo(1377, ' + details.characterId + ')">' +
212+
details.characterName + '</a> by you.' });
213213
});
214214
});
215215
});
@@ -249,7 +249,10 @@ function stopPolling() {
249249

250250
function handleError (error) {
251251
log(error.message);
252-
if (error.stopPoll) Data.poll = false;
252+
if (error.stopPoll) {
253+
Data.poll = false;
254+
stopPolling();
255+
}
253256
if (error.message) UI.showAlert({
254257
type: 'error',
255258
text: error.message

‎app/js/MemberList.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ var MemberList = {
77
},
88

99
addMember: function (memberToAdd) {
10-
log('Adding member: ' + memberToAdd.name + '...');
11-
MemberList.removeMember(memberToAdd.id);
10+
log('Adding member: ' + memberToAdd.characterName + '...');
11+
MemberList.removeMember(memberToAdd.characterId);
1212
Data.members.push(memberToAdd);
1313
},
1414

1515
removeMember: function (memberToRemoveId) {
1616
var memberToRemove = MemberList.findMember(memberToRemoveId);
1717
if (memberToRemove) {
18-
log('Removing member: ' + memberToRemove.name + '...');
18+
log('Removing member: ' + memberToRemove.characterName + '...');
1919
Data.members.splice(Data.members.indexOf(memberToRemove), 1);
2020
}
2121
},
2222

2323
findMember: function (memberId) {
2424
for (var index in Data.members) {
25-
if (Data.members[index].id === memberId) return Data.members[index];
25+
if (Data.members[index].characterId === +memberId) return Data.members[index];
2626
}
2727
return false;
2828
},
@@ -33,9 +33,9 @@ var MemberList = {
3333
},
3434

3535
renderSingleMember: function (member) {
36-
log('Rendering member: ' + member.name + ' (single)...');
36+
log('Rendering member: ' + member.characterName + ' (single)...');
3737
MemberList.addUiProperties(member);
38-
var existingMemberElement = Data.ui.members_list.find('#member-' + member.id);
38+
var existingMemberElement = Data.ui.members_list.find('#member-' + member.characterId);
3939
if (existingMemberElement.length) {
4040
existingMemberElement.after($(member.html)).remove();
4141
} else {
@@ -58,7 +58,7 @@ var MemberList = {
5858

5959
Data.ui.members_list.empty();
6060
Data.members.forEach(function (member) {
61-
log('Rendering member: ' + member.name + ' (batch)...');
61+
log('Rendering member: ' + member.characterName + ' (batch)...');
6262
MemberList.addUiProperties(member);
6363
Data.ui.members_list.append($(member.html));
6464
});

‎app/js/ScanList.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ var ScanList = {
99
addStatus: function(reported_status, pilots) {
1010
var status = {systemId: Data.ui.currentSystem.data('systemId')
1111
, systemName: Data.ui.currentSystem.text(), pilots: []
12-
, reporterId: Data.state.self.id
13-
, reporterName: Data.state.self.name
12+
, reporterId: Data.state.self.characterId
13+
, reporterName: Data.state.self.characterName
1414
, pilots: ScanList.parseLocal(pilots)};
1515

1616
if (reported_status) status.text = reported_status;

‎app/js/UI.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var UI = {
5454
},
5555

5656
submitStatusClear: function() {
57-
submitStatus('clear', Data.state.self.name);
57+
submitStatus('clear', Data.state.self.characterName);
5858
},
5959

6060
showAlert: function (event) {

‎app/js/UIPanels.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,12 @@ var UIPanels = {
8787
var panel = {
8888
type: 'password',
8989
logo: true,
90-
text: 'Authorization required.',
90+
error: {message: 'Authorization required.'},
9191
formitems: [
9292
{input: {label: 'Fleet Password', id: 'join-fleet-password', class: 'submit-key'}},
9393
{button: {class: 'submit-key', text: 'Join Fleet', onClick: 'submitPasswordButtonClick(this)'}},
9494
{submit: {class: 'submit-join', text: '<i class="fa fa-arrow-circle-left"></i> Cancel', onClick: 'UIPanels.redirectToBasePath()'}}
9595
],
96-
error: error
9796
};
9897

9998
UIPanels.showPanel(panel, callback);
@@ -105,12 +104,12 @@ var UIPanels = {
105104
var panel = {
106105
type: 'options',
107106
image: 'panel-options.png',
108-
title: hostile.name,
107+
title: hostile.characterName,
109108
text: 'Confirm details of hostile pilot:',
110109
formitems: [
111110
{input: {hidden: true, id: 'hostile-key', value: hostile.key}},
112-
{input: {hidden: true, id: 'hostile-id', value: hostile.id}},
113-
{input: {hidden: true, id: 'hostile-name', value: hostile.name}},
111+
{input: {hidden: true, id: 'hostile-id', value: hostile.characterId}},
112+
{input: {hidden: true, id: 'hostile-name', value: hostile.characterName}},
114113
{input: {label: 'Ship Type', id: 'hostile-ship-type', value: hostile.shipType} },
115114
{submit: {text: 'Update Details', onClick: 'submitHostileDetailsClick(this)'}}
116115
],

‎app/templates/hostile.hbs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<table id="hostiles-list" class="hostile">
2-
<tr id="hostile-{{id}}">
2+
<tr id="hostile-{{characterId}}">
33
<td class="ship-icon">{{{shipIcon}}}</td>
4-
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
4+
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{characterId}});">{{characterName}}</a></td>
55
<td class="alliance">
66
{{#if allianceName}}
77
<a href="javascript:CCPEVE.showInfo(16159, {{allianceID}});">&lt;{{allianceName}}&gt;</a>
88
{{else}}
99
No Alliance
1010
{{/if}}
1111
</td>
12-
<td class="ship-type" onClick="UIPanels.updateHostileDetailsPanel('{{id}}');">
12+
<td class="ship-type" onClick="UIPanels.updateHostileDetailsPanel('{{characterId}}');">
1313
{{#if shipTypeId}}
1414
<i class="fa fa-eye"></i> <a href="javascript:CCPEVE.showInfo({{shipTypeId}});">{{shipType}}</a>
1515
{{else}}
@@ -20,7 +20,7 @@
2020
<td class="reported-at"><a title="Reported by {{reporterName}}">{{reported_at}}</a></td>
2121
<td class="actions">
2222
<a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
23-
{{killboard_link name id}}
23+
{{killboard_link characterName characterId}}
2424
</td>
2525
</tr>
2626
</table>

‎app/templates/member.hbs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<table class="member" id="member-{{id}}">
1+
<table class="member" id="member-{{characterId}}">
22
<tr>
33
<td class="ship-icon">{{{shipIcon}}}</td>
4-
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{id}});">{{name}}</a></td>
4+
<td class="name"><a href="javascript:CCPEVE.showInfo(1377, {{characterId}});">{{characterName}}</a></td>
55
<td class="system {{#if isDocked}}docked{{/if}}"><a href="javascript:CCPEVE.showInfo(5,{{systemId}});">{{systemName}}</a></td>
66
<td class="actions">
77
<a title="Set Destination" onClick="CCPEVE.setDestination({{systemId}})"><i class="fa fa-map-marker" title="Set Destination"></i></a>
88
<a title="Start Conversation" onClick="CCPEVE.startConversation({{id}})"><i class="fa fa-comment" title="Start Conversation"></i></a>
9-
{{killboard_link name id}}
9+
{{killboard_link characterName characterId}}
1010
</td>
1111
</tr>
1212
</table>

0 commit comments

Comments
 (0)