zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

js: Tolerate the non-existence of some HTML elements

Browse Source 
Specifically, the permalinks, the apology, and the resizable div.
This commit is contained in:
Ben Harris
2022-10-29 11:58:37 +01:00
parent ea4ba47662
commit 06f6e878a0
2 changed files with 76 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
emcclib.js
View File

@ -166,8 +166,10 @@ mergeInto(LibraryManager.library, {
*/ */
js_update_permalinks: function(desc, seed) { js_update_permalinks: function(desc, seed) {
desc = encodeURI(UTF8ToString(desc)).replace(/#/g, "%23"); desc = encodeURI(UTF8ToString(desc)).replace(/#/g, "%23");
if (permalink_desc !== null)
permalink_desc.href = "#" + desc; permalink_desc.href = "#" + desc;
if (permalink_seed !== null) {
if (seed == 0) { if (seed == 0) {
permalink_seed.style.display = "none"; permalink_seed.style.display = "none";
} else { } else {
@ -175,6 +177,7 @@ mergeInto(LibraryManager.library, {
permalink_seed.href = "#" + seed; permalink_seed.href = "#" + seed;
permalink_seed.style.display = ""; permalink_seed.style.display = "";
} }
}
}, },
/* /*
@ -547,7 +550,9 @@ mergeInto(LibraryManager.library, {
js_canvas_set_size: function(w, h) { js_canvas_set_size: function(w, h) {
onscreen_canvas.width = w; onscreen_canvas.width = w;
offscreen_canvas.width = w; offscreen_canvas.width = w;
resizable_div.style.width = w / (window.devicePixelRatio || 1) + "px"; if (resizable_div !== null)
resizable_div.style.width =
w / (window.devicePixelRatio || 1) + "px";
onscreen_canvas.height = h; onscreen_canvas.height = h;
offscreen_canvas.height = h; offscreen_canvas.height = h;

14
emccpre.js
View File

@ -472,6 +472,7 @@ function initPuzzle() {
ctx.stroke(); ctx.stroke();
} }
resizable_div = document.getElementById("resizable"); resizable_div = document.getElementById("resizable");
if (resizable_div !== null) {
resizable_div.appendChild(resize_handle); resizable_div.appendChild(resize_handle);
resize_handle.id = "resizehandle"; resize_handle.id = "resizehandle";
resize_handle.title = "Drag to resize the puzzle. Right-click to restore the default size."; resize_handle.title = "Drag to resize the puzzle. Right-click to restore the default size.";
@ -479,15 +480,18 @@ function initPuzzle() {
var resize_xoffset = null, resize_yoffset = null; var resize_xoffset = null, resize_yoffset = null;
var resize_puzzle = Module.cwrap('resize_puzzle', var resize_puzzle = Module.cwrap('resize_puzzle',
'void', ['number', 'number']); 'void', ['number', 'number']);
var restore_puzzle_size = Module.cwrap('restore_puzzle_size', 'void', []); var restore_puzzle_size = Module.cwrap('restore_puzzle_size',
'void', []);
resize_handle.oncontextmenu = function(event) { return false; } resize_handle.oncontextmenu = function(event) { return false; }
resize_handle.onmousedown = function(event) { resize_handle.onmousedown = function(event) {
if (event.button == 0) { if (event.button == 0) {
var xy = element_coords(onscreen_canvas); var xy = element_coords(onscreen_canvas);
resize_xbase = xy.x + onscreen_canvas.offsetWidth / 2; resize_xbase = xy.x + onscreen_canvas.offsetWidth / 2;
resize_ybase = xy.y; resize_ybase = xy.y;
resize_xoffset = xy.x + onscreen_canvas.offsetWidth - event.pageX; resize_xoffset =
resize_yoffset = xy.y + onscreen_canvas.offsetHeight - event.pageY; xy.x + onscreen_canvas.offsetWidth - event.pageX;
resize_yoffset =
xy.y + onscreen_canvas.offsetHeight - event.pageY;
} else { } else {
restore_pending = true; restore_pending = true;
} }
@ -529,6 +533,7 @@ function initPuzzle() {
event.preventDefault(); event.preventDefault();
} }
}); });
}
/* /*
* Arrange to detect changes of device pixel ratio. Adapted from * Arrange to detect changes of device pixel ratio. Adapted from
@ -558,7 +563,8 @@ function initPuzzle() {
// we haven't crashed for one reason or another during setup, then // we haven't crashed for one reason or another during setup, then
// it's probably safe to hide the 'sorry, no puzzle here' div and // it's probably safe to hide the 'sorry, no puzzle here' div and
// show the div containing the actual puzzle. // show the div containing the actual puzzle.
document.getElementById("apology").style.display = "none"; var apology = document.getElementById("apology");
if (apology !== null) apology.style.display = "none";
document.getElementById("puzzle").style.display = ""; document.getElementById("puzzle").style.display = "";
}; };
} }