Page MenuHomeWildfire Games

Allow "orderone"-hotkey for preselected actions.
ClosedPublic

Authored by Freagarach on May 10 2020, 11:23 AM.

Details

Reviewers
Imarok
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP23651: Allow "orderone"-hotkey for preselected actions.
Trac Tickets
#5750
Summary

Noticed after looking into #5750, but this does not fix that.

Test Plan

Verify that when using a preselected action in combination with the "orderone"-hotkey works as intended and ordering the last entity in the selection does not error out or produce unexpected behaviour.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Freagarach created this revision.May 10 2020, 11:23 AM
Owners added a subscriber: Restricted Owners Package.May 10 2020, 11:24 AM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (no-undef-init):
|    | It's not necessary to initialize 'actionInfo' to undefined.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 238| 238| 	// if two actions are possible, the first one is taken
| 239| 239| 	// thus the most specific should appear first.
| 240| 240| 
| 241|    |-	let actionInfo = undefined;
|    | 241|+	let actionInfo;
| 242| 242| 	// Disable preselected actions on the minimap because their
| 243| 243| 	// left-click interferes with the minimap left-click anyways.
| 244| 244| 	if (preSelectedAction != ACTION_NONE && !fromMiniMap)
|    | [NORMAL] ESLintBear (space-unary-ops):
|    | Unary word operator 'typeof' must be followed by whitespace.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 334| 334| 	}
| 335| 335| 
| 336| 336| 	var wallPlacementInfo = updateBuildingPlacementPreview(); // entities making up the wall (wall segments, towers, ...)
| 337|    |-	if (!(wallPlacementInfo === false || typeof(wallPlacementInfo) === "object"))
|    | 337|+	if (!(wallPlacementInfo === false || typeof (wallPlacementInfo) === "object"))
| 338| 338| 	{
| 339| 339| 		error("Invalid updateBuildingPlacementPreview return value: " + uneval(wallPlacementInfo));
| 340| 340| 		return false;
|    | [NORMAL] ESLintBear (operator-linebreak):
|    | '&&' should be placed at the end of the line.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 484| 484| 	mouseIsOverObject = (hoveredObject != null);
| 485| 485| 
| 486| 486| 	// Close the menu when interacting with the game world
| 487|    |-	if (!mouseIsOverObject && (ev.type =="mousebuttonup" || ev.type == "mousebuttondown")
| 488|    |-		&& (ev.button == SDL_BUTTON_LEFT || ev.button == SDL_BUTTON_RIGHT))
|    | 487|+	if (!mouseIsOverObject && (ev.type =="mousebuttonup" || ev.type == "mousebuttondown") &&
|    | 488|+		(ev.button == SDL_BUTTON_LEFT || ev.button == SDL_BUTTON_RIGHT))
| 489| 489| 		g_Menu.close();
| 490| 490| 
| 491| 491| 	// State-machine processing:
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 645| 645| 		// user to continue building walls.
| 646| 646| 		switch (ev.type)
| 647| 647| 		{
| 648|    |-			case "mousemotion":
|    | 648|+		case "mousemotion":
| 649| 649| 				placementSupport.wallEndPosition = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
| 650| 650| 
| 651| 651| 				// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 646| 646| 		switch (ev.type)
| 647| 647| 		{
| 648| 648| 			case "mousemotion":
| 649|    |-				placementSupport.wallEndPosition = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
|    | 649|+			placementSupport.wallEndPosition = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
| 650| 650| 
| 651| 651| 				// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
| 652| 652| 				// the ending point and the starting point to snap to.
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 648| 648| 			case "mousemotion":
| 649| 649| 				placementSupport.wallEndPosition = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
| 650| 650| 
| 651|    |-				// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
|    | 651|+			// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
| 652| 652| 				// the ending point and the starting point to snap to.
| 653| 653| 				//
| 654| 654| 				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 649| 649| 				placementSupport.wallEndPosition = Engine.GetTerrainAtScreenPoint(ev.x, ev.y);
| 650| 650| 
| 651| 651| 				// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
| 652|    |-				// the ending point and the starting point to snap to.
|    | 652|+			// the ending point and the starting point to snap to.
| 653| 653| 				//
| 654| 654| 				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
| 655| 655| 				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 650| 650| 
| 651| 651| 				// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
| 652| 652| 				// the ending point and the starting point to snap to.
| 653|    |-				//
|    | 653|+			//
| 654| 654| 				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
| 655| 655| 				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
| 656| 656| 				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 651| 651| 				// Update the structure placement preview, and by extension, the list of snapping candidate entities for both (!)
| 652| 652| 				// the ending point and the starting point to snap to.
| 653| 653| 				//
| 654|    |-				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
|    | 654|+			// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
| 655| 655| 				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
| 656| 656| 				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
| 657| 657| 				// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 652| 652| 				// the ending point and the starting point to snap to.
| 653| 653| 				//
| 654| 654| 				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
| 655|    |-				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
|    | 655|+			// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
| 656| 656| 				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
| 657| 657| 				// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
| 658| 658| 				// in them. Might be useful to query only for entities within a certain range around the starting point and ending
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 653| 653| 				//
| 654| 654| 				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
| 655| 655| 				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
| 656|    |-				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
|    | 656|+			// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
| 657| 657| 				// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
| 658| 658| 				// in them. Might be useful to query only for entities within a certain range around the starting point and ending
| 659| 659| 				// points.
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 654| 654| 				// TODO: Note that here, we need to fetch all similar entities, including any offscreen ones, to support the case
| 655| 655| 				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
| 656| 656| 				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
| 657|    |-				// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
|    | 657|+			// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
| 658| 658| 				// in them. Might be useful to query only for entities within a certain range around the starting point and ending
| 659| 659| 				// points.
| 660| 660| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 655| 655| 				// where the snap entity for the starting point has moved offscreen, or has been deleted/destroyed, or was a
| 656| 656| 				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
| 657| 657| 				// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
| 658|    |-				// in them. Might be useful to query only for entities within a certain range around the starting point and ending
|    | 658|+			// in them. Might be useful to query only for entities within a certain range around the starting point and ending
| 659| 659| 				// points.
| 660| 660| 
| 661| 661| 				placementSupport.wallSnapEntitiesIncludeOffscreen = true;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 656| 656| 				// foundation and has been replaced with a completed entity since the user first chose it. Fetching all towers on
| 657| 657| 				// the entire map instead of only the current screen might get expensive fast since walls all have a ton of towers
| 658| 658| 				// in them. Might be useful to query only for entities within a certain range around the starting point and ending
| 659|    |-				// points.
|    | 659|+			// points.
| 660| 660| 
| 661| 661| 				placementSupport.wallSnapEntitiesIncludeOffscreen = true;
| 662| 662| 				var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 658| 658| 				// in them. Might be useful to query only for entities within a certain range around the starting point and ending
| 659| 659| 				// points.
| 660| 660| 
| 661|    |-				placementSupport.wallSnapEntitiesIncludeOffscreen = true;
|    | 661|+			placementSupport.wallSnapEntitiesIncludeOffscreen = true;
| 662| 662| 				var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
| 663| 663| 
| 664| 664| 				if (result && result.cost)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 659| 659| 				// points.
| 660| 660| 
| 661| 661| 				placementSupport.wallSnapEntitiesIncludeOffscreen = true;
| 662|    |-				var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
|    | 662|+			var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
| 663| 663| 
| 664| 664| 				if (result && result.cost)
| 665| 665| 				{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 661| 661| 				placementSupport.wallSnapEntitiesIncludeOffscreen = true;
| 662| 662| 				var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
| 663| 663| 
| 664|    |-				if (result && result.cost)
|    | 664|+			if (result && result.cost)
| 665| 665| 				{
| 666| 666| 					var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
| 667| 667| 					placementSupport.tooltipMessage = [
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 662| 662| 				var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
| 663| 663| 
| 664| 664| 				if (result && result.cost)
| 665|    |-				{
|    | 665|+			{
| 666| 666| 					var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
| 667| 667| 					placementSupport.tooltipMessage = [
| 668| 668| 						getEntityCostTooltip(result),
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 663| 663| 
| 664| 664| 				if (result && result.cost)
| 665| 665| 				{
| 666|    |-					var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
|    | 666|+				var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
| 667| 667| 					placementSupport.tooltipMessage = [
| 668| 668| 						getEntityCostTooltip(result),
| 669| 669| 						getNeededResourcesTooltip(neededResources)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 664| 664| 				if (result && result.cost)
| 665| 665| 				{
| 666| 666| 					var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
| 667|    |-					placementSupport.tooltipMessage = [
|    | 667|+				placementSupport.tooltipMessage = [
| 668| 668| 						getEntityCostTooltip(result),
| 669| 669| 						getNeededResourcesTooltip(neededResources)
| 670| 670| 					].filter(tip => tip).join("\n");
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 665| 665| 				{
| 666| 666| 					var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
| 667| 667| 					placementSupport.tooltipMessage = [
| 668|    |-						getEntityCostTooltip(result),
|    | 668|+					getEntityCostTooltip(result),
| 669| 669| 						getNeededResourcesTooltip(neededResources)
| 670| 670| 					].filter(tip => tip).join("\n");
| 671| 671| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 666| 666| 					var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
| 667| 667| 					placementSupport.tooltipMessage = [
| 668| 668| 						getEntityCostTooltip(result),
| 669|    |-						getNeededResourcesTooltip(neededResources)
|    | 669|+					getNeededResourcesTooltip(neededResources)
| 670| 670| 					].filter(tip => tip).join("\n");
| 671| 671| 				}
| 672| 672| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 667| 667| 					placementSupport.tooltipMessage = [
| 668| 668| 						getEntityCostTooltip(result),
| 669| 669| 						getNeededResourcesTooltip(neededResources)
| 670|    |-					].filter(tip => tip).join("\n");
|    | 670|+				].filter(tip => tip).join("\n");
| 671| 671| 				}
| 672| 672| 
| 673| 673| 				break;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 668| 668| 						getEntityCostTooltip(result),
| 669| 669| 						getNeededResourcesTooltip(neededResources)
| 670| 670| 					].filter(tip => tip).join("\n");
| 671|    |-				}
|    | 671|+			}
| 672| 672| 
| 673| 673| 				break;
| 674| 674| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 670| 670| 					].filter(tip => tip).join("\n");
| 671| 671| 				}
| 672| 672| 
| 673|    |-				break;
|    | 673|+			break;
| 674| 674| 
| 675| 675| 			case "mousebuttondown":
| 676| 676| 				if (ev.button == SDL_BUTTON_LEFT)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 672| 672| 
| 673| 673| 				break;
| 674| 674| 
| 675|    |-			case "mousebuttondown":
|    | 675|+		case "mousebuttondown":
| 676| 676| 				if (ev.button == SDL_BUTTON_LEFT)
| 677| 677| 				{
| 678| 678| 					var queued = Engine.HotkeyIsPressed("session.queue");
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 673| 673| 				break;
| 674| 674| 
| 675| 675| 			case "mousebuttondown":
| 676|    |-				if (ev.button == SDL_BUTTON_LEFT)
|    | 676|+			if (ev.button == SDL_BUTTON_LEFT)
| 677| 677| 				{
| 678| 678| 					var queued = Engine.HotkeyIsPressed("session.queue");
| 679| 679| 					if (tryPlaceWall(queued))
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 674| 674| 
| 675| 675| 			case "mousebuttondown":
| 676| 676| 				if (ev.button == SDL_BUTTON_LEFT)
| 677|    |-				{
|    | 677|+			{
| 678| 678| 					var queued = Engine.HotkeyIsPressed("session.queue");
| 679| 679| 					if (tryPlaceWall(queued))
| 680| 680| 					{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 675| 675| 			case "mousebuttondown":
| 676| 676| 				if (ev.button == SDL_BUTTON_LEFT)
| 677| 677| 				{
| 678|    |-					var queued = Engine.HotkeyIsPressed("session.queue");
|    | 678|+				var queued = Engine.HotkeyIsPressed("session.queue");
| 679| 679| 					if (tryPlaceWall(queued))
| 680| 680| 					{
| 681| 681| 						if (queued)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 676| 676| 				if (ev.button == SDL_BUTTON_LEFT)
| 677| 677| 				{
| 678| 678| 					var queued = Engine.HotkeyIsPressed("session.queue");
| 679|    |-					if (tryPlaceWall(queued))
|    | 679|+				if (tryPlaceWall(queued))
| 680| 680| 					{
| 681| 681| 						if (queued)
| 682| 682| 						{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 677| 677| 				{
| 678| 678| 					var queued = Engine.HotkeyIsPressed("session.queue");
| 679| 679| 					if (tryPlaceWall(queued))
| 680|    |-					{
|    | 680|+				{
| 681| 681| 						if (queued)
| 682| 682| 						{
| 683| 683| 							// continue building, just set a new starting position where we left off
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 678| 678| 					var queued = Engine.HotkeyIsPressed("session.queue");
| 679| 679| 					if (tryPlaceWall(queued))
| 680| 680| 					{
| 681|    |-						if (queued)
|    | 681|+					if (queued)
| 682| 682| 						{
| 683| 683| 							// continue building, just set a new starting position where we left off
| 684| 684| 							placementSupport.position = placementSupport.wallEndPosition;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 679| 679| 					if (tryPlaceWall(queued))
| 680| 680| 					{
| 681| 681| 						if (queued)
| 682|    |-						{
|    | 682|+					{
| 683| 683| 							// continue building, just set a new starting position where we left off
| 684| 684| 							placementSupport.position = placementSupport.wallEndPosition;
| 685| 685| 							placementSupport.wallEndPosition = undefined;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 680| 680| 					{
| 681| 681| 						if (queued)
| 682| 682| 						{
| 683|    |-							// continue building, just set a new starting position where we left off
|    | 683|+						// continue building, just set a new starting position where we left off
| 684| 684| 							placementSupport.position = placementSupport.wallEndPosition;
| 685| 685| 							placementSupport.wallEndPosition = undefined;
| 686| 686| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 681| 681| 						if (queued)
| 682| 682| 						{
| 683| 683| 							// continue building, just set a new starting position where we left off
| 684|    |-							placementSupport.position = placementSupport.wallEndPosition;
|    | 684|+						placementSupport.position = placementSupport.wallEndPosition;
| 685| 685| 							placementSupport.wallEndPosition = undefined;
| 686| 686| 
| 687| 687| 							inputState = INPUT_BUILDING_WALL_CLICK;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 682| 682| 						{
| 683| 683| 							// continue building, just set a new starting position where we left off
| 684| 684| 							placementSupport.position = placementSupport.wallEndPosition;
| 685|    |-							placementSupport.wallEndPosition = undefined;
|    | 685|+						placementSupport.wallEndPosition = undefined;
| 686| 686| 
| 687| 687| 							inputState = INPUT_BUILDING_WALL_CLICK;
| 688| 688| 						}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 684| 684| 							placementSupport.position = placementSupport.wallEndPosition;
| 685| 685| 							placementSupport.wallEndPosition = undefined;
| 686| 686| 
| 687|    |-							inputState = INPUT_BUILDING_WALL_CLICK;
|    | 687|+						inputState = INPUT_BUILDING_WALL_CLICK;
| 688| 688| 						}
| 689| 689| 						else
| 690| 690| 						{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 685| 685| 							placementSupport.wallEndPosition = undefined;
| 686| 686| 
| 687| 687| 							inputState = INPUT_BUILDING_WALL_CLICK;
| 688|    |-						}
|    | 688|+					}
| 689| 689| 						else
| 690| 690| 						{
| 691| 691| 							placementSupport.Reset();
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 686| 686| 
| 687| 687| 							inputState = INPUT_BUILDING_WALL_CLICK;
| 688| 688| 						}
| 689|    |-						else
|    | 689|+					else
| 690| 690| 						{
| 691| 691| 							placementSupport.Reset();
| 692| 692| 							inputState = INPUT_NORMAL;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 687| 687| 							inputState = INPUT_BUILDING_WALL_CLICK;
| 688| 688| 						}
| 689| 689| 						else
| 690|    |-						{
|    | 690|+					{
| 691| 691| 							placementSupport.Reset();
| 692| 692| 							inputState = INPUT_NORMAL;
| 693| 693| 						}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 688| 688| 						}
| 689| 689| 						else
| 690| 690| 						{
| 691|    |-							placementSupport.Reset();
|    | 691|+						placementSupport.Reset();
| 692| 692| 							inputState = INPUT_NORMAL;
| 693| 693| 						}
| 694| 694| 					}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 689| 689| 						else
| 690| 690| 						{
| 691| 691| 							placementSupport.Reset();
| 692|    |-							inputState = INPUT_NORMAL;
|    | 692|+						inputState = INPUT_NORMAL;
| 693| 693| 						}
| 694| 694| 					}
| 695| 695| 					else
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 690| 690| 						{
| 691| 691| 							placementSupport.Reset();
| 692| 692| 							inputState = INPUT_NORMAL;
| 693|    |-						}
|    | 693|+					}
| 694| 694| 					}
| 695| 695| 					else
| 696| 696| 						placementSupport.tooltipMessage = translate("Cannot build wall here!");
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 691| 691| 							placementSupport.Reset();
| 692| 692| 							inputState = INPUT_NORMAL;
| 693| 693| 						}
| 694|    |-					}
|    | 694|+				}
| 695| 695| 					else
| 696| 696| 						placementSupport.tooltipMessage = translate("Cannot build wall here!");
| 697| 697| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 692| 692| 							inputState = INPUT_NORMAL;
| 693| 693| 						}
| 694| 694| 					}
| 695|    |-					else
|    | 695|+				else
| 696| 696| 						placementSupport.tooltipMessage = translate("Cannot build wall here!");
| 697| 697| 
| 698| 698| 					updateBuildingPlacementPreview();
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 693| 693| 						}
| 694| 694| 					}
| 695| 695| 					else
| 696|    |-						placementSupport.tooltipMessage = translate("Cannot build wall here!");
|    | 696|+					placementSupport.tooltipMessage = translate("Cannot build wall here!");
| 697| 697| 
| 698| 698| 					updateBuildingPlacementPreview();
| 699| 699| 					return true;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 695| 695| 					else
| 696| 696| 						placementSupport.tooltipMessage = translate("Cannot build wall here!");
| 697| 697| 
| 698|    |-					updateBuildingPlacementPreview();
|    | 698|+				updateBuildingPlacementPreview();
| 699| 699| 					return true;
| 700| 700| 				}
| 701| 701| 				else if (ev.button == SDL_BUTTON_RIGHT)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 696| 696| 						placementSupport.tooltipMessage = translate("Cannot build wall here!");
| 697| 697| 
| 698| 698| 					updateBuildingPlacementPreview();
| 699|    |-					return true;
|    | 699|+				return true;
| 700| 700| 				}
| 701| 701| 				else if (ev.button == SDL_BUTTON_RIGHT)
| 702| 702| 				{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 697| 697| 
| 698| 698| 					updateBuildingPlacementPreview();
| 699| 699| 					return true;
| 700|    |-				}
|    | 700|+			}
| 701| 701| 				else if (ev.button == SDL_BUTTON_RIGHT)
| 702| 702| 				{
| 703| 703| 					// reset to normal input mode
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 698| 698| 					updateBuildingPlacementPreview();
| 699| 699| 					return true;
| 700| 700| 				}
| 701|    |-				else if (ev.button == SDL_BUTTON_RIGHT)
|    | 701|+			else if (ev.button == SDL_BUTTON_RIGHT)
| 702| 702| 				{
| 703| 703| 					// reset to normal input mode
| 704| 704| 					placementSupport.Reset();
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 699| 699| 					return true;
| 700| 700| 				}
| 701| 701| 				else if (ev.button == SDL_BUTTON_RIGHT)
| 702|    |-				{
|    | 702|+			{
| 703| 703| 					// reset to normal input mode
| 704| 704| 					placementSupport.Reset();
| 705| 705| 					updateBuildingPlacementPreview();
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 700| 700| 				}
| 701| 701| 				else if (ev.button == SDL_BUTTON_RIGHT)
| 702| 702| 				{
| 703|    |-					// reset to normal input mode
|    | 703|+				// reset to normal input mode
| 704| 704| 					placementSupport.Reset();
| 705| 705| 					updateBuildingPlacementPreview();
| 706| 706| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 701| 701| 				else if (ev.button == SDL_BUTTON_RIGHT)
| 702| 702| 				{
| 703| 703| 					// reset to normal input mode
| 704|    |-					placementSupport.Reset();
|    | 704|+				placementSupport.Reset();
| 705| 705| 					updateBuildingPlacementPreview();
| 706| 706| 
| 707| 707| 					inputState = INPUT_NORMAL;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 702| 702| 				{
| 703| 703| 					// reset to normal input mode
| 704| 704| 					placementSupport.Reset();
| 705|    |-					updateBuildingPlacementPreview();
|    | 705|+				updateBuildingPlacementPreview();
| 706| 706| 
| 707| 707| 					inputState = INPUT_NORMAL;
| 708| 708| 					return true;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 704| 704| 					placementSupport.Reset();
| 705| 705| 					updateBuildingPlacementPreview();
| 706| 706| 
| 707|    |-					inputState = INPUT_NORMAL;
|    | 707|+				inputState = INPUT_NORMAL;
| 708| 708| 					return true;
| 709| 709| 				}
| 710| 710| 				break;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 705| 705| 					updateBuildingPlacementPreview();
| 706| 706| 
| 707| 707| 					inputState = INPUT_NORMAL;
| 708|    |-					return true;
|    | 708|+				return true;
| 709| 709| 				}
| 710| 710| 				break;
| 711| 711| 		}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 706| 706| 
| 707| 707| 					inputState = INPUT_NORMAL;
| 708| 708| 					return true;
| 709|    |-				}
|    | 709|+			}
| 710| 710| 				break;
| 711| 711| 		}
| 712| 712| 		break;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 707| 707| 					inputState = INPUT_NORMAL;
| 708| 708| 					return true;
| 709| 709| 				}
| 710|    |-				break;
|    | 710|+			break;
| 711| 711| 		}
| 712| 712| 		break;
| 713| 713| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 849| 849| 			break;
| 850| 850| 
| 851| 851| 		case "hotkeydown":
| 852|    |-				if (ev.hotkey.indexOf("selection.group.") == 0)
|    | 852|+			if (ev.hotkey.indexOf("selection.group.") == 0)
| 853| 853| 				{
| 854| 854| 					let now = Date.now();
| 855| 855| 					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 850| 850| 
| 851| 851| 		case "hotkeydown":
| 852| 852| 				if (ev.hotkey.indexOf("selection.group.") == 0)
| 853|    |-				{
|    | 853|+			{
| 854| 854| 					let now = Date.now();
| 855| 855| 					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
| 856| 856| 					{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 851| 851| 		case "hotkeydown":
| 852| 852| 				if (ev.hotkey.indexOf("selection.group.") == 0)
| 853| 853| 				{
| 854|    |-					let now = Date.now();
|    | 854|+				let now = Date.now();
| 855| 855| 					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
| 856| 856| 					{
| 857| 857| 						if (ev.hotkey.indexOf("selection.group.select.") == 0)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 852| 852| 				if (ev.hotkey.indexOf("selection.group.") == 0)
| 853| 853| 				{
| 854| 854| 					let now = Date.now();
| 855|    |-					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
|    | 855|+				if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
| 856| 856| 					{
| 857| 857| 						if (ev.hotkey.indexOf("selection.group.select.") == 0)
| 858| 858| 						{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 853| 853| 				{
| 854| 854| 					let now = Date.now();
| 855| 855| 					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
| 856|    |-					{
|    | 856|+				{
| 857| 857| 						if (ev.hotkey.indexOf("selection.group.select.") == 0)
| 858| 858| 						{
| 859| 859| 							var sptr = ev.hotkey.split(".");
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 854| 854| 					let now = Date.now();
| 855| 855| 					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
| 856| 856| 					{
| 857|    |-						if (ev.hotkey.indexOf("selection.group.select.") == 0)
|    | 857|+					if (ev.hotkey.indexOf("selection.group.select.") == 0)
| 858| 858| 						{
| 859| 859| 							var sptr = ev.hotkey.split(".");
| 860| 860| 							performGroup("snap", sptr[3]);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 855| 855| 					if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
| 856| 856| 					{
| 857| 857| 						if (ev.hotkey.indexOf("selection.group.select.") == 0)
| 858|    |-						{
|    | 858|+					{
| 859| 859| 							var sptr = ev.hotkey.split(".");
| 860| 860| 							performGroup("snap", sptr[3]);
| 861| 861| 						}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 856| 856| 					{
| 857| 857| 						if (ev.hotkey.indexOf("selection.group.select.") == 0)
| 858| 858| 						{
| 859|    |-							var sptr = ev.hotkey.split(".");
|    | 859|+						var sptr = ev.hotkey.split(".");
| 860| 860| 							performGroup("snap", sptr[3]);
| 861| 861| 						}
| 862| 862| 					}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 6 tabs but found 7.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 857| 857| 						if (ev.hotkey.indexOf("selection.group.select.") == 0)
| 858| 858| 						{
| 859| 859| 							var sptr = ev.hotkey.split(".");
| 860|    |-							performGroup("snap", sptr[3]);
|    | 860|+						performGroup("snap", sptr[3]);
| 861| 861| 						}
| 862| 862| 					}
| 863| 863| 					else
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 858| 858| 						{
| 859| 859| 							var sptr = ev.hotkey.split(".");
| 860| 860| 							performGroup("snap", sptr[3]);
| 861|    |-						}
|    | 861|+					}
| 862| 862| 					}
| 863| 863| 					else
| 864| 864| 					{
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 859| 859| 							var sptr = ev.hotkey.split(".");
| 860| 860| 							performGroup("snap", sptr[3]);
| 861| 861| 						}
| 862|    |-					}
|    | 862|+				}
| 863| 863| 					else
| 864| 864| 					{
| 865| 865| 						var sptr = ev.hotkey.split(".");
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 860| 860| 							performGroup("snap", sptr[3]);
| 861| 861| 						}
| 862| 862| 					}
| 863|    |-					else
|    | 863|+				else
| 864| 864| 					{
| 865| 865| 						var sptr = ev.hotkey.split(".");
| 866| 866| 						performGroup(sptr[2], sptr[3]);
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 861| 861| 						}
| 862| 862| 					}
| 863| 863| 					else
| 864|    |-					{
|    | 864|+				{
| 865| 865| 						var sptr = ev.hotkey.split(".");
| 866| 866| 						performGroup(sptr[2], sptr[3]);
| 867| 867| 
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 862| 862| 					}
| 863| 863| 					else
| 864| 864| 					{
| 865|    |-						var sptr = ev.hotkey.split(".");
|    | 865|+					var sptr = ev.hotkey.split(".");
| 866| 866| 						performGroup(sptr[2], sptr[3]);
| 867| 867| 
| 868| 868| 						doublePressTimer = now;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 863| 863| 					else
| 864| 864| 					{
| 865| 865| 						var sptr = ev.hotkey.split(".");
| 866|    |-						performGroup(sptr[2], sptr[3]);
|    | 866|+					performGroup(sptr[2], sptr[3]);
| 867| 867| 
| 868| 868| 						doublePressTimer = now;
| 869| 869| 						prevHotkey = ev.hotkey;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 865| 865| 						var sptr = ev.hotkey.split(".");
| 866| 866| 						performGroup(sptr[2], sptr[3]);
| 867| 867| 
| 868|    |-						doublePressTimer = now;
|    | 868|+					doublePressTimer = now;
| 869| 869| 						prevHotkey = ev.hotkey;
| 870| 870| 					}
| 871| 871| 				}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 866| 866| 						performGroup(sptr[2], sptr[3]);
| 867| 867| 
| 868| 868| 						doublePressTimer = now;
| 869|    |-						prevHotkey = ev.hotkey;
|    | 869|+					prevHotkey = ev.hotkey;
| 870| 870| 					}
| 871| 871| 				}
| 872| 872| 				break;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 4 tabs but found 5.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 867| 867| 
| 868| 868| 						doublePressTimer = now;
| 869| 869| 						prevHotkey = ev.hotkey;
| 870|    |-					}
|    | 870|+				}
| 871| 871| 				}
| 872| 872| 				break;
| 873| 873| 		}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 868| 868| 						doublePressTimer = now;
| 869| 869| 						prevHotkey = ev.hotkey;
| 870| 870| 					}
| 871|    |-				}
|    | 871|+			}
| 872| 872| 				break;
| 873| 873| 		}
| 874| 874| 		break;
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 3 tabs but found 4.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
| 869| 869| 						prevHotkey = ev.hotkey;
| 870| 870| 					}
| 871| 871| 				}
| 872|    |-				break;
|    | 872|+			break;
| 873| 873| 		}
| 874| 874| 		break;
| 875| 875| 
|    | [NORMAL] ESLintBear (comma-spacing):
|    | A space is required after ','.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/input.js
|1601|1601| 	var selectall = Engine.HotkeyIsPressed("selection.offscreen");
|1602|1602| 
|1603|1603| 	// Reset the last idle unit, etc., if the selection type has changed.
|1604|    |-	if (selectall || classes.length != lastIdleClasses.length || !classes.every((v,i) => v === lastIdleClasses[i]))
|    |1604|+	if (selectall || classes.length != lastIdleClasses.length || !classes.every((v, i) => v === lastIdleClasses[i]))
|1605|1605| 		resetIdleUnit();
|1606|1606| 	lastIdleClasses = classes;
|1607|1607| 

binaries/data/mods/public/gui/session/input.js
| 473| »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 500| »   switch·(inputState)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 504| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 559| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 569| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 617| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 646| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 715| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 731| ·»   »   »   »   "template":·placementSupport.template,
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
| 732| ·»   »   »   »   "x":·placementSupport.position.x,
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
| 737| ·»   »   »   });
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
| 816| »   switch·(inputState)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 819| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 921| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
|1010| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
|1024| »   »   »   »   let·action·=·determineAction(ev.x,·ev.y);
|    | [NORMAL] ESLintBear (no-shadow):
|    | 'action' is already declared in the upper scope.

binaries/data/mods/public/gui/session/input.js
|1033| »   »   switch·(ev.type)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
|1057| ·»   »   »   »   »   "template":·placementSupport.template,
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
|1058| ·»   »   »   »   »   "x":·placementSupport.position.x,
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
|1059| ·»   »   »   »   »   "z":·placementSupport.position.z,
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
|1062| ·»   »   »   »   });
|    | [NORMAL] ESLintBear (no-mixed-spaces-and-tabs):
|    | Mixed spaces and tabs.

binaries/data/mods/public/gui/session/input.js
|1122| »   »   »   switch·(ev.hotkey)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
|1552| »   switch·(action)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/input.js
| 241| »   let·actionInfo·=·undefined;
|    | [NORMAL] JSHintBear:
|    | It's not necessary to initialize 'actionInfo' to 'undefined'.

binaries/data/mods/public/gui/session/input.js
| 488| »   »   &&·(ev.button·==·SDL_BUTTON_LEFT·||·ev.button·==·SDL_BUTTON_RIGHT))
|    | [NORMAL] JSHintBear:
|    | Misleading line break before '&&'; readers may interpret this as an expression boundary.

binaries/data/mods/public/gui/session/input.js
| 518| »   »   »   »   var·rect·=·updateBandbox(bandbox,·ev,·true);
|    | [NORMAL] JSHintBear:
|    | 'rect' is already defined.

binaries/data/mods/public/gui/session/input.js
| 521| »   »   »   »   var·ents·=·getPreferredEntities(Engine.PickPlayerEntitiesInRect(rect[0],·rect[1],·rect[2],·rect[3],·g_ViewedPlayer));
|    | [NORMAL] JSHintBear:
|    | 'ents' is already defined.

binaries/data/mods/public/gui/session/input.js
| 678| »   »   »   »   »   var·queued·=·Engine.HotkeyIsPressed("session.queue");
|    | [NORMAL] JSHintBear:
|    | 'queued' is already defined.

binaries/data/mods/public/gui/session/input.js
| 752| »   »   »   »   var·queued·=·Engine.HotkeyIsPressed("session.queue");
|    | [NORMAL] JSHintBear:
|    | 'queued' is already defined.

binaries/data/mods/public/gui/session/input.js
| 865| »   »   »   »   »   »   var·sptr·=·ev.hotkey.split(".");
|    | [NORMAL] JSHintBear:
|    | 'sptr' is already defined.

binaries/data/mods/public/gui/session/input.js
| 881| »   »   »   var·ent·=·Engine.PickEntityAtPoint(ev.x,·ev.y);
|    | [NORMAL] JSHintBear:
|    | 'ent' is already defined.

binaries/data/mods/public/gui/session/input.js
| 907| »   »   »   }
|    | [NORMAL] JSHintBear:
|    | Expected a 'break' statement before 'default'.

binaries/data/mods/public/gui/session/input.js
| 931| »   »   »   var·ent·=·Engine.PickEntityAtPoint(ev.x,·ev.y);
|    | [NORMAL] JSHintBear:
|    | 'ent' is already defined.
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2092/display/redirect

Imarok added a subscriber: Imarok.May 10 2020, 12:14 PM

Never thought that someone might want to use orderone for preselcted actions xD

Imarok accepted this revision.May 10 2020, 1:01 PM

Good.

This revision is now accepted and ready to land.May 10 2020, 1:01 PM
This revision was automatically updated to reflect the committed changes.

Thanks for the quick review and the commit @Imarok!