Merge branch 'main' into expr-eval

This commit is contained in:
Jeffrey Warren
2021-02-15 11:50:18 -05:00
committed by GitHub
11 changed files with 227 additions and 89 deletions

View File

@@ -1,6 +1,8 @@
const { reject } = require("lodash");
var setupCache = function() { var setupCache = function() {
let newWorker; // When sw.js is changed, this is the new service worker generated. let newWorker; // When sw.js is changed, this is the new service worker generated.
// Toggle a CSS class to display a popup prompting the user to fetch a new version. // Toggle a CSS class to display a popup prompting the user to fetch a new version.
function showUpdateModal() { function showUpdateModal() {
$('#update-prompt-modal').addClass('show'); $('#update-prompt-modal').addClass('show');
@@ -22,6 +24,11 @@ var setupCache = function() {
registration.addEventListener('updatefound', () => { registration.addEventListener('updatefound', () => {
// When sw.js has been changed, get a reference to the new service worker. // When sw.js has been changed, get a reference to the new service worker.
newWorker = registration.installing; newWorker = registration.installing;
if(!newWorker){
return reject(new Error('error in installing service worker'));
}
newWorker.addEventListener('statechange', () => { newWorker.addEventListener('statechange', () => {
// Check if service worker state has changed. // Check if service worker state has changed.
switch(newWorker.state) { switch(newWorker.state) {
@@ -29,24 +36,23 @@ var setupCache = function() {
if(navigator.serviceWorker.controller) { if(navigator.serviceWorker.controller) {
// New service worker available; prompt the user to update. // New service worker available; prompt the user to update.
showUpdateModal(); showUpdateModal();
$('#reload').on('click',(e) => {
e.preventDefault();
console.log('New Service Worker Installed Successfully');
location.reload();
return resolve();
})
} }
// No updates available; do nothing. // No updates available; do nothing.
break; break;
}
});
});
const installingWorker = registration.installing; case 'redundant':
installingWorker.onstatechange = () => { return reject(new Error('installing new service worker now became redundant'));
console.log(installingWorker); }
if (installingWorker.state === 'installed') { })
location.reload(); })
} }).catch(err => {
}; console.log('Failed In Registering Service Worker: ',err);
console.log('Registration successful, scope is:', registration.scope);
})
.catch(function(error) {
console.log('Service worker registration failed, error:', error);
}); });
/** /**
@@ -69,21 +75,22 @@ var setupCache = function() {
}); });
} }
$('#clear-cache').click(function() { const clearCache = () => {
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {
caches.keys().then(function(cacheNames) { return caches.keys()
cacheNames.forEach(function(cacheName) { .then(function(cache) {
caches.delete(cacheName); return Promise.all(cache.map(function(cacheItem) {
}); return caches.delete(cacheItem);
}));
}); });
} }
}
$('#clear-cache').click(function() {
clearCache();
location.reload(); location.reload();
}); });
}; };
module.exports = setupCache; module.exports = setupCache;

View File

@@ -121,7 +121,14 @@ function DefaultHtmlStepUi(_sequencer, options) {
paramVal + '">' + '<span class="input-group-addon"><i></i></span>' + paramVal + '">' + '<span class="input-group-addon"><i></i></span>' +
'</div>'; '</div>';
} }
else { // Non color-picker input types else if(inputDesc.type === 'button'){
html = '<div><button name="' + paramName + '" type="' + inputDesc.type + '" >\
<i class="fa fa-crosshairs"></i></button>\
<span>click to select coordinates</span>\
</div>';
}
else { // Non color-picker input types and other than a button
html = html =
'<input class="form-control target" type="' + '<input class="form-control target" type="' +
inputDesc.type + inputDesc.type +
@@ -402,6 +409,19 @@ function DefaultHtmlStepUi(_sequencer, options) {
var img = $(step.imgElement); var img = $(step.imgElement);
let customXCoord = '20'; //default x coordinate
let customYCoord = '20'; //default y coordinate
const customButton = $('button[name="Custom-Coordinates"]');
img.click(function(e) {
customXCoord = e.offsetX;
customYCoord = e.offsetY;
customButton.click(function() {
$('input[name="x"]').val(customXCoord);
$('input[name="y"]').val(customYCoord);
})
});
img.mousemove(function(e) { img.mousemove(function(e) {
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
canvas.width = img.width(); canvas.width = img.width();

View File

@@ -22,6 +22,9 @@ function mapHtmlTypes(inputInfo){
htmlType = inputInfo.min != undefined ? 'range' : 'text'; htmlType = inputInfo.min != undefined ? 'range' : 'text';
if (htmlType === 'range') inputInfo.step = inputInfo.step || 0.1; // default range step size for float if (htmlType === 'range') inputInfo.step = inputInfo.step || 0.1; // default range step size for float
break; break;
case 'coordinate-input':
htmlType = 'button';
break;
default: default:
htmlType = 'text'; htmlType = 'text';
break; break;

134
package-lock.json generated
View File

@@ -13,16 +13,16 @@
} }
}, },
"@babel/core": { "@babel/core": {
"version": "7.12.13", "version": "7.12.16",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.16.tgz",
"integrity": "sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw==", "integrity": "sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.12.13", "@babel/code-frame": "^7.12.13",
"@babel/generator": "^7.12.13", "@babel/generator": "^7.12.15",
"@babel/helper-module-transforms": "^7.12.13", "@babel/helper-module-transforms": "^7.12.13",
"@babel/helpers": "^7.12.13", "@babel/helpers": "^7.12.13",
"@babel/parser": "^7.12.13", "@babel/parser": "^7.12.16",
"@babel/template": "^7.12.13", "@babel/template": "^7.12.13",
"@babel/traverse": "^7.12.13", "@babel/traverse": "^7.12.13",
"@babel/types": "^7.12.13", "@babel/types": "^7.12.13",
@@ -45,9 +45,9 @@
} }
}, },
"@babel/generator": { "@babel/generator": {
"version": "7.12.13", "version": "7.12.15",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
"integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.12.13", "@babel/types": "^7.12.13",
@@ -93,9 +93,9 @@
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.12.14", "version": "7.12.16",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz",
"integrity": "sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ==", "integrity": "sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
@@ -292,9 +292,9 @@
} }
}, },
"@babel/helper-member-expression-to-functions": { "@babel/helper-member-expression-to-functions": {
"version": "7.12.13", "version": "7.12.16",
"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz",
"integrity": "sha512-B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ==", "integrity": "sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.12.13" "@babel/types": "^7.12.13"
@@ -374,9 +374,9 @@
} }
}, },
"@babel/generator": { "@babel/generator": {
"version": "7.12.13", "version": "7.12.15",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
"integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.12.13", "@babel/types": "^7.12.13",
@@ -422,9 +422,9 @@
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.12.14", "version": "7.12.16",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz",
"integrity": "sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ==", "integrity": "sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
@@ -539,9 +539,9 @@
} }
}, },
"@babel/generator": { "@babel/generator": {
"version": "7.12.13", "version": "7.12.15",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
"integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.12.13", "@babel/types": "^7.12.13",
@@ -587,9 +587,9 @@
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.12.14", "version": "7.12.16",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz",
"integrity": "sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ==", "integrity": "sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
@@ -712,9 +712,9 @@
} }
}, },
"@babel/generator": { "@babel/generator": {
"version": "7.12.13", "version": "7.12.15",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz",
"integrity": "sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw==", "integrity": "sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.12.13", "@babel/types": "^7.12.13",
@@ -760,9 +760,9 @@
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.12.14", "version": "7.12.16",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz",
"integrity": "sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ==", "integrity": "sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
@@ -4531,9 +4531,9 @@
} }
}, },
"commander": { "commander": {
"version": "6.2.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-7.0.0.tgz",
"integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==" "integrity": "sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA=="
}, },
"component-bind": { "component-bind": {
"version": "1.0.0", "version": "1.0.0",
@@ -12729,9 +12729,9 @@
"dev": true "dev": true
}, },
"lint-staged": { "lint-staged": {
"version": "10.5.3", "version": "10.5.4",
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.3.tgz", "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz",
"integrity": "sha512-TanwFfuqUBLufxCc3RUtFEkFraSPNR3WzWcGF39R3f2J7S9+iF9W0KTVLfSy09lYGmZS5NDCxjNvhGMSJyFCWg==", "integrity": "sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^4.1.0", "chalk": "^4.1.0",
@@ -12785,6 +12785,12 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true "dev": true
}, },
"commander": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
"dev": true
},
"cosmiconfig": { "cosmiconfig": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
@@ -12947,9 +12953,9 @@
} }
}, },
"listr2": { "listr2": {
"version": "3.2.3", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/listr2/-/listr2-3.2.3.tgz", "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.3.1.tgz",
"integrity": "sha512-vUb80S2dSUi8YxXahO8/I/s29GqnOL8ozgHVLjfWQXa03BNEeS1TpBLjh2ruaqq5ufx46BRGvfymdBSuoXET5w==", "integrity": "sha512-8Zoxe7s/8nNr4bJ8bdAduHD8uJce+exmMmUWTXlq0WuUdffnH3muisHPHPFtW2vvOfohIsq7FGCaguUxN/h3Iw==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^4.1.0", "chalk": "^4.1.0",
@@ -12959,9 +12965,16 @@
"log-update": "^4.0.0", "log-update": "^4.0.0",
"p-map": "^4.0.0", "p-map": "^4.0.0",
"rxjs": "^6.6.3", "rxjs": "^6.6.3",
"through": "^2.3.8" "through": "^2.3.8",
"wrap-ansi": "^7.0.0"
}, },
"dependencies": { "dependencies": {
"ansi-regex": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
"dev": true
},
"ansi-styles": { "ansi-styles": {
"version": "4.3.0", "version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -13017,6 +13030,12 @@
"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true "dev": true
}, },
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
"rxjs": { "rxjs": {
"version": "6.6.3", "version": "6.6.3",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -13026,6 +13045,26 @@
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"string-width": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
"dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.0"
}
},
"strip-ansi": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
"dev": true,
"requires": {
"ansi-regex": "^5.0.0"
}
},
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13034,6 +13073,17 @@
"requires": { "requires": {
"has-flag": "^4.0.0" "has-flag": "^4.0.0"
} }
},
"wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
"dev": true,
"requires": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
}
} }
} }
}, },

View File

@@ -41,7 +41,7 @@
"bootstrap": "^3.4.1", "bootstrap": "^3.4.1",
"bootstrap-colorpicker": "^2.5.3", "bootstrap-colorpicker": "^2.5.3",
"buffer": "~6.0.2", "buffer": "~6.0.2",
"commander": "^6.2.0", "commander": "^7.0.0",
"compressorjs": "^1.0.5", "compressorjs": "^1.0.5",
"data-uri-to-buffer": "^3.0.0", "data-uri-to-buffer": "^3.0.0",
"downloadjs": "^1.4.7", "downloadjs": "^1.4.7",

View File

@@ -1,7 +1,7 @@
require('../ImageSequencer'); require('../ImageSequencer');
sequencer = ImageSequencer({ ui: true }); sequencer = ImageSequencer({ ui: true });
var fs = require('fs'); var fs = require('fs');
var program = require('commander'); var { Command } = require('commander');
var utils = require('../CliUtils'); var utils = require('../CliUtils');
var saveSequence = require('./saveSequence.js'); var saveSequence = require('./saveSequence.js');
@@ -73,6 +73,9 @@ function parseSteps(program) {
} }
function cli(args) { function cli(args) {
let program = new Command();
program program
.version('0.1.0') .version('0.1.0')
.option('-i, --image [PATH/URL]', 'Input image URL') .option('-i, --image [PATH/URL]', 'Input image URL')
@@ -90,9 +93,10 @@ function cli(args) {
) )
.parse(args); .parse(args);
if (program.saveSequence) saveSequence(program, sequencer); const options = program.opts();
else if (program.installModule) installModule(program, sequencer); if (options.saveSequence) saveSequence(options, sequencer);
else parseSteps(program); else if (options.installModule) installModule(options, sequencer);
else parseSteps(options);
} }
module.exports = cli; module.exports = cli;

View File

@@ -8,6 +8,10 @@
"desc": "Enter the text to overlay.", "desc": "Enter the text to overlay.",
"default": "Lorem ipsum" "default": "Lorem ipsum"
}, },
"Custom-Coordinates": {
"type": "coordinate-input",
"desc": "Click to fill Coordinates"
},
"x": { "x": {
"type": "integer", "type": "integer",
"desc": "Starting text horizontal position.", "desc": "Starting text horizontal position.",

View File

@@ -1,3 +1,4 @@
/** Parses the defaults and gets the input which is available. */
module.exports = function(info){ module.exports = function(info){
var defaults = {}; var defaults = {};
for (var key in info.inputs) { for (var key in info.inputs) {

View File

@@ -1,5 +1,12 @@
/**
* @param {number} x x-coordinate.
* @param {number} y y-coordinate.
* @param {object} value array [r, g, b, a]
* @param {object} pixels NDarray of pixels.
* @description Sets the pixels from 0 through length of value.
*/
module.exports = function(x, y, value, pixels){ module.exports = function(x, y, value, pixels){
for(let i = 0; i < value.length; i++){ for(let i = 0; i < value.length; i++){
pixels.set(x, y, i, value[i]); pixels.set(x, y, i, value[i]);
} }
}; };

37
test/core/sequencer/sw.js Normal file
View File

@@ -0,0 +1,37 @@
var setUpCache = new require('../../../examples/lib/cache')();
var test = require('tape');
function SWInstallation(){
return new Promise(() => {
return setupCache();
});
}
function UnRegisterSW(){
function unregister() {
return navigator.serviceWorker.getRegistrations()
.then(function(registrations) {
var unRegisteredWorker = registrations.map(function(registration) {
return registration.unregister();
});
return Promise.all(unRegisteredWorker);
});
}
return Promise.all([
unregister(),
setUpCache.clearCache()
]);
}
test('Register service worker',function(t) {
t.test('unregister service worker',function(st) {
st.equal(UnRegisterSW(),true,'unregistered successfully and cleared the cache')
})
t.test('install service worker',function(st) {
st.equal(SWInstallation(),true,'successfully installed new service worker')
});
});

View File

@@ -10,15 +10,15 @@
"@babel/highlight" "^7.12.13" "@babel/highlight" "^7.12.13"
"@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.7.5": "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.7.5":
version "7.12.13" version "7.12.16"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.13.tgz#b73a87a3a3e7d142a66248bf6ad88b9ceb093425" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c"
integrity sha512-BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw== integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw==
dependencies: dependencies:
"@babel/code-frame" "^7.12.13" "@babel/code-frame" "^7.12.13"
"@babel/generator" "^7.12.13" "@babel/generator" "^7.12.15"
"@babel/helper-module-transforms" "^7.12.13" "@babel/helper-module-transforms" "^7.12.13"
"@babel/helpers" "^7.12.13" "@babel/helpers" "^7.12.13"
"@babel/parser" "^7.12.13" "@babel/parser" "^7.12.16"
"@babel/template" "^7.12.13" "@babel/template" "^7.12.13"
"@babel/traverse" "^7.12.13" "@babel/traverse" "^7.12.13"
"@babel/types" "^7.12.13" "@babel/types" "^7.12.13"
@@ -30,10 +30,10 @@
semver "^5.4.1" semver "^5.4.1"
source-map "^0.5.0" source-map "^0.5.0"
"@babel/generator@^7.12.13": "@babel/generator@^7.12.13", "@babel/generator@^7.12.15":
version "7.12.13" version "7.12.15"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.13.tgz#5f6ebe6c85db99886db2d7b044409196f872a503" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f"
integrity sha512-9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw== integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==
dependencies: dependencies:
"@babel/types" "^7.12.13" "@babel/types" "^7.12.13"
jsesc "^2.5.1" jsesc "^2.5.1"
@@ -143,10 +143,10 @@
chalk "^2.0.0" chalk "^2.0.0"
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.7.5": "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.7.5":
version "7.12.14" version "7.12.16"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.14.tgz#4adb7c5eef1d437ef965ad1569cd826db8c11dc9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4"
integrity sha512-xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ== integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==
"@babel/plugin-proposal-object-rest-spread@^7.4.3": "@babel/plugin-proposal-object-rest-spread@^7.4.3":
version "7.12.13" version "7.12.13"
@@ -2430,6 +2430,11 @@ commander@^6.2.0:
resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
commander@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
commander@~2.13.0: commander@~2.13.0:
version "2.13.0" version "2.13.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -6851,9 +6856,9 @@ lines-and-columns@^1.1.6:
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
lint-staged@^10.0.3: lint-staged@^10.0.3:
version "10.5.3" version "10.5.4"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.3.tgz#c682838b3eadd4c864d1022da05daa0912fb1da5" resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665"
integrity sha512-TanwFfuqUBLufxCc3RUtFEkFraSPNR3WzWcGF39R3f2J7S9+iF9W0KTVLfSy09lYGmZS5NDCxjNvhGMSJyFCWg== integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==
dependencies: dependencies:
chalk "^4.1.0" chalk "^4.1.0"
cli-truncate "^2.1.0" cli-truncate "^2.1.0"