weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed css error in data-coalition

Browse Source
This commit is contained in:
Pax1601 2023-03-09 22:40:56 +01:00
parent 8c6af31893
commit a81125729e
7 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/public/stylesheets/olympus.css
View File

@ -655,5 +655,5 @@ body[data-hide-naval] #unit-visibility-control-naval {
transform: translateX(var(--height));
}
[data-coalition=blue] {background-color: var(--primary-blue) !important}
[data-coalition=red] {background-color:var(--primary-red)!important}
[data-coalition=blue], [data-active-coalition=blue] {background-color: var(--primary-blue)}
[data-coalition=red], [data-active-coalition=red] {background-color:var(--primary-red)}

2
client/src/index.ts
View File

@ -248,7 +248,7 @@ export function getConnectionStatusPanel() {
export function setActiveCoalition(newActiveCoalition: string) {
activeCoalition = newActiveCoalition;
document.querySelectorAll('[data-coalition]').forEach((element: any) => {element.setAttribute("data-coalition", activeCoalition)});
document.querySelectorAll('[data-active-coalition]').forEach((element: any) => {element.setAttribute("data-active-coalition", activeCoalition)});
}
export function getActiveCoalition() {

8
client/views/contextmenu.ejs
View File

@ -2,13 +2,13 @@
<div class="ol-panel">
<label id="context-menu-switch" class="toggle" for="context-menu-toggle">
<input class="toggle-input" name="" type="checkbox" id="context-menu-toggle">
<div data-coalition="blue" class="toggle-fill"></div>
<div data-active-coalition="blue" class="toggle-fill"></div>
</label>
<div id="unit-spawn" class="ol-group">
<button data-coalition="blue" id="unit-spawn-aircraft" title="Spawn aircraft" data-on-click="contextMenuShow"
<button data-active-coalition="blue" id="unit-spawn-aircraft" title="Spawn aircraft" data-on-click="contextMenuShow"
data-on-click-params='{ "unitType": "aircraft" }'></button>
<button data-coalition="blue" id="unit-spawn-ground" title="Spawn ground unit" data-on-click="contextMenuShow"
<button data-active-coalition="blue" id="unit-spawn-ground" title="Spawn ground unit" data-on-click="contextMenuShow"
data-on-click-params='{ "unitType": "ground" }'></button>
</div>
</div>
@ -39,6 +39,6 @@
</div>
</div>
</div>
<button id="deploy-unit-button" title="" data-coalition="blue" data-on-click="contextMenuDeployUnit">Deploy units</button>
<button id="deploy-unit-button" title="" data-active-coalition="blue" data-on-click="contextMenuDeployUnit">Deploy units</button>
</div>
</div>

1
src/core/include/unitsmanager.h
View File

@ -11,7 +11,6 @@ public:
~UnitsManager();
Unit* getUnit(int ID);
void expireMeasures();
void updateExportData(lua_State* L);
void updateMissionData(json::value missionData);
void getData(json::value& answer, int time);

1
src/core/src/core.cpp
View File

@ -67,7 +67,6 @@ extern "C" DllExport int coreFrame(lua_State* L)
{
if (unitsManager != nullptr)
{
unitsManager->expireMeasures();
unitsManager->updateExportData(L);
}
before = std::chrono::system_clock::now();

5
src/core/src/server.cpp
View File

@ -78,8 +78,9 @@ void Server::handle_get(http_request request)
{
if (path[0] == UNITS_URI)
{
wstring fragment = uri::decode(request.relative_uri().fragment())
unitsManager->getData(answer);
wstring fragment = uri::decode(request.relative_uri().fragment());
log(fragment);
//unitsManager->getData(answer);
}
else if (path[0] == LOGS_URI)
{

10
src/core/src/unitsmanager.cpp
View File

@ -32,16 +32,6 @@ Unit* UnitsManager::getUnit(int ID)
}
}
void UnitsManager::expireMeasures()
{
/* Decrement the time to live of all measures and remove stale measures */
for (auto const& p : units)
{
p.second->expireMeasures();
}
}
void UnitsManager::updateExportData(lua_State* L)
{
map<int, json::value> unitJSONs = getAllUnits(L);