From c1a63875a8cf01bfaf376d16dbf22235277a80ee Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Fri, 1 May 2020 14:40:36 +0300 Subject: [PATCH] Small fixes --- src/Page/BuildingPage.ts | 17 ++++++----------- src/Page/BuildingPageController.ts | 1 - 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Page/BuildingPage.ts b/src/Page/BuildingPage.ts index 0b39ce1..69d69ce 100644 --- a/src/Page/BuildingPage.ts +++ b/src/Page/BuildingPage.ts @@ -32,11 +32,6 @@ export function createBuildButton(onClickHandler: (buildTypeId: number, resource }); } -export function hasUpgradeButton(): boolean { - const btn = jQuery('.upgradeButtonsContainer .section1 button.green.build'); - return btn.length === 1; -} - export function clickUpgradeButton() { const btn = jQuery('.upgradeButtonsContainer .section1 button.green.build'); if (btn.length !== 1) { @@ -105,9 +100,11 @@ export function createTrainTroopButtons( }); } -export function createSendResourcesButton( - onClickHandler: (resources: Resources, crd: Coordinates, scale: number) => void -) { +interface SendResourcesClickHandler { + (resources: Resources, crd: Coordinates, scale: number): void; +} + +export function createSendResourcesButton(onClickHandler: SendResourcesClickHandler) { const id1 = uniqId(); const id10 = uniqId(); const id100 = uniqId(); @@ -120,9 +117,7 @@ export function createSendResourcesButton( x1000 `); - const createHandler = (handler: (resources: Resources, crd: Coordinates, scale: number) => void, scale: number) => ( - evt: JQuery.Event - ) => { + const createHandler = (handler: SendResourcesClickHandler, scale: number) => (evt: JQuery.Event) => { evt.preventDefault(); const sendSelect = jQuery('#send_select'); const resources = new Resources( diff --git a/src/Page/BuildingPageController.ts b/src/Page/BuildingPageController.ts index afa37a3..dde87f8 100644 --- a/src/Page/BuildingPageController.ts +++ b/src/Page/BuildingPageController.ts @@ -9,7 +9,6 @@ import { createSendResourcesButton, createTrainTroopButtons, createUpgradeButton, - grabIncomingMerchants, } from './BuildingPage'; import { BuildBuildingTask } from '../Task/BuildBuildingTask'; import { Resources } from '../Core/Resources';