Remove CommonJS wrappers

app/settings/manifest.js

@@ -501,6 +501,7 @@ setting_definitions.push(
             "text":
 `
 <ul>
+<li>Internal changes ${issue([350])}</li>
 </ul>
 `
         },

app/win/const.js

@@ -1,195 +1,174 @@
-// view/const.js: constants and generic helpers for the TabFern view.
-// The functions are here for historical reasons - they could be elsewhere
-// if desired.
-// Copyright (c) 2017--2020 Chris White and TabFern contributors
-
-(function (root, factory) {
-    if (typeof define === "function" && define.amd) {
-        // AMD
-        define([
-            "jquery",
-            "lib/jstree",
-            "loglevel",
-            "asynquence-contrib",
-            "lib/asq-helpers",
-        ], factory);
-    } else if (typeof exports === "object") {
-        // Node, CommonJS-like
-        module.exports = factory(
-            require("jquery"),
-            require("lib/jstree"),
-            require("loglevel"),
-            require("asynquence-contrib"),
-            require("lib/asq-helpers")
-        );
-    } else {
-        // Browser globals (root is `window`)
-        root.K = factory(root.$, root.$.jstree, root.log, root.ASQ, root.ASQH);
-    }
-})(this, function ($, _unused_jstree_placeholder_, log_orig, ASQ, ASQH) {
-    "use strict";
-
-    function loginfo(...args) {
-        log_orig.info("TabFern view/const.js: ", ...args);
+"use strict";
+
+const $ = require("jquery");
+require("lib/jstree");
+const log_orig = require("loglevel");
+const ASQ = require("asynquence-contrib");
+const ASQH = require("lib/asq-helpers");
+
+function loginfo(...args) {
+    log_orig.info("TabFern view/const.js: ", ...args);
+}
+
+/// The module we are creating
+module.exports = {
+    STORAGE_KEY: "tabfern-data",
+    ///< Store the saved windows/tabs
+    LOCN_KEY: "tabfern-window-location",
+    ///< Store where the tabfern popup is
+    LASTVER_KEY: "tabfern-last-version",
+    ///< Store the last version used on this system, for showing a
+    ///< "What's New" notification
+
+    SAVE_DATA_AS_VERSION: 1, // version we are currently saving
+
+    //BORDERED_TAB_CLASS: 'tabfern-tab-bordered',     // class on <li>s with a top border
+    //FOCUSED_WIN_CLASS: 'tf-focused-window',  // Class on the currently-focused win
+    //VISIBLE_WIN_CLASS: 'tf-visible-window',  // Class on all visible wins
+
+    SHOW_ACTIONS_CLASS: "tf-show-actions",
+    // Class on a .jstree-node to indicate its actions should be shown
+
+    BULLET_CLASS: "tf-bullet", // class on spans showing bullets for items
+    CLASS_RECOVERED: "ephemeral-recovered",
+
+    INIT_TIME_ALLOWED_MS: 3000, // After this time, if init isn't done,
+    // display an error message.
+    INIT_MSG_SEL: "div#init-incomplete", // Selector for that message
+    INIT_PROGRESS_SEL: "div#init-progress", // Selector for the x/y progress indicator
+
+    ACTION_GROUP_WIN_CLASS: "tf-action-group", // Class on action-group div
+    ACTION_BUTTON_WIN_CLASS: "tf-action-button", // Class on action buttons (<i>)
+
+    /// How long after a resize to save the size to disk
+    RESIZE_DEBOUNCE_INTERVAL_MS: 300,
+
+    /// How often to check whether our window has been moved or resized
+    MOVE_DETECTOR_INTERVAL_MS: 5000,
+
+    /// This many ms after mouseout, a context menu will disappear
+    CONTEXT_MENU_MOUSEOUT_TIMEOUT_MS: 1500,
+
+    // --- Syntactic sugar ---
+    WIN_KEEP: true, // must be truthy
+    WIN_NOKEEP: false, // must be falsy
+    NONE: chrome.windows.WINDOW_ID_NONE,
+    ///< Do not assume that NONE and WINDOW_ID_NONE will always be the same!
+
+    // Item-type enumeration.  Here because there may be more item
+    // types in the future (e.g., dividers).  Each IT_*
+    // must be truthy.  These are used as the types in multidexes.
+    // They are also applied to nodes using jstree-multitype.
+    IT_WIN: "win", // strings are used as required by multidex
+    IT_TAB: "tab",
+
+    // Node subtypes that can be layered onto the basic node types using jstree-multitype
+    NST_OPEN: "open", // Present if a window or tab is open
+    NST_SAVED: "saved", // Present if a window or tab has been saved
+
+    NST_RECOVERED: "recovered", // Present on windows recovered from a crash
+
+    NST_TOP_BORDER: "top-bordered", // Present on tabs that have a top border
+
+    // Functions
+    nextTickRunner,
+    openWindowForURL,
+    dups,
+};
+
+/// Make a callback function that will forward to #fn on a later tick.
+/// @param fn {function} the function to call
+function nextTickRunner(fn) {
+    function inner(...args) {
+        // the actual callback
+        // TODO use ASQ() instead
+        setTimeout(function () {
+            fn(...args);
+        }, 0);
+        // on a later tick, call #fn, passing it the arguments the
+        // actual callback (inner()) got.
     }
-
-    /// The module we are creating
-    let module = {
-        STORAGE_KEY: "tabfern-data",
-        ///< Store the saved windows/tabs
-        LOCN_KEY: "tabfern-window-location",
-        ///< Store where the tabfern popup is
-        LASTVER_KEY: "tabfern-last-version",
-        ///< Store the last version used on this system, for showing a
-        ///< "What's New" notification
-
-        SAVE_DATA_AS_VERSION: 1, // version we are currently saving
-
-        //BORDERED_TAB_CLASS: 'tabfern-tab-bordered',     // class on <li>s with a top border
-        //FOCUSED_WIN_CLASS: 'tf-focused-window',  // Class on the currently-focused win
-        //VISIBLE_WIN_CLASS: 'tf-visible-window',  // Class on all visible wins
-
-        SHOW_ACTIONS_CLASS: "tf-show-actions",
-        // Class on a .jstree-node to indicate its actions should be shown
-
-        BULLET_CLASS: "tf-bullet", // class on spans showing bullets for items
-        CLASS_RECOVERED: "ephemeral-recovered",
-
-        INIT_TIME_ALLOWED_MS: 3000, // After this time, if init isn't done,
-        // display an error message.
-        INIT_MSG_SEL: "div#init-incomplete", // Selector for that message
-        INIT_PROGRESS_SEL: "div#init-progress", // Selector for the x/y progress indicator
-
-        ACTION_GROUP_WIN_CLASS: "tf-action-group", // Class on action-group div
-        ACTION_BUTTON_WIN_CLASS: "tf-action-button", // Class on action buttons (<i>)
-
-        /// How long after a resize to save the size to disk
-        RESIZE_DEBOUNCE_INTERVAL_MS: 300,
-
-        /// How often to check whether our window has been moved or resized
-        MOVE_DETECTOR_INTERVAL_MS: 5000,
-
-        /// This many ms after mouseout, a context menu will disappear
-        CONTEXT_MENU_MOUSEOUT_TIMEOUT_MS: 1500,
-
-        // --- Syntactic sugar ---
-        WIN_KEEP: true, // must be truthy
-        WIN_NOKEEP: false, // must be falsy
-        NONE: chrome.windows.WINDOW_ID_NONE,
-        ///< Do not assume that NONE and WINDOW_ID_NONE will always be the same!
-
-        // Item-type enumeration.  Here because there may be more item
-        // types in the future (e.g., dividers).  Each IT_*
-        // must be truthy.  These are used as the types in multidexes.
-        // They are also applied to nodes using jstree-multitype.
-        IT_WIN: "win", // strings are used as required by multidex
-        IT_TAB: "tab",
-
-        // Node subtypes that can be layered onto the basic node types using jstree-multitype
-        NST_OPEN: "open", // Present if a window or tab is open
-        NST_SAVED: "saved", // Present if a window or tab has been saved
-
-        NST_RECOVERED: "recovered", // Present on windows recovered from a crash
-
-        NST_TOP_BORDER: "top-bordered", // Present on tabs that have a top border
-    };
-
-    /// Make a callback function that will forward to #fn on a later tick.
-    /// @param fn {function} the function to call
-    module.nextTickRunner = function (fn) {
-        function inner(...args) {
-            // the actual callback
-            // TODO use ASQ() instead
-            setTimeout(function () {
-                fn(...args);
-            }, 0);
-            // on a later tick, call #fn, passing it the arguments the
-            // actual callback (inner()) got.
-        }
-        return inner;
-    }; //nextTickRunner()
-
-    /// Open a new window with a given URL.  Also remove the default
-    /// tab that appears because we are letting the window open at the
-    /// default size.  Yes, this is a bit like a FOUC, but oh well.
-    /// @return An ASQ instance
-    module.openWindowForURL = function (desired_url) {
-        let win_id; // TODO is there a better way to pass data down
-        // the sequence?
-
-        log.info({ "Opening window for": desired_url });
-
-        let seq = ASQH.NowCC((cc) => {
-            chrome.windows.create(cc);
+    return inner;
+} //nextTickRunner()
+
+/// Open a new window with a given URL.  Also remove the default
+/// tab that appears because we are letting the window open at the
+/// default size.  Yes, this is a bit like a FOUC, but oh well.
+/// @return An ASQ instance
+function openWindowForURL(desired_url) {
+    let win_id; // TODO is there a better way to pass data down
+    // the sequence?
+
+    log.info({ "Opening window for": desired_url });
+
+    let seq = ASQH.NowCC((cc) => {
+        chrome.windows.create(cc);
+    })
+        .then(function open_tab(done, new_win) {
+            win_id = new_win.id;
+            // Chrome automatically creates a tab in a window, but
+            // Vivaldi does not.  Handle either.
+            chrome.tabs.create(
+                { windowId: win_id, url: desired_url },
+                ASQH.CC(done)
+            );
         })
-            .then(function open_tab(done, new_win) {
-                win_id = new_win.id;
-                // Chrome automatically creates a tab in a window, but
-                // Vivaldi does not.  Handle either.
-                chrome.tabs.create(
-                    { windowId: win_id, url: desired_url },
-                    ASQH.CC(done)
-                );
-            })
-            .then(function get_all_tabs(done) {
-                chrome.windows.get(win_id, { populate: true }, ASQH.CC(done));
-            })
-            .then(function remove_all_other_tabs(done, cwin) {
-                if (!cwin) {
-                    done.fail("Could not query tabs");
-                    return;
-                }
+        .then(function get_all_tabs(done) {
+            chrome.windows.get(win_id, { populate: true }, ASQH.CC(done));
+        })
+        .then(function remove_all_other_tabs(done, cwin) {
+            if (!cwin) {
+                done.fail("Could not query tabs");
+                return;
+            }
+
+            let gates = [];
 
-                let gates = [];
-
-                for (let ctab of cwin.tabs) {
-                    if ((ctab.url || ctab.pendingUrl) != desired_url) {
-                        gates.push((done_gate) => {
-                            log.info({ "Removing undesired tab": ctab });
-                            chrome.tabs.remove(ctab.id, ASQH.CC(done_gate));
-                        });
-                    }
-                } //foreach ctab
-
-                if (gates.length === 0) {
-                    done();
-                    return;
-                } else {
-                    let gate_seq = ASQ();
-                    gate_seq.all.apply(gate_seq, gates);
-                    gate_seq.pipe(done);
+            for (let ctab of cwin.tabs) {
+                if ((ctab.url || ctab.pendingUrl) != desired_url) {
+                    gates.push((done_gate) => {
+                        log.info({ "Removing undesired tab": ctab });
+                        chrome.tabs.remove(ctab.id, ASQH.CC(done_gate));
+                    });
                 }
-            })
-            .or(function (err) {
-                log_orig.error({ "Load error": err, desired_url });
-            });
-        // To start the sequence paused, use `let seq = ASQ().duplicate()` above
-        // instead of just ASQ().  Then, to fire it off, `seq.unpause();`.
-
-        return seq;
-    }; //openWindowForURL
-
-    /// Shallow-copy an object.  This is used, e.g., to force evaluation of
-    /// and object at the time of logging rather than at the time the log
-    /// message is expanded in the developer console.
-    /// Returns the new object, or a string error message beginning with '!'
-    /// on failure.
-    module.dups = function (obj) {
-        let retval;
-        if (!obj || typeof obj !== "object") {
-            // null or undefined, or scalar
-            return obj;
-        } else {
-            try {
-                retval = Object.assign({}, obj);
-            } catch (e) {
-                retval = "!" + e.toString();
+            } //foreach ctab
+
+            if (gates.length === 0) {
+                done();
+                return;
+            } else {
+                let gate_seq = ASQ();
+                gate_seq.all.apply(gate_seq, gates);
+                gate_seq.pipe(done);
             }
-            return retval;
+        })
+        .or(function (err) {
+            log_orig.error({ "Load error": err, desired_url });
+        });
+    // To start the sequence paused, use `let seq = ASQ().duplicate()` above
+    // instead of just ASQ().  Then, to fire it off, `seq.unpause();`.
+
+    return seq;
+} //openWindowForURL()
+
+/// Shallow-copy an object.  This is used, e.g., to force evaluation of
+/// and object at the time of logging rather than at the time the log
+/// message is expanded in the developer console.
+/// Returns the new object, or a string error message beginning with '!'
+/// on failure.
+function dups(obj) {
+    let retval;
+    if (!obj || typeof obj !== "object") {
+        // null or undefined, or scalar
+        return obj;
+    } else {
+        try {
+            retval = Object.assign({}, obj);
+        } catch (e) {
+            retval = "!" + e.toString();
         }
-    }; //dups
-
-    return Object.freeze(module); // all fields constant
-});
+        return retval;
+    }
+} //dups()
 
 // vi: set ts=4 sts=4 sw=4 et ai fo-=o fo-=r: //