Skip to content

Fix mapper JavaScript lint errors #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
CaseyLabs wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Draft

Fix mapper JavaScript lint errors #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _datafiles/html/admin/static/js/mapper/mapper-init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
/* jshint esversion: 11, browser: true */
/* globals MapperState, MapperRender, MapperTools, MapperCtxMenu, MapperUI, MapperEvents, AdminAPI,
BASE_STEP_2D, ROOM_SIZE_2D, ROOM_BORDER_COLOR_2D, ROOM_BORDER_WIDTH_2D, SYMBOL_FONT_SIZE_2D,
MAP_BG_2D, CONNECTION_COLOR, ABNORMAL_CONNECTION_COLOR, SELECTED_ROOM_COLOR, SELECTED_ROOM_TEXT_COLOR,
MAP_BG_2D, CONNECTION_COLOR: true, ABNORMAL_CONNECTION_COLOR, SELECTED_ROOM_COLOR, SELECTED_ROOM_TEXT_COLOR,
SYMBOL_TEXT_COLOR, ROOM_BORDER_MOB_SPAWN, ROOM_BORDER_SCRIPT_GLOW, ROOM_ARROW_COLOR,
BADGE_SECRET_COLOR, BADGE_LOCK_COLOR, ZONE_BOX_COLOR, ZONE_BOX_COLOR_HOV, ZONE_BOX_BORDER,
ZONE_BOX_BORDER_HOV, ZONE_BOX_PADDING, computeZonePaddedBounds,
CONNECTION_WIDTH_2D */
CONNECTION_WIDTH_2D: true */
'use strict';

(function() {
Expand Down
2 changes: 1 addition & 1 deletion _datafiles/html/admin/static/js/mapper/mapper-render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ var MapperRender = (function() {
// Pass 2: abnormal edges (yellow dotted arcs)
if (abnormalEdges.length > 0) {
ctx.strokeStyle = ABNORMAL_CONNECTION_COLOR;
ctx.lineWidth = Math.max(1, CONNECTION_WIDTH_2D * cam.zoomScale * .5);
ctx.lineWidth = Math.max(1, CONNECTION_WIDTH_2D * cam.zoomScale * 0.5);
ctx.setLineDash([Math.max(3, 4 * cam.zoomScale), Math.max(4, 5 * cam.zoomScale)]);
abnormalEdges.forEach(function(ae) {
var pA = gridToCanvas2d(ae.room.MapX, ae.room.MapY);
Expand Down
4 changes: 2 additions & 2 deletions _datafiles/html/admin/static/js/mapper/mapper-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* jshint esversion: 11, browser: true */
/* globals MapperEvents, AdminAPI, symbolForRoom, colorForSymbol, bgColorForBiome, contrastColor, escapeHtml, isDirectionalExit, DIRECTION_DELTAS, isExitConstraintSatisfied, buildDragConstraints, breakExitLocally, BIOME_SYMBOLS, BIOME_COLORS, BIOME_BG_COLORS, BIOME_SYMBOL_OVERRIDES, biomeEnvMap, invalidateZoneBoundsCache */
/* globals MapperEvents, AdminAPI, symbolForRoom, colorForSymbol, bgColorForBiome, contrastColor, escapeHtml, isDirectionalExit, DIRECTION_DELTAS, isExitConstraintSatisfied, buildDragConstraints, breakExitLocally, ansi256ToHex, BIOME_SYMBOLS, BIOME_COLORS, BIOME_BG_COLORS, BIOME_SYMBOL_OVERRIDES, biomeEnvMap, invalidateZoneBoundsCache */
'use strict';

/**
Expand Down Expand Up @@ -358,7 +358,7 @@ var MapperState = (function() {
});

// Update selection
if (selected.has(oldId)) { selected.delete(oldId); selected.add(newId); }
if (selectedRoomIds.has(oldId)) { selectedRoomIds.delete(oldId); selectedRoomIds.add(newId); }
}

function moveRoomLocally(roomId, newGx, newGy) {
Expand Down
2 changes: 1 addition & 1 deletion _datafiles/html/admin/static/js/mapper/mapper-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ var MapperUI = (function() {
backdrop.onclick = function(e) { if (e.target === backdrop) close(); };

// Keyboard: Escape closes, Ctrl+Enter saves
backdrop._keyHandler && document.removeEventListener('keydown', backdrop._keyHandler);
if (backdrop._keyHandler) document.removeEventListener('keydown', backdrop._keyHandler);
backdrop._keyHandler = function(e) {
if (!backdrop.classList.contains('visible')) return;
if (e.key === 'Escape') { e.stopPropagation(); close(); }
Expand Down
Loading