dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved "jump log" dialog. current ship name and mass values are new default values in new "jump log" form. #709

Browse Source
This commit is contained in:
Mark Friedrich
2018-12-01 15:47:53 +01:00
parent dca86146a1
commit 860aec72a0
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/app/ui/module/connection_info.js
View File

@@ -718,7 +718,8 @@ define([
if(currentUserData.character.log){
logData.ship = {
id: currentUserData.character.log.ship.typeId,
name: currentUserData.character.log.ship.typeName
name: currentUserData.character.log.ship.typeName,
mass: currentUserData.character.log.ship.mass
};
}
}
@@ -1107,7 +1108,7 @@ define([
selectElementType.initUniverseTypeSelect({
categoryIds: [6],
maxSelectionLength: 1,
selected: [Util.getObjVal(logData, 'ship.typeId')]
selected: [Util.getObjVal(logData, 'ship.id')]
}).on('select2:select select2:unselecting', function(e){
// get ship mass from selected ship type and update mass input field
let shipMass = e.params.data ? e.params.data.mass / 1000 : '';

5
public/js/v1.4.3/app/ui/module/connection_info.js
View File

@@ -718,7 +718,8 @@ define([
if(currentUserData.character.log){
logData.ship = {
id: currentUserData.character.log.ship.typeId,
name: currentUserData.character.log.ship.typeName
name: currentUserData.character.log.ship.typeName,
mass: currentUserData.character.log.ship.mass
};
}
}
@@ -1107,7 +1108,7 @@ define([
selectElementType.initUniverseTypeSelect({
categoryIds: [6],
maxSelectionLength: 1,
selected: [Util.getObjVal(logData, 'ship.typeId')]
selected: [Util.getObjVal(logData, 'ship.id')]
}).on('select2:select select2:unselecting', function(e){
// get ship mass from selected ship type and update mass input field
let shipMass = e.params.data ? e.params.data.mass / 1000 : '';

2
public/templates/ui/info_panel.html
View File

@@ -1,4 +1,4 @@
<div id="{{id}}" class="alert alert-warning">
<div class="ui-pnotify-icon"><span class="fas fa-exclamation fa-fw fa-lg"></span></div>
<h4 class="ui-pnotify-title">Scheduled maintenance: Update v1.4.1 <i class="fas fa-long-arrow-alt-right"></i> v1.4.2; Shutdown: ~17:45 (UTC). ETA ~18:00 (UTC)</h4>
<h4 class="ui-pnotify-title">Scheduled maintenance: Update v1.4.2 <i class="fas fa-long-arrow-alt-right"></i> v1.4.3; Shutdown: ~18:00 (UTC). ETA ~18:20 (UTC)</h4>
</div>