From ee46e4b0daa0e693d90c3f9033a6cbab5607833b Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 24 May 2020 00:42:38 +0300 Subject: [PATCH] minor tweaks + npm update Signed-off-by: Alex A. Naanou --- ui (gen4)/lib/components/ig-image-graph.js | 30 ++++---- ui (gen4)/package-lock.json | 87 ++++++++++++++-------- ui (gen4)/package.json | 6 +- 3 files changed, 76 insertions(+), 47 deletions(-) diff --git a/ui (gen4)/lib/components/ig-image-graph.js b/ui (gen4)/lib/components/ig-image-graph.js index 1fdd21c1..94bc0f52 100644 --- a/ui (gen4)/lib/components/ig-image-graph.js +++ b/ui (gen4)/lib/components/ig-image-graph.js @@ -483,6 +483,15 @@ object.Constructor('igImageGraph', HTMLElement, { } return button }(), // orientation... + // + // switch from vertical to horizontal and back, keeping + // only two orientations with top-to-top (default) and + // top-to-right (alternative) modes. + // + // the button arrow: + // - indicates orientation + // - points to top of image relative to waveform + // function(){ var button = document.createElement('button') button.setAttribute('id', 'orientation-button') @@ -492,23 +501,25 @@ object.Constructor('igImageGraph', HTMLElement, { var _update = function(){ Object.assign(button.style, that.__rotated == null ? + // top... { transform: '', marginTop: '-2px', } + // right... : { transform: 'rotate(90deg)', marginTop: '-1px', }) } _update() button.disabled = that.graph != 'waveform' - // do the rotation... + // click -> do the rotation... button.onclick = function(){ var o = that.__rotated var c = that.orientation*1 that.orientation = o == null ? - // rotate... + // rotate cw... (c + 90) % 360 // restore... : o @@ -520,6 +531,7 @@ object.Constructor('igImageGraph', HTMLElement, { } return button }(), // modes... + // ...generate mode toggles... ...(this.nocontrols ? [] : this.modes) @@ -531,25 +543,15 @@ object.Constructor('igImageGraph', HTMLElement, { button.onclick = function(){ that.mode = m } return button }), - /* - // color mode switch... - function(){ - var button = document.createElement('button') - button.innerText = '('+ that.color[0] +')' - button.onclick = function(){ - that.color = that.color_modes[ - (that.color_modes.indexOf(that.color) + 1) - % that.color_modes.length] - this.innerText = '('+ that.color[0] +')' } - return button }(), - //*/ // reload... + /*/ XXX do we actually need this??? function(){ var button = document.createElement('button') button.classList.add('update') button.innerHTML = '⟳' button.onclick = function(){ that.update() } return button }(), + //*/ ] .reverse() .forEach(function(button){ diff --git a/ui (gen4)/package-lock.json b/ui (gen4)/package-lock.json index f0c1c31d..7c5f6542 100755 --- a/ui (gen4)/package-lock.json +++ b/ui (gen4)/package-lock.json @@ -966,9 +966,9 @@ } }, "ig-object": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-4.0.2.tgz", - "integrity": "sha512-hryL+FtuRiH7tji43i6bnlVtdzriND9Sjirz15yj161Nxk8uSN1kgE2XWk8FmJKB68NdHQNYdRl+bNTz3XBTuQ==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ig-object/-/ig-object-5.0.0.tgz", + "integrity": "sha512-WTKB2yS7jIwfZK1KQm3684XnSvf1Z8pzk555DjU+FaAxEvZxa3TvVUNy3jxTB9q3S+n6HbuRuxk3Xyi9nZnqAw==" }, "image-size": { "version": "0.5.5", @@ -1277,9 +1277,9 @@ "integrity": "sha1-jrbgqZ+HrTT/8YJzMRBJadjFBP4=" }, "moment": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", - "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.26.0.tgz", + "integrity": "sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==" }, "ms": { "version": "2.1.2", @@ -1300,9 +1300,9 @@ } }, "node-addon-api": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", - "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz", + "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==" }, "node-gyp": { "version": "6.1.0", @@ -1589,14 +1589,14 @@ } }, "prebuild-install": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz", - "integrity": "sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz", + "integrity": "sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", "github-from-package": "0.0.0", - "minimist": "^1.2.0", + "minimist": "^1.2.3", "mkdirp": "^0.5.1", "napi-build-utils": "^1.0.1", "node-abi": "^2.7.0", @@ -1608,6 +1608,18 @@ "tar-fs": "^2.0.0", "tunnel-agent": "^0.6.0", "which-pm-runs": "^1.0.0" + }, + "dependencies": { + "simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", + "requires": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + } } }, "pretty-bytes": { @@ -1838,18 +1850,18 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "sharp": { - "version": "0.25.2", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.25.2.tgz", - "integrity": "sha512-l1GN0kFNtJr3U9i9pt7a+vo2Ij0xv4tTKDIPx8W6G9WELhPwrMyZZJKAAQNBSI785XB4uZfS5Wpz8C9jWV4AFQ==", + "version": "0.25.3", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.25.3.tgz", + "integrity": "sha512-qV3n30NaBEhAjBhFo+d8h5N4X3DHteFdwxXoWUiubk72G0VKT5fX50nlcawGYjPqfFV4Z2e/G9gDPeSGAdn/gg==", "requires": { "color": "^3.1.2", "detect-libc": "^1.0.3", - "node-addon-api": "^2.0.0", + "node-addon-api": "^3.0.0", "npmlog": "^4.1.2", "prebuild-install": "^5.3.3", - "semver": "^7.1.3", - "simple-get": "^3.1.0", - "tar": "^6.0.1", + "semver": "^7.3.2", + "simple-get": "^4.0.0", + "tar": "^6.0.2", "tunnel-agent": "^0.6.0" }, "dependencies": { @@ -1867,9 +1879,9 @@ } }, "minipass": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz", - "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", + "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", "requires": { "yallist": "^4.0.0" } @@ -1924,13 +1936,28 @@ "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=" }, "simple-get": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", - "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz", + "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==", "requires": { - "decompress-response": "^4.2.0", + "decompress-response": "^6.0.0", "once": "^1.3.1", "simple-concat": "^1.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "requires": { + "mimic-response": "^3.1.0" + } + }, + "mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" + } } }, "simple-swizzle": { @@ -2132,9 +2159,9 @@ } }, "tar-fs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", - "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz", + "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==", "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index eb831715..086c89f4 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -29,11 +29,11 @@ "guarantee-events": "^1.0.0", "ig-actions": "^3.24.11", "ig-features": "^3.4.2", - "ig-object": "^4.0.2", - "moment": "^2.25.3", + "ig-object": "^5.0.0", + "moment": "^2.26.0", "requirejs": "^2.3.6", "requirejs-plugins": "^1.0.2", - "sharp": "^0.25.2", + "sharp": "^0.25.3", "strip-json-comments": "^2.0.1", "v8-compile-cache": "^2.1.0", "wildglob": "^0.1.1"