shithub: puzzles

Info  •  Files  •  Log  •  Branches

js: Allow status bar to be present in the HTML

I'm generally in favour of putting HTML in HTML rather the constructing
it in JavaScript, and this will allow for simplifying the code
eventually.  This only changes the JavaScript to make sure that's in
people's caches before I change the HTML itself.

--- a/emcc.c

+++ b/emcc.c

@@ -80,6 +80,7 @@

 extern void js_canvas_copy_to_blitter(int id, int x, int y, int w, int h);

 extern void js_canvas_copy_from_blitter(int id, int x, int y, int w, int h);

 extern void js_canvas_make_statusbar(void);

+extern void js_canvas_remove_statusbar(void);

 extern void js_canvas_set_statusbar(const char *text);

 extern void js_canvas_set_size(int w, int h);

 extern double js_get_device_pixel_ratio();

@@ -958,6 +959,8 @@

      */

     if (midend_wants_statusbar(me))

         js_canvas_make_statusbar();

+    else

+        js_canvas_remove_statusbar();

     /*

      * Set up the game-type dropdown with presets and/or the Custom

--- a/emcclib.js

+++ b/emcclib.js

@@ -518,22 +518,33 @@

      * back end turns out to want one.

      */

     js_canvas_make_statusbar: function() {

-        var statusholder = document.getElementById("statusbarholder");

-        statusbar = document.createElement("div");

-        statusbar.id = "statusbar";

-        statusbar.appendChild(document.createTextNode(" "));

-        statusholder.appendChild(statusbar);

+        if (statusbar === null) {

+            var statusholder = document.getElementById("statusbarholder");

+            statusbar = document.createElement("div");

+            statusbar.id = "statusbar";

+            statusbar.appendChild(document.createTextNode(" "));

+            statusholder.appendChild(statusbar);

+        }

     },

     /*

+     * void js_canvas_remove_statusbar(void);

+     *

+     * Cause a status bar not to exist. Called at setup time if the

+     * puzzle back end turns out not to want one.

+     */

+    js_canvas_remove_statusbar: function() {

+        if (statusbar !== null)

+            statusbar.parentNode.removeChild(statusbar);

+    },

+

+    /*

      * void js_canvas_set_statusbar(const char *text);

      * 

      * Set the text in the status bar.

      */

     js_canvas_set_statusbar: function(ptr) {

-        var text = UTF8ToString(ptr);

-        statusbar.replaceChild(document.createTextNode(text),

-                               statusbar.lastChild);

+        statusbar.textContent = UTF8ToString(ptr);

     },

     /*

--- a/emccpre.js

+++ b/emccpre.js

@@ -443,9 +443,10 @@

                                    ['number','number']);

     timer_callback = Module.cwrap('timer_callback', 'void', ['number']);

-    // Save references to the two permalinks.

+    // Save references to the two permalinks and the status bar.

     permalink_desc = document.getElementById("permalink-desc");

     permalink_seed = document.getElementById("permalink-seed");

+    statusbar = document.getElementById("statusbar");

     resizable_div = document.getElementById("resizable");

     if (resizable_div !== null) {