Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit 61493e2

Browse files
rcreaseyrcreasey
committed
Completely removing the use of 'armada' in this app
1 parent a8dbf94 commit 61493e2

18 files changed

Lines changed: 86 additions & 86 deletions

‎app/js/Data.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var Data = {
1818
},
1919

2020
state: {
21-
armada: {
21+
fleet: {
2222
password: '',
2323
name: '',
2424
key: ''

‎app/js/EventHandler.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var EventHandler = {
66
'statusMembers',
77
'statusEvents',
88
'statusSelf',
9-
'statusArmada',
9+
'statusFleet',
1010
'memberAccepted',
1111
'memberUpdated'
1212
],
@@ -109,7 +109,7 @@ var EventHandler = {
109109
event.blink = 'scans';
110110
event.alert = true;
111111

112-
} else if (event.type === 'armadaCreated') {
112+
} else if (event.type === 'fleetCreated') {
113113
var creator = event.data;
114114
event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
115115
+ creator.id + ');">' + creator.name + '</a> created this fleet ';
@@ -196,10 +196,10 @@ var EventHandler = {
196196
}
197197
},
198198

199-
statusArmada: function (armada) {
200-
Data.state.armada.name = armada.name;
201-
Data.state.armada.key = armada.key;
202-
Data.state.armada.password = armada.password;
199+
statusFleet: function (fleet) {
200+
Data.state.fleet.name = fleet.name;
201+
Data.state.fleet.key = fleet.key;
202+
Data.state.fleet.password = fleet.password;
203203

204204
SystemMap.init();
205205
},

‎app/js/Main.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ function initialize() {
4545

4646
EventHandler.dispatchEvents(data.events);
4747

48-
if (Data.state.armada.key) {
48+
if (Data.state.fleet.key) {
4949
EventList.addEvent({ type: 'youJoined', text: 'You opened this standing fleet', alert: false });
5050

51-
Util.redirectIfNecessary(Data.state.armada.key, function () {
51+
Util.redirectIfNecessary(Data.state.fleet.key, function () {
5252
UIPanels.hidePanel(pollLoop);
5353
});
5454

5555
} else {
5656
if (Util.getUrlKey()) {
57-
joinArmada(Util.getUrlKey());
57+
joinFleet(Util.getUrlKey());
5858
} else {
5959
UIPanels.showStartPanel();
6060
}
@@ -65,12 +65,12 @@ function initialize() {
6565

6666
function createFleetButtonClick(button) {
6767
var fleetPassword = $('#create-fleet-password').val();
68-
createArmada(fleetPassword);
68+
createFleet(fleetPassword);
6969
}
7070

71-
function createArmada(fleetPassword) {
72-
UIPanels.showLoadingPanel('Creating new armada...', function () {
73-
Server.createArmada(fleetPassword, function(error, data) {
71+
function createFleet(fleetPassword) {
72+
UIPanels.showLoadingPanel('Creating new fleet...', function () {
73+
Server.createFleet(fleetPassword, function(error, data) {
7474
if (error) {
7575
UIPanels.showCreatePanel(error);
7676
return;
@@ -83,13 +83,13 @@ function createArmada(fleetPassword) {
8383

8484
function joinFleetButtonClick(button) {
8585
var fleetKey = $('#join-fleet-key').val();
86-
joinArmada(fleetKey);
86+
joinFleet(fleetKey);
8787
}
8888

89-
function joinArmada(fleetKey) {
89+
function joinFleet(fleetKey) {
9090
UIPanels.showLoadingPanel('Searching for fleet...', function () {
91-
Server.joinArmada(fleetKey, function(error, data) {
92-
Data.state.armada.key = fleetKey;
91+
Server.joinFleet(fleetKey, function(error, data) {
92+
Data.state.fleet.key = fleetKey;
9393
if (error) {
9494
if (error.type === 'password') UIPanels.showPasswordPanel();
9595
else UIPanels.showJoinPanel(error);
@@ -108,10 +108,10 @@ function submitPasswordButtonClick(button) {
108108

109109
function submitPassword(fleetPassword) {
110110
var fleetKey = Util.getUrlKey();
111-
if (!fleetKey) fleetKey = Data.state.armada.key;
111+
if (!fleetKey) fleetKey = Data.state.fleet.key;
112112

113113
UIPanels.showLoadingPanel('Authenticating...', function () {
114-
Server.joinArmadaWithPassword(fleetKey, fleetPassword, function (error, data) {
114+
Server.joinFleetWithPassword(fleetKey, fleetPassword, function (error, data) {
115115
if (error) {
116116
if (error.type === 'password') UIPanels.showPasswordPanel(error);
117117
else UIPanels.showJoinPanel(error);
@@ -215,9 +215,9 @@ function submitHostileDetails(key, id, name, shipType, shipName) {
215215
});
216216
}
217217

218-
function leaveArmada() {
218+
function leaveFleet() {
219219
UIPanels.showLoadingPanel('Leaving Standing Fleet...', function () {
220-
Server.leaveArmada(function(error, data) {
220+
Server.leaveFleet(function(error, data) {
221221
if (error) {
222222
handleError(error);
223223
UIPanels.hidePanel();

‎app/js/Server.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ var Server = {
5454
Data.state.lastPollTs = Date.now();
5555
},
5656

57-
joinArmada: function (fleetKey, callback) {
57+
joinFleet: function (fleetKey, callback) {
5858
Server.ajaxGet('/join/' + fleetKey, callback);
5959
},
6060

61-
joinArmadaWithPassword: function (fleetKey, fleetPassword, callback) {
61+
joinFleetWithPassword: function (fleetKey, fleetPassword, callback) {
6262
Server.ajaxGet('/join/' + fleetKey + '/' + fleetPassword, callback);
6363
},
6464

6565
eventResponse: function (eventKey, response, callback) {
6666
Server.ajaxGet('/respond/' + eventKey + '/' + response, callback);
6767
},
6868

69-
createArmada: function (fleetPassword, callback) {
69+
createFleet: function (fleetPassword, callback) {
7070
Server.ajaxGet('/create/' + fleetPassword, callback);
7171
},
7272

@@ -79,7 +79,7 @@ var Server = {
7979
});
8080
},
8181

82-
leaveArmada: function (callback) {
82+
leaveFleet: function (callback) {
8383
Server.ajaxGet('/leave', callback);
8484
},
8585

‎app/js/UIPanels.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var UIPanels = {
1515
},
1616

1717
showMenuPanel: function(callback) {
18-
var fleet_link = Data.config.domain + Data.state.armada.key + '/';
18+
var fleet_link = Data.config.domain + Data.state.fleet.key + '/';
1919

2020
var panel = {
2121
type: 'options',
@@ -24,16 +24,16 @@ var UIPanels = {
2424
footer: '&copy; 2014 Goonswarm Federation',
2525
closeable: true,
2626
formitems: [
27-
{button: {legend: 'Fleet Actions', class: 'reload-armada no-margin', text: 'Reload Standing Fleet', onClick: 'location.reload()'}},
28-
{button: {class: 'leave-armada', text: 'Leave Standing Fleet', onClick: 'leaveArmada()'}},
27+
{button: {legend: 'Fleet Actions', class: 'reload-fleet no-margin', text: 'Reload Standing Fleet', onClick: 'location.reload()'}},
28+
{button: {class: 'leave-fleet', text: 'Leave Standing Fleet', onClick: 'leaveFleet()'}},
2929
{input: {legend: 'Pilot Key', label: 'Pilot Key', class: 'info-string', value: Data.state.self.key, readonly: true}},
30-
{input: {legend: 'Fleet Key', label: 'Fleet Key', class: 'info-string', value: Data.state.armada.key, readonly: true}},
30+
{input: {legend: 'Fleet Key', label: 'Fleet Key', class: 'info-string', value: Data.state.fleet.key, readonly: true}},
3131
{input: {legend: 'Fleet URL', label: 'Fleet URL', class: 'info-string', value: fleet_link, readonly: true}}
3232
]
3333
};
3434

35-
if (Data.state.armada.password) panel.formitems.push( {input: {legend: 'Fleet Password', label: 'Fleet Password', class: 'info-string',
36-
value: Data.state.armada.password, readonly: true}} );
35+
if (Data.state.fleet.password) panel.formitems.push( {input: {legend: 'Fleet Password', label: 'Fleet Password', class: 'info-string',
36+
value: Data.state.fleet.password, readonly: true}} );
3737

3838
UIPanels.showPanel(panel, callback);
3939
},
@@ -45,7 +45,7 @@ var UIPanels = {
4545
formitems: [
4646
{button: {class: 'submit-create', text: 'Create Fleet', onClick: 'UIPanels.showCreatePanel()'}},
4747
{submit: {class: 'submit-join', text: 'Join Fleet', onClick: 'UIPanels.showJoinPanel()'}},
48-
{button: {class: 'leave-armada', text: 'Leave Standing Fleet', onClick: 'leaveArmada()'}},
48+
{button: {class: 'leave-fleet', text: 'Leave Standing Fleet', onClick: 'leaveFleet()'}},
4949
],
5050
error: error
5151
};

‎app/js/client/UIPanels.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var UIPanels = {
2222
footer: '&copy; 2014 Goonswarm Federation',
2323
closeable: true,
2424
formitems: [
25-
{button: {legend: 'Fleet Actions', class: 'reload-armada no-margin', text: 'Reload Standing Fleet', onClick: 'location.reload()'}}
25+
{button: {legend: 'Fleet Actions', class: 'reload-fleet no-margin', text: 'Reload Standing Fleet', onClick: 'location.reload()'}}
2626
]
2727
};
2828

‎config/settings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ module.exports = function () {
3030

3131
hostileTtl: 900000,
3232
memberTtl: 60000,
33-
armadaTtl: 43200000,
33+
fleetTtl: 43200000,
3434
eventTtl: 900000,
3535
scanTtl: 900000,
3636

‎lib/actions/createAction.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = function (armadaService, memberService, sessionService, eventService, errorResponse, successResponse, headerParser, settings, logger) {
1+
module.exports = function (fleetService, memberService, sessionService, eventService, errorResponse, successResponse, headerParser, settings, logger) {
22

33
var pub = {};
44

@@ -8,7 +8,7 @@ module.exports = function (armadaService, memberService, sessionService, eventSe
88
sessionService.checkIfValid(req, function (error, isValid) {
99
if (isValid) {
1010
return errorResponse.respond(req, res, 'state',
11-
'Please <a href="#" onclick="leaveArmada()">leave your current Standing Fleet</a> before creating a new one.');
11+
'Please <a href="#" onclick="leaveFleet()">leave your current Standing Fleet</a> before creating a new one.');
1212
}
1313

1414
var fleetPassword = req.params.fleetPassword || false;
@@ -22,23 +22,23 @@ module.exports = function (armadaService, memberService, sessionService, eventSe
2222
+ ' to ' + settings.fleetPasswordMaxLength + ' characters.');
2323
}
2424

25-
armadaService.addAndGet(fleetPassword, function (error, armada) {
25+
fleetService.addAndGet(fleetPassword, function (error, fleet) {
2626
if (error) return errorResponse.respond(req, res, 'state',
27-
'Error creating armada.');
27+
'Error creating fleet.');
2828

29-
memberService.addAndGet(headerParser.parse(req), armada.key, function (error, member) {
29+
memberService.addAndGet(headerParser.parse(req), fleet.key, function (error, member) {
3030
if (error) return errorResponse.respond(req, res, 'state',
3131
'Error creating member.');
3232

33-
eventService.addAndGet('armadaCreated', {
33+
eventService.addAndGet('fleetCreated', {
3434
name: member.name,
3535
id: member.id
36-
}, armada.key, function (error) {
36+
}, fleet.key, function (error) {
3737
if (error) return errorResponse.respond(req, res, 'state',
38-
'Error alerting armada.');
38+
'Error alerting fleet.');
3939

40-
sessionService.initialize(req, armada.key, member.key);
41-
successResponse.respond(res, eventService.getNonAttached('statusArmada', armada));
40+
sessionService.initialize(req, fleet.key, member.key);
41+
successResponse.respond(res, eventService.getNonAttached('statusFleet', fleet));
4242

4343
});
4444
});

‎lib/actions/joinAction.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = function (errorResponse, successResponse, headerParser, memberService, eventService, armadaService, sessionService, logger) {
1+
module.exports = function (errorResponse, successResponse, headerParser, memberService, eventService, fleetService, sessionService, logger) {
22

33
var pub = {};
44

@@ -14,26 +14,26 @@ module.exports = function (errorResponse, successResponse, headerParser, memberS
1414
sessionService.checkIfValid(req, function (error, isValid) {
1515
if (isValid) {
1616
return errorResponse.respond(req, res, 'state',
17-
'Please leave your current armada before joining a new one.');
17+
'Please leave your current fleet before joining a new one.');
1818
}
1919

20-
armadaService.getByKey(req.params.fleetKey, function (error, armada) {
21-
if (error) return errorResponse.respond(req, res, 'init', 'Error finding armada.');
20+
fleetService.getByKey(req.params.fleetKey, function (error, fleet) {
21+
if (error) return errorResponse.respond(req, res, 'init', 'Error finding fleet.');
2222

23-
if (!armada) {
23+
if (!fleet) {
2424
return errorResponse.respond(req, res, 'input',
2525
'Invalid Fleet key.');
2626
}
2727

28-
if (armada.password && (req.params.fleetPassword !== armada.password)) {
28+
if (fleet.password && (req.params.fleetPassword !== fleet.password)) {
2929
return errorResponse.respond(req, res, 'password', 'Invalid password.');
3030
}
3131

32-
memberService.addAndGet(headerParser.parse(req), armada.key, function (error, member) {
32+
memberService.addAndGet(headerParser.parse(req), fleet.key, function (error, member) {
3333
if (error) return errorResponse.respond(req, res, 'init', 'Error creating member.');
3434

35-
eventService.addAndGet('memberJoined', member, armada.key, function (error, event) {
36-
sessionService.initialize(req, armada.key, member.key);
35+
eventService.addAndGet('memberJoined', member, fleet.key, function (error, event) {
36+
sessionService.initialize(req, fleet.key, member.key);
3737
successResponse.respond(res);
3838
});
3939
});

‎lib/actions/leaveAction.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function (successResponse, errorResponse, memberService, eventS
88
sessionService.checkIfValid(req, function (error, isValid) {
99
if (!isValid) {
1010
return errorResponse.respond(req, res, 'state',
11-
'You do not seem to be a member of an armada.');
11+
'You do not seem to be a member of an fleet.');
1212
}
1313

1414
memberService.getByKey(req.session.memberKey, function (error, member) {

0 commit comments

Comments
 (0)