Calling this a patch commit lets go!

This commit is contained in:
mmcwilliams 2019-03-09 15:47:26 -05:00
parent 00b5efa484
commit 4202d01630
3 changed files with 27 additions and 3 deletions

View File

@ -88,6 +88,12 @@ light.init = function () {
}
});
};
light.disable = function () {
light.disabled = true;
}
light.enable = function () {
light.disabled = false;
};
light.colorPickers = function () {
'use strict';
$('#colors-tabs').w2tabs({
@ -116,6 +122,14 @@ light.set = function (rgb, callback) { //rgb = [0,0,0]
'use strict';
var obj;
if (light.disabled){
if (callback) {
return callback();
} else {
return false;
}
}
if (light.lock) {
//potential for logging overlapping commands
return false;
@ -130,7 +144,7 @@ light.set = function (rgb, callback) { //rgb = [0,0,0]
if (typeof callback !== 'undefined') {
obj.callback = callback;
}
light.queue[obj.id] = obj;
light.queue[obj.id] = obj;//
light.current = rgb;
light.lock = true;
};
@ -154,6 +168,11 @@ light.listen = function () {
light.preview = function (rgb, name) {
'use strict';
var rgbStr;
if (light.disabled) {
return false;
}
rgb = light.rgb.floor(rgb);
rgbStr = 'rgb(' + rgb.join(',') + ')';
light.color = rgb;
@ -173,6 +192,11 @@ light.display = function (rgb) { //display light active state
'use strict';
var str,
i;
if (light.disabled) {
return false;
}
rgb = light.rgb.floor(rgb);
for (i = 0; i < 3; i++) {
$('#light-status form input').eq(i).val(rgb[i]);

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.2.2",
"version": "1.2.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.2.2",
"version": "1.2.3",
"description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js",
"scripts": {