', {
- class: ['col-xs-12', 'col-sm-6', 'col-md-4'].join(' ')
+ class: ['col-xs-12', 'col-sm-4'].join(' ')
}).append(
$('
', {
class: config.moduleHeadClass
diff --git a/public/js/v1.5.4/app/ui/module/system_info.js b/public/js/v1.5.4/app/ui/module/system_info.js
index 5136c3bb..737a40a3 100644
--- a/public/js/v1.5.4/app/ui/module/system_info.js
+++ b/public/js/v1.5.4/app/ui/module/system_info.js
@@ -27,7 +27,8 @@ define([
typeLinkClass: 'pf-system-info-type', // class for "type" name
urlLinkClass: 'pf-system-info-url', // class for "url" copy link
- // info table
+ // info col/table
+ systemInfoSectionClass: 'pf-system-info-section', // class for system info section
systemInfoTableClass: 'pf-module-table', // class for system info table
systemInfoNameClass: 'pf-system-info-name', // class for "name" information element
systemInfoEffectClass: 'pf-system-info-effect', // class for "effect" information element
@@ -37,9 +38,21 @@ define([
systemInfoWormholeClass: 'pf-system-info-wormhole-', // class prefix for static wormhole element
// description field
- descriptionAreaClass: 'pf-system-info-description-area', // class for "description" area
+ descriptionSectionClass: 'pf-system-description-section', // class for system description section
+ descriptionAreaClass: 'pf-system-info-description-area', // class for description area
addDescriptionButtonClass: 'pf-system-info-description-button', // class for "add description" button
- descriptionTextareaElementClass: 'pf-system-info-description', // class for "description" textarea element (Summernote)
+ descriptionTextareaElementClass: 'pf-system-info-description', // class for description textarea element (Summernote)
+
+ // sovereignty col/table
+ systemSovSectionClass: 'pf-system-sov-section', // class for system sov. section
+ systemSovTableClass: 'pf-module-table', // class for system sov. table
+ systemSovFwContestedRowClass: 'pf-system-sov-fw-contested-row', // class for "contested" sov. table row
+ systemSovFwOccupationRowClass: 'pf-system-sov-fw-occupation-row', // class for "-occupation" sov. table row
+ systemSovFwContestedClass: 'pf-system-sov-fw-contested',
+ systemSovFwPercentageClass: 'pf-system-sov-fw-percentage',
+ systemSovFwOccupationClass: 'pf-system-sov-fw-occupation',
+ systemSovFwOccupationImageClass: 'pf-system-sov-fw-occupation-image',
+ systemSovFwStatusIconClass: 'pf-system-sov-fw-status-icon',
// fonts
fontTriglivianClass: 'pf-triglivian', // class for "Triglivian" names (e.g. Abyssal systems)
@@ -115,12 +128,64 @@ define([
}
}
+ // update faction warfare rows ----------------------------------------------------------------------------
+ let fwContestedRow = moduleElement.find('.' + config.systemSovFwContestedRowClass);
+ let fwOccupationRow = moduleElement.find('.' + config.systemSovFwOccupationRowClass);
+ if(systemData.factionWar){
+ let contested = String(Util.getObjVal(systemData.factionWar, 'contested') || '');
+ let percentage = parseInt(Util.getObjVal(systemData.factionWar, 'victoryPercentage')) || 0;
+ let occupierFaction = Util.getObjVal(systemData.factionWar, 'occupierFaction');
+
+ let statusColor = 'red';
+ if(occupierFaction){
+ // system is "occupied" by hostile "occupierFaction" (stable)
+ // -> hide percent
+ statusColor = '#d9534f';
+ percentage += '%';
+ }else if('uncontested' === contested){
+ // system is "uncontested" and owned by default ownerFaction (stable)
+ // -> hide percent
+ statusColor = '#4f9e4f';
+ percentage = 'stable';
+ }else if('contested' === contested){
+ // system is "contested", 0%-99% percentage
+ statusColor = '#e28a0d';
+ percentage += '%';
+ }else if(
+ 'vulnerable' === contested ||
+ 'captured' === contested
+ ){
+ // system is "vulnerable", 100% percentage
+ // -> "captured" state is might be the same?!
+ statusColor = '#d747d6';
+ percentage = '100%';
+ }
+
+ fwContestedRow.find('.' + config.systemSovFwStatusIconClass)[0].style.setProperty('--color', statusColor);
+ fwContestedRow.find('.' + config.systemSovFwContestedClass).text(contested);
+ fwContestedRow.find('.' + config.systemSovFwPercentageClass).text(percentage);
+ fwContestedRow.show();
+
+ let occupierFactionImage = Util.eveImageUrl('alliance', (occupierFaction ? occupierFaction.id : 0), 64);
+ let occupierFactionName = occupierFaction ? occupierFaction.name : '';
+
+ fwOccupationRow.find('.' + config.systemSovFwOccupationImageClass)[0].style.setProperty('--bg-image', 'url(\'' + occupierFactionImage + '\')');
+ fwOccupationRow.find('.' + config.systemSovFwOccupationClass).text(occupierFactionName);
+ if(occupierFaction){
+ fwOccupationRow.show();
+ }
+ }else{
+ fwContestedRow.hide();
+ fwOccupationRow.hide();
+ }
+
if(setUpdated){
moduleElement.data('updated', systemData.updated.updated);
}
}
moduleElement.find('.' + config.descriptionAreaClass).hideLoadingAnimation();
+ moduleElement.find('.' + config.systemSovSectionClass + ' .' + Util.config.dynamicAreaClass).hideLoadingAnimation();
};
/**
@@ -135,6 +200,56 @@ define([
// store systemId -> module can be updated with the correct data
moduleElement.data('id', systemData.id);
+ // system "sovereignty" data
+ // "primary" data is eigther "alliance" -> 0.0 space
+ // or "faction" -> Empire Regions (LS, HS)
+ let sovereigntyDefault = {
+ row1Label: 'Sov.',
+ row1Val: '???',
+ row1Img: undefined,
+ row1ImgTitle: undefined,
+ row2Label: undefined,
+ row2Val: undefined,
+ row3Label: undefined,
+ row3Val: undefined
+ };
+
+ let sovereigntyPrimary;
+ let sovereigntySecondary;
+
+ if(systemData.sovereignty){
+ let sovDataFact = Util.getObjVal(systemData.sovereignty, 'faction');
+ let sovDataAlly = Util.getObjVal(systemData.sovereignty, 'alliance');
+ let sovDataCorp = Util.getObjVal(systemData.sovereignty, 'corporation');
+
+ if(sovDataFact){
+ sovereigntyPrimary = {
+ row1Val: 'Faction',
+ row1Img: Util.eveImageUrl('alliance', sovDataFact.id, 64),
+ row1ImgTitle: sovDataFact.name,
+ row2Val: sovDataFact.name
+ };
+ }else{
+ if(sovDataAlly){
+ sovereigntyPrimary = {
+ row1Val: 'Alliance',
+ row1Img: Util.eveImageUrl('alliance', sovDataAlly.id, 64),
+ row1ImgTitle: sovDataAlly.name,
+ row2Val: '<' + sovDataAlly.ticker + '>',
+ row3Label: 'Ally',
+ row3Val: sovDataAlly.name
+ };
+ }
+ if(sovDataCorp){
+ sovereigntySecondary = {
+ row1Label: 'Corp',
+ row1Val: sovDataCorp.name,
+ row1Img: Util.eveImageUrl('corporation', sovDataCorp.id, 64)
+ };
+ }
+ }
+ }
+
// system "static" wh data
let staticsData = [];
if(
@@ -152,9 +267,15 @@ define([
let data = {
system: systemData,
+ sovereigntyPrimary: sovereigntyPrimary ? Object.assign({}, sovereigntyDefault, sovereigntyPrimary) : undefined,
+ sovereigntySecondary: sovereigntySecondary ? Object.assign({}, sovereigntyDefault, sovereigntySecondary) : undefined,
static: staticsData,
moduleHeadlineIconClass: config.moduleHeadlineIconClass,
- tableClass: config.systemInfoTableClass,
+ infoSectionClass: config.systemInfoSectionClass,
+ descriptionSectionClass: config.descriptionSectionClass,
+ sovSectionClass: config.systemSovSectionClass,
+ infoTableClass: config.systemInfoTableClass,
+ sovTableClass: config.systemSovTableClass,
nameInfoClass: config.systemInfoNameClass,
effectInfoClass: config.systemInfoEffectClass,
planetsInfoClass: config.systemInfoPlanetsClass,
@@ -162,6 +283,15 @@ define([
statusInfoClass: config.systemInfoStatusLabelClass,
popoverTriggerClass: Util.config.popoverTriggerClass,
+ // sovereignty table
+ sovFwContestedRowClass: config.systemSovFwContestedRowClass,
+ sovFwOccupationRowClass: config.systemSovFwOccupationRowClass,
+ sovFwContestedInfoClass: config.systemSovFwContestedClass,
+ sovFwPercentageInfoClass: config.systemSovFwPercentageClass,
+ sovFwOccupationInfoClass: config.systemSovFwOccupationClass,
+ sovFwOccupationImageClass: config.systemSovFwOccupationImageClass,
+ sovFwStatusIconClass: config.systemSovFwStatusIconClass,
+
systemUrl: MapUtil.getMapDeeplinkUrl(mapId, systemData.id),
systemTypeName: MapUtil.getSystemTypeInfo(systemData.type.id, 'name'),
systemIsWormhole: MapUtil.getSystemTypeInfo(systemData.type.id, 'name') === 'w-space',
@@ -194,19 +324,22 @@ define([
systemConstellationLinkClass: config.constellationLinkClass,
systemRegionLinkClass: config.regionLinkClass,
systemTypeLinkClass: config.typeLinkClass,
- systemUrlLinkClass: config.urlLinkClass
+ systemUrlLinkClass: config.urlLinkClass,
+ ccpImageServerUrl: Init.url.ccpImageServer,
};
requirejs(['text!templates/modules/system_info.html', 'mustache', 'summernote.loader'], (template, Mustache, Summernote) => {
let content = Mustache.render(template, data);
moduleElement.append(content);
+ let sovSectionArea = moduleElement.find('.' + config.systemSovSectionClass + ' .' + Util.config.dynamicAreaClass);
let descriptionArea = moduleElement.find('.' + config.descriptionAreaClass);
let descriptionButton = moduleElement.find('.' + config.addDescriptionButtonClass);
let descriptionTextareaElement = moduleElement.find('.' + config.descriptionTextareaElementClass);
// lock "description" field until first update
descriptionArea.showLoadingAnimation();
+ sovSectionArea.showLoadingAnimation();
// WYSIWYG init on button click ---------------------------------------------------------------------------
descriptionButton.on('click', function(e){
diff --git a/public/js/v1.5.4/app/ui/module/system_intel.js b/public/js/v1.5.4/app/ui/module/system_intel.js
index 378c9d42..3407bc74 100644
--- a/public/js/v1.5.4/app/ui/module/system_intel.js
+++ b/public/js/v1.5.4/app/ui/module/system_intel.js
@@ -452,7 +452,7 @@ define([
_: function(data, type, row, meta){
let value = data;
if(type === 'display' && value){
- value = '
';
+ value = '
 +')
';
}
return value;
}
@@ -486,7 +486,7 @@ define([
let value = data;
if(type === 'display' && value){
value = '
';
- value += '
';
+ value += ' + ')
';
value += '';
}
return value;
@@ -625,7 +625,7 @@ define([
'
' +
' | ' +
'' +
- ' ' +
+ ' + ') ' +
' | ' +
'' + group.name + ' | ' +
'
'
diff --git a/public/js/v1.5.4/app/util.js b/public/js/v1.5.4/app/util.js
index 1c9a55c0..54458cf3 100644
--- a/public/js/v1.5.4/app/util.js
+++ b/public/js/v1.5.4/app/util.js
@@ -552,7 +552,7 @@ define([
userData: userData,
otherCharacters: () => {
return userData.characters.filter((character, i) => {
- let characterImage = Init.url.ccpImageServer + '/Character/' + character.id + '_32.jpg';
+ let characterImage = eveImageUrl('character', character.id);
// preload image (prevent UI flicker
let img= new Image();
img.src = characterImage;
@@ -852,6 +852,23 @@ define([
*/
let showVersionInfo = () => Con.showVersionInfo(getVersion());
+ /**
+ * get CCP image URLs for
+ * @param type 'alliance'|'corporation'|'character'|'type'|'render'
+ * @param id
+ * @param size
+ * @returns {boolean}
+ */
+ let eveImageUrl = (type, id, size = 32) => {
+ let url = false;
+ if(typeof type === 'string' && typeof id === 'number' && typeof size === 'number'){
+ type = type.capitalize();
+ let format = type === 'Character' ? 'jpg' : 'png';
+ url = Init.url.ccpImageServer + '/' + type + '/' + id + '_' + size + '.' + format;
+ }
+ return url;
+ };
+
/**
* polyfill for "passive" events
* -> see https://github.com/zzarcon/default-passive-events
@@ -2303,26 +2320,28 @@ define([
* get a HTML table with universe region information
* e.g. for popover
* @param regionName
- * @param faction
+ * @param sovereignty
* @returns {string}
*/
- let getSystemRegionTable = (regionName, faction) => {
+ let getSystemRegionTable = (regionName, sovereignty) => {
+ let data = [{label: 'Region', value: regionName}];
+ if(sovereignty){
+ if(sovereignty.faction){
+ data.push({label: 'Sov. Faction', value: sovereignty.faction.name});
+ }
+ if(sovereignty.alliance){
+ data.push({label: 'Sov. Ally', value: sovereignty.alliance.name});
+ }
+ }
+
let table = '
';
- table += '';
- table += '| ';
- table += 'Region';
- table += ' | ';
- table += '';
- table += regionName;
- table += ' | ';
- table += '
';
- table += '';
- if(faction){
+ for(let rowData of data){
+ table += '
';
table += '| ';
- table += 'Faction';
+ table += rowData.label;
table += ' | ';
table += '';
- table += faction.name;
+ table += rowData.value;
table += ' | ';
table += '
';
}
@@ -3425,6 +3444,7 @@ define([
config: config,
getVersion: getVersion,
showVersionInfo: showVersionInfo,
+ eveImageUrl: eveImageUrl,
initPrototypes: initPrototypes,
initDefaultBootboxConfig: initDefaultBootboxConfig,
initDefaultConfirmationConfig: initDefaultConfirmationConfig,
diff --git a/public/templates/dialog/api_status.html b/public/templates/dialog/api_status.html
index d720cfcc..f79c2121 100644
--- a/public/templates/dialog/api_status.html
+++ b/public/templates/dialog/api_status.html
@@ -1,7 +1,10 @@
Shows status information for external used APIs. Provides a general health indicator per route and method.
-{{ apiData.name }}
-
+
+
+
+ {{ apiData.name }}
+ {{ apiData.cache }}
@@ -42,7 +45,7 @@
{{#apiData.routes}}
- |
+ |
|
diff --git a/public/templates/dialog/jump_info.html b/public/templates/dialog/jump_info.html
index 40ff5f3d..baac3836 100644
--- a/public/templates/dialog/jump_info.html
+++ b/public/templates/dialog/jump_info.html
@@ -44,8 +44,8 @@
| {{#massValue}}{{massIndividual}}{{/massValue}} |
{{#massValue}}{{massRegeneration}}{{/massValue}} |
{{#formatTime}}{{maxStableTime}}{{/formatTime}} |
-
- {{#sigStrengthValue}}{{signatureStrength}}{{/sigStrengthValue}}
+ |
+ {{#sigStrengthValue}}{{scanWormholeStrength}}{{/sigStrengthValue}}
|
{{/wormholes}}
diff --git a/public/templates/layout/header_map.html b/public/templates/layout/header_map.html
index fe5466fa..47a18d2a 100644
--- a/public/templates/layout/header_map.html
+++ b/public/templates/layout/header_map.html
@@ -1,13 +1,9 @@
-
-{{! Render the *.svg logo. So it can be used through the "use" tag}}
-{{{logo}}}
-
';
+ value = ' + '_32.png)
';
}
return value;
}
diff --git a/js/app/map/map.js b/js/app/map/map.js
index e798693f..ac68255f 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -546,13 +546,15 @@ define([
system.data('region', data.region.name);
system.data('constellationId', parseInt(data.constellation.id));
system.data('constellation', data.constellation.name);
- system.data('faction', data.faction);
system.data('planets', data.planets);
system.data('shattered', data.shattered);
system.data('statics', data.statics);
system.data('updated', parseInt(data.updated.updated));
system.data('changed', false);
system.attr('data-mapid', parseInt(mapContainer.data('id')));
+ if(data.sovereignty){
+ system.data('sovereignty', data.sovereignty);
+ }
// locked system
if( Boolean(system.data('locked')) !== data.locked ){
@@ -3046,47 +3048,58 @@ define([
*/
$.fn.getSystemData = function(minimal = false){
let system = $(this);
+ let data = system.data();
let systemData = {
- id: parseInt(system.data('id')),
+ id: parseInt(data.id),
updated: {
- updated: parseInt(system.data('updated'))
+ updated: parseInt(data.updated)
}
};
if(!minimal){
- systemData = Object.assign(systemData, {
- systemId: parseInt(system.data('systemId')),
- name: system.data('name'),
+ let systemDataComplete = {
+ systemId: parseInt(data.systemId),
+ name: data.name,
alias: system.getSystemInfo(['alias']),
- effect: system.data('effect'),
+ effect: data.effect,
type: {
- id: system.data('typeId')
+ id: data.typeId
},
- security: system.data('security'),
- trueSec: system.data('trueSec'),
+ security: data.security,
+ trueSec: data.trueSec,
region: {
- id: system.data('regionId'),
- name: system.data('region')
+ id: data.regionId,
+ name: data.region
},
constellation: {
- id: system.data('constellationId'),
- name: system.data('constellation')
+ id: data.constellationId,
+ name: data.constellation
},
status: {
- id: system.data('statusId')
+ id: data.statusId
},
- locked: system.data('locked') ? 1 : 0,
- rallyUpdated: system.data('rallyUpdated') || 0,
- rallyPoke: system.data('rallyPoke') ? 1 : 0,
- currentUser: system.data('currentUser'), // if user is currently in this system
- faction: system.data('faction'),
- planets: system.data('planets'),
- shattered: system.data('shattered') ? 1 : 0,
- statics: system.data('statics'),
- userCount: (system.data('userCount') ? parseInt(system.data('userCount')) : 0),
+ locked: data.locked ? 1 : 0,
+ rallyUpdated: data.rallyUpdated || 0,
+ rallyPoke: data.rallyPoke ? 1 : 0,
+ currentUser: data.currentUser, // if user is currently in this system
+ planets: data.planets,
+ shattered: data.shattered ? 1 : 0,
+ statics: data.statics,
+ userCount: parseInt(data.userCount) || 0,
position: MapUtil.getSystemPosition(system)
- });
+ };
+
+ let optionalDataKeys = ['sovereignty'];
+
+ for(let dataKey of optionalDataKeys){
+ let value = system.data(dataKey);
+ if(value !== null && value !== undefined){
+ systemDataComplete[dataKey] = value;
+ }
+ }
+
+ systemData = Object.assign(systemData, systemDataComplete);
}
return systemData;
diff --git a/js/app/map/overlay/overlay.js b/js/app/map/overlay/overlay.js
index 8fdb7c81..582e8e20 100644
--- a/js/app/map/overlay/overlay.js
+++ b/js/app/map/overlay/overlay.js
@@ -370,15 +370,16 @@ define([
// init popover if not already exists
if(!systemHead.data('bs.popover')){
let system = systemHead.parent();
+ let systemData = system.data();
systemHead.popover({
- placement: 'right',
+ placement: 'bottom',
html: true,
trigger: 'manual',
container: mapElement,
title: false,
content: Util.getSystemRegionTable(
- system.data('region'),
- system.data('faction') || null
+ Util.getObjVal(systemData, 'region'),
+ Util.getObjVal(systemData, 'sovereignty')
)
});
}
diff --git a/js/app/map/util.js b/js/app/map/util.js
index 9b19fe39..93b8f80d 100644
--- a/js/app/map/util.js
+++ b/js/app/map/util.js
@@ -806,10 +806,9 @@ define([
// collect all required data from map module to update the info element
// store them global and assessable for each module
- Util.setCurrentSystemData({
- systemData: system.getSystemData(),
- mapId: parseInt( system.attr('data-mapid') )
- });
+ let systemData = system.getSystemData();
+ systemData.mapId = parseInt(system.attr('data-mapid')) || 0;
+ Util.setCurrentSystemData(systemData);
};
/**
@@ -1869,10 +1868,10 @@ define([
if(tooltipData.maxStableTime){
data.maxStableTime = tooltipData.maxStableTime + ' h';
}
- if(tooltipData.signatureStrength){
- data.signatureStrength = parseFloat(tooltipData.signatureStrength).toLocaleString() + ' %';
+ if(tooltipData.scanWormholeStrength){
+ data.scanWormholeStrength = parseFloat(tooltipData.scanWormholeStrength).toLocaleString() + ' %';
}else{
- data.signatureStrength = 'unknown';
+ data.scanWormholeStrength = 'unknown';
}
let title = tooltipData.name;
diff --git a/js/app/mappage.js b/js/app/mappage.js
index b0f23f6d..cdd12e16 100644
--- a/js/app/mappage.js
+++ b/js/app/mappage.js
@@ -447,7 +447,7 @@ define([
// start user update trigger after map loaded
updateTimeouts.userUpdate = setTimeout(() => {
triggerUserUpdatePing();
- }, 1000);
+ }, 500);
}
});
}
diff --git a/js/app/module_map.js b/js/app/module_map.js
index 2863bf97..51bf9aa8 100644
--- a/js/app/module_map.js
+++ b/js/app/module_map.js
@@ -353,7 +353,7 @@ define([
// request "additional" system data (e.g. Structures, Description)
// -> this is used to update some modules after initial draw
- let promiseRequestData = Util.request('GET', 'system', currentSystemData.systemData.id, {mapId: currentSystemData.mapId});
+ let promiseRequestData = Util.request('GET', 'system', currentSystemData.id, {mapId: currentSystemData.mapId});
// draw modules -------------------------------------------------------------------------------------------
@@ -361,22 +361,22 @@ define([
let secondCell = tabContentElement.find('.' + config.mapTabContentCellSecond);
// draw system info module
- let promiseInfo = drawModule(firstCell, SystemInfoModule, currentSystemData.mapId, currentSystemData.systemData);
+ let promiseInfo = drawModule(firstCell, SystemInfoModule, currentSystemData.mapId, currentSystemData);
// draw system graph module
- drawModule(firstCell, SystemGraphModule, currentSystemData.mapId, currentSystemData.systemData);
+ drawModule(firstCell, SystemGraphModule, currentSystemData.mapId, currentSystemData);
// draw signature table module
- let promiseSignature = drawModule(firstCell, SystemSignatureModule, currentSystemData.mapId, currentSystemData.systemData);
+ let promiseSignature = drawModule(firstCell, SystemSignatureModule, currentSystemData.mapId, currentSystemData);
// draw system routes module
- drawModule(secondCell, SystemRouteModule, currentSystemData.mapId, currentSystemData.systemData);
+ drawModule(secondCell, SystemRouteModule, currentSystemData.mapId, currentSystemData);
// draw system intel module
- let promiseIntel = drawModule(secondCell, SystemIntelModule, currentSystemData.mapId, currentSystemData.systemData);
+ let promiseIntel = drawModule(secondCell, SystemIntelModule, currentSystemData.mapId, currentSystemData);
// draw system killboard module
- drawModule(secondCell, SystemKillboardModule, currentSystemData.mapId, currentSystemData.systemData);
+ drawModule(secondCell, SystemKillboardModule, currentSystemData.mapId, currentSystemData);
// update some modules ------------------------------------------------------------------------------------
promiseDrawAll.push(promiseRequestData, promiseInfo, promiseSignature, promiseIntel);
@@ -479,7 +479,7 @@ define([
if(
currentSystemData &&
- systemData.id === currentSystemData.systemData.id
+ systemData.id === currentSystemData.id
){
// trigger system update events
let tabContentElement = $('#' + config.mapTabIdPrefix + systemData.mapId + '.' + config.mapTabContentClass);
diff --git a/js/app/page.js b/js/app/page.js
index 27c361d4..daf73d09 100644
--- a/js/app/page.js
+++ b/js/app/page.js
@@ -11,7 +11,6 @@ define([
'app/map/util',
'app/map/contextmenu',
'slidebars',
- 'text!img/logo.svg!strip',
'text!templates/layout/header_map.html',
'text!templates/layout/footer_map.html',
'dialog/notification',
@@ -27,7 +26,7 @@ define([
'dialog/credit',
'xEditable',
'app/module_map'
-], ($, Init, Util, Logging, Mustache, MapUtil, MapContextMenu, SlideBars, TplLogo, TplHead, TplFooter) => {
+], ($, Init, Util, Logging, Mustache, MapUtil, MapContextMenu, SlideBars, TplHead, TplFooter) => {
'use strict';
@@ -152,6 +151,7 @@ define([
loadFooter(pageElement),
loadLeftMenu(pageMenuLeftElement),
loadRightMenu(pageMenuRightElement),
+ loadSVGs()
]).then(payload => Promise.all([
setMenuObserver(payload[2].data),
setMenuObserver(payload[3].data),
@@ -413,6 +413,35 @@ define([
return new Promise(executor);
};
+ /**
+ * load standalone