diff --git a/src/components/shared/_responsive.scss b/src/components/shared/_responsive.scss
index f1b2facbb0..18b7df1954 100644
--- a/src/components/shared/_responsive.scss
+++ b/src/components/shared/_responsive.scss
@@ -214,7 +214,7 @@
}
&#helpDialog {
font-size: 0.7em;
- height: 530px;
+ height: 550px;
width: 600px;
table {
width: 90%;
diff --git a/src/js/settings.js b/src/js/settings.js
index 3a4701fb80..4e8d55b202 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -65,7 +65,13 @@ export function loadSettings(){
dropdownParent: $("#helpDialog"),
minimumResultsForSearch: -1, // Disable search
});
- $(".dropbtn6").val(fontSize).trigger("change");;
+ $(".dropbtn6").val(fontSize).trigger("change");
+
+ App.userSettings.copyNextFlags = loadLocalSetting("settings-copy-next-flags", 0);
+ $("#copyNextFlagsSettings").prop("checked", App.userSettings.copyNextFlags);
+
+ App.userSettings.copyTarget = loadLocalSetting("settings-copy-target", 0);
+ $("#targetCopySetting").prop("checked", App.userSettings.copyTarget);
App.userSettings.circlesFlags = loadLocalSetting("settings-circles-flags");
$("#circlesFlagsSettings").prop("checked", App.userSettings.circlesFlags);
@@ -331,6 +337,18 @@ $("#realMaxRangeSettings").on("change", function() {
App.minimap.updateWeapons();
});
+$("#targetCopySetting").on("change", function() {
+ var val = $("#targetCopySetting").is(":checked");
+ App.userSettings.copyTarget = val;
+ localStorage.setItem("settings-copy-target", +val);
+});
+
+$("#copyNextFlagsSettings").on("change", function() {
+ var val = $("#copyNextFlagsSettings").is(":checked");
+ App.userSettings.copyNextFlags = val;
+ localStorage.setItem("settings-copy-next-flags", +val);
+});
+
$("#cursorChoiceSettings").on("change", function() {
var val = $("#cursorChoiceSettings").is(":checked");
App.userSettings.cursor = val;
diff --git a/src/js/squadLayer.js b/src/js/squadLayer.js
index b1a698085f..165dd9a949 100644
--- a/src/js/squadLayer.js
+++ b/src/js/squadLayer.js
@@ -2,6 +2,7 @@
import { DivIcon, Marker, Circle, LayerGroup, Polyline, Polygon, Rectangle, FeatureGroup } from "leaflet";
import { SquadObjective } from "./squadObjective.js";
import { App } from "../app.js";
+import i18next from "i18next";
export class SquadLayer {
@@ -703,21 +704,29 @@ export class SquadLayer {
console.debug("Flags next step :", nextFlags);
+
+ let nextFlagsNamesArray = [];
+
// Highlight the next flags with a proper class
nextFlags.forEach((flag) => {
flag.flag._icon.classList.add("next");
flag.flag.options.icon.options.className = "flag flag" + flag.position + " next";
flag.isNext = true;
+ nextFlagsNamesArray.push(flag.name);
});
+ // Copy the next flags names to the clipboard
+ if (App.userSettings.copyNextFlags) {
+ App.copy(i18next.t("common:nextFlags") + " : " + nextFlagsNamesArray.join("/"));
+ }
+
+
// Only one flag in front ? Click it
if (nextFlags.length === 1 && !backward && App.userSettings.autoLane){
this._handleFlagClick(nextFlags[0]);
}
-
}
-
/**
* Remove clusters that were not reachable from the previous position
* @param {Set} reachableClusters - Set of reachable clusters
diff --git a/src/js/squadMarker.js b/src/js/squadMarker.js
index cc3804cc14..9199b4bc8e 100644
--- a/src/js/squadMarker.js
+++ b/src/js/squadMarker.js
@@ -564,7 +564,6 @@ export var squadTargetMarker = squadMarker.extend({
this.addTo(this.map.activeTargetsMarkers);
this.miniCircle = new CircleMarker(latlng, this.miniCircleOptions).addTo(this.map.markersGroup);
this.firingSolution1 = new SquadFiringSolution(this.map.activeWeaponsMarkers.getLayers()[0].getLatLng(), this.getLatLng(), this.map, this.map.activeWeaponsMarkers.getLayers()[0].heightPadding);
-
// Report target to squadcalc API
sendTargetData({
lat: latlng.lat,
@@ -577,18 +576,23 @@ export var squadTargetMarker = squadMarker.extend({
// Calc PopUps
this.calcMarker1 = new Popup(popUpOptions_weapon1).setLatLng(latlng).addTo(this.map.markersGroup);
this.calcMarker2 = new Popup(popUpOptions_weapon2).setLatLng(latlng).addTo(this.map.markersGroup);
- this.updateCalcPopUps();
- this.calcMarker1.setContent(this.getContent(this.firingSolution1, this.map.activeWeaponsMarkers.getLayers()[0].angleType)).openOn(this.map);
-
// posPopUp
this.posPopUp = new Popup(this.posPopUpOptions).setLatLng(latlng).addTo(this.map.markersGroup).close();
+ this.updateCalcPopUps();
+
+ const [html1, clipboard1] = this.getContent(this.firingSolution1, this.map.activeWeaponsMarkers.getLayers()[0].angleType);
+ this.calcMarker1.setContent(html1).openOn(this.map);
+ if (App.userSettings.copyTarget) App.copy(clipboard1);
+
// If two weapons already on the map
if (this.map.activeWeaponsMarkers.getLayers().length === 2) {
weaponPos = this.map.activeWeaponsMarkers.getLayers()[1].getLatLng();
this.firingSolution2 = new SquadFiringSolution(weaponPos, this.getLatLng(), this.map, this.map.activeWeaponsMarkers.getLayers()[1].heightPadding);
- this.calcMarker1.setContent(`1. ${this.getContent(this.firingSolution1, this.map.activeWeaponsMarkers.getLayers()[0].angleType)}`);
- this.calcMarker2.setContent(`2. ${this.getContent(this.firingSolution2, this.map.activeWeaponsMarkers.getLayers()[1].angleType)}`).openOn(this.map);
+ this.calcMarker1.setContent(`1. ${html1}`);
+ const [html2, clipboard2] = this.getContent(this.firingSolution2, this.map.activeWeaponsMarkers.getLayers()[1].angleType);
+ this.calcMarker2.setContent(`2. ${html2}`).openOn(this.map);
+ if (App.userSettings.copyTarget) App.copy(`${clipboard1} / ${clipboard2}`);
}
// Initiate Spread Ellipse
@@ -727,7 +731,8 @@ export var squadTargetMarker = squadMarker.extend({
content += `