iobroker.zigbee 1.8.0 → 1.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/io-package.json +2 -2
- package/lib/binding.js +9 -13
- package/lib/colors.js +148 -145
- package/lib/commands.js +15 -13
- package/lib/developer.js +3 -5
- package/lib/devices.js +29 -30
- package/lib/exposes.js +60 -31
- package/lib/groups.js +32 -33
- package/lib/json.js +2 -2
- package/lib/networkmap.js +0 -1
- package/lib/ota.js +11 -3
- package/lib/rgb.js +72 -33
- package/lib/seriallist.js +9 -9
- package/lib/states.js +48 -49
- package/lib/statescontroller.js +44 -27
- package/lib/utils.js +3 -3
- package/lib/zbDeviceAvailability.js +26 -25
- package/lib/zbDeviceConfigure.js +2 -2
- package/lib/zigbeecontroller.js +22 -8
- package/main.js +17 -17
- package/package.json +1 -1
package/README.md
CHANGED
package/io-package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "zigbee",
|
|
4
|
-
"version": "1.8.
|
|
4
|
+
"version": "1.8.1",
|
|
5
5
|
"news": {
|
|
6
|
-
"1.8.
|
|
6
|
+
"1.8.1": {
|
|
7
7
|
"en": "Packages updated\nAdded names of serial ports in configuration dialog",
|
|
8
8
|
"de": "Pakete aktualisiert\nNamen der seriellen Ports im Konfigurationsdialog hinzugefügt",
|
|
9
9
|
"ru": "Пакеты обновлены\nДобавлены имена серийных портов в диалоге конфигурации",
|
package/lib/binding.js
CHANGED
|
@@ -47,30 +47,26 @@ class Binding {
|
|
|
47
47
|
switch (obj.command) {
|
|
48
48
|
case 'addBinding':
|
|
49
49
|
if (obj && obj.message && typeof obj.message === 'object') {
|
|
50
|
-
this.addBinding(obj.from, obj.command, obj.message,
|
|
51
|
-
this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
|
|
52
|
-
});
|
|
50
|
+
this.addBinding(obj.from, obj.command, obj.message, err =>
|
|
51
|
+
this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
|
|
53
52
|
}
|
|
54
53
|
break;
|
|
55
54
|
case 'editBinding':
|
|
56
55
|
if (obj && obj.message && typeof obj.message === 'object') {
|
|
57
|
-
this.editBinding(obj.from, obj.command, obj.message,
|
|
58
|
-
this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
|
|
59
|
-
});
|
|
56
|
+
this.editBinding(obj.from, obj.command, obj.message, err =>
|
|
57
|
+
this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
|
|
60
58
|
}
|
|
61
59
|
break;
|
|
62
60
|
case 'getBinding':
|
|
63
61
|
if (obj && obj.message && typeof obj.message === 'object') {
|
|
64
|
-
this.getBinding(
|
|
65
|
-
this.adapter.sendTo(obj.from, obj.command, binding, obj.callback);
|
|
66
|
-
});
|
|
62
|
+
this.getBinding(binding =>
|
|
63
|
+
this.adapter.sendTo(obj.from, obj.command, binding, obj.callback));
|
|
67
64
|
}
|
|
68
65
|
break;
|
|
69
66
|
case 'delBinding':
|
|
70
67
|
if (obj && obj.message) {
|
|
71
|
-
this.delBinding(obj.from, obj.command, obj.message,
|
|
72
|
-
this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
|
|
73
|
-
});
|
|
68
|
+
this.delBinding(obj.from, obj.command, obj.message, err =>
|
|
69
|
+
this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
|
|
74
70
|
}
|
|
75
71
|
break;
|
|
76
72
|
}
|
|
@@ -238,7 +234,7 @@ class Binding {
|
|
|
238
234
|
} else {
|
|
239
235
|
const type = params.unbind_from_coordinator ? 'unbind' : 'bind';
|
|
240
236
|
try {
|
|
241
|
-
await this.doBindUnbind(type
|
|
237
|
+
await this.doBindUnbind(type, bind_source, bind_source_ep, 'coordinator', '1');
|
|
242
238
|
this.debug('Successfully ' + (type === 'bind' ? 'bound' : 'unbound') + ' Coordinator from ' + bind_source);
|
|
243
239
|
} catch (e) {
|
|
244
240
|
this.error(`Could not ${type} Coordinator from ${bind_source}: ${JSON.stringify(e)}`);
|
package/lib/colors.js
CHANGED
|
@@ -4,421 +4,421 @@ const namedColors = {
|
|
|
4
4
|
mediumvioletred: {
|
|
5
5
|
rgb: '#c71585',
|
|
6
6
|
},
|
|
7
|
-
deeppink:
|
|
7
|
+
deeppink: {
|
|
8
8
|
rgb: '#ff1493',
|
|
9
9
|
},
|
|
10
10
|
palevioletred: {
|
|
11
11
|
rgb: '#db7093',
|
|
12
12
|
},
|
|
13
|
-
hotpink:
|
|
13
|
+
hotpink: {
|
|
14
14
|
rgb: '#ff69b4',
|
|
15
15
|
},
|
|
16
|
-
lightpink:
|
|
16
|
+
lightpink: {
|
|
17
17
|
rgb: '#ffb6c1',
|
|
18
18
|
},
|
|
19
|
-
pink:
|
|
19
|
+
pink: {
|
|
20
20
|
rgb: '#ffc0cb',
|
|
21
21
|
},
|
|
22
|
-
darkred:
|
|
22
|
+
darkred: {
|
|
23
23
|
rgb: '#8b0000',
|
|
24
24
|
},
|
|
25
|
-
red:
|
|
25
|
+
red: {
|
|
26
26
|
rgb: '#ff0000',
|
|
27
27
|
},
|
|
28
|
-
firebrick:
|
|
28
|
+
firebrick: {
|
|
29
29
|
rgb: '#b22222',
|
|
30
30
|
},
|
|
31
|
-
crimson:
|
|
31
|
+
crimson: {
|
|
32
32
|
rgb: '#dc143c',
|
|
33
33
|
},
|
|
34
|
-
indianred:
|
|
34
|
+
indianred: {
|
|
35
35
|
rgb: '#cd5c5c',
|
|
36
36
|
},
|
|
37
|
-
lightcoral:
|
|
37
|
+
lightcoral: {
|
|
38
38
|
rgb: '#f08080',
|
|
39
39
|
},
|
|
40
|
-
salmon:
|
|
40
|
+
salmon: {
|
|
41
41
|
rgb: '#fa8072',
|
|
42
42
|
},
|
|
43
|
-
darksalmon:
|
|
43
|
+
darksalmon: {
|
|
44
44
|
rgb: '#e9967a',
|
|
45
45
|
},
|
|
46
|
-
lightsalmon:
|
|
46
|
+
lightsalmon: {
|
|
47
47
|
rgb: '#ffa07a',
|
|
48
48
|
},
|
|
49
|
-
orangered:
|
|
49
|
+
orangered: {
|
|
50
50
|
rgb: '#ff4500',
|
|
51
51
|
},
|
|
52
|
-
tomato:
|
|
52
|
+
tomato: {
|
|
53
53
|
rgb: '#ff6347',
|
|
54
54
|
},
|
|
55
|
-
darkorange:
|
|
55
|
+
darkorange: {
|
|
56
56
|
rgb: '#ff8c00',
|
|
57
57
|
},
|
|
58
|
-
coral:
|
|
58
|
+
coral: {
|
|
59
59
|
rgb: '#ff7f50',
|
|
60
60
|
},
|
|
61
|
-
orange:
|
|
61
|
+
orange: {
|
|
62
62
|
rgb: '#ffa500',
|
|
63
63
|
},
|
|
64
|
-
darkkhaki:
|
|
64
|
+
darkkhaki: {
|
|
65
65
|
rgb: '#bdb76b',
|
|
66
66
|
},
|
|
67
|
-
gold:
|
|
67
|
+
gold: {
|
|
68
68
|
rgb: '#ffd700',
|
|
69
69
|
},
|
|
70
|
-
khaki:
|
|
70
|
+
khaki: {
|
|
71
71
|
rgb: '#f0e68c',
|
|
72
72
|
},
|
|
73
|
-
peachpuff:
|
|
73
|
+
peachpuff: {
|
|
74
74
|
rgb: '#ffdab9',
|
|
75
75
|
},
|
|
76
|
-
yellow:
|
|
76
|
+
yellow: {
|
|
77
77
|
rgb: '#ffff00',
|
|
78
78
|
},
|
|
79
|
-
palegoldenrod:
|
|
79
|
+
palegoldenrod: {
|
|
80
80
|
rgb: '#eee8aa',
|
|
81
81
|
},
|
|
82
|
-
moccasin:
|
|
82
|
+
moccasin: {
|
|
83
83
|
rgb: '#ffe4b5',
|
|
84
84
|
},
|
|
85
|
-
papayawhip:
|
|
85
|
+
papayawhip: {
|
|
86
86
|
rgb: '#ffefd5',
|
|
87
87
|
},
|
|
88
|
-
lightgoldenrodyellow:
|
|
88
|
+
lightgoldenrodyellow: {
|
|
89
89
|
rgb: '#fafad2',
|
|
90
90
|
},
|
|
91
|
-
lemonchiffon:
|
|
91
|
+
lemonchiffon: {
|
|
92
92
|
rgb: '#fffacd',
|
|
93
93
|
},
|
|
94
|
-
lightyellow:
|
|
94
|
+
lightyellow: {
|
|
95
95
|
rgb: '#ffffe0',
|
|
96
96
|
},
|
|
97
|
-
maroon:
|
|
97
|
+
maroon: {
|
|
98
98
|
rgb: '#800000',
|
|
99
99
|
},
|
|
100
|
-
brown:
|
|
100
|
+
brown: {
|
|
101
101
|
rgb: '#a52a2a',
|
|
102
102
|
},
|
|
103
|
-
saddlebrown:
|
|
103
|
+
saddlebrown: {
|
|
104
104
|
rgb: '#8b4513',
|
|
105
105
|
},
|
|
106
|
-
sienna:
|
|
106
|
+
sienna: {
|
|
107
107
|
rgb: '#a0522d',
|
|
108
108
|
},
|
|
109
|
-
chocolate:
|
|
109
|
+
chocolate: {
|
|
110
110
|
rgb: '#d2691e',
|
|
111
111
|
},
|
|
112
|
-
darkgoldenrod:
|
|
112
|
+
darkgoldenrod: {
|
|
113
113
|
rgb: '#b8860b',
|
|
114
114
|
},
|
|
115
|
-
peru:
|
|
115
|
+
peru: {
|
|
116
116
|
rgb: '#cd853f',
|
|
117
117
|
},
|
|
118
|
-
rosybrown:
|
|
118
|
+
rosybrown: {
|
|
119
119
|
rgb: '#bc8f8f',
|
|
120
120
|
},
|
|
121
|
-
goldenrod:
|
|
121
|
+
goldenrod: {
|
|
122
122
|
rgb: '#daa520',
|
|
123
123
|
},
|
|
124
|
-
sandybrown:
|
|
124
|
+
sandybrown: {
|
|
125
125
|
rgb: '#f4a460',
|
|
126
126
|
},
|
|
127
|
-
tan:
|
|
127
|
+
tan: {
|
|
128
128
|
rgb: '#d2b48c',
|
|
129
129
|
},
|
|
130
|
-
burlywood:
|
|
130
|
+
burlywood: {
|
|
131
131
|
rgb: '#deb887',
|
|
132
132
|
},
|
|
133
|
-
wheat:
|
|
133
|
+
wheat: {
|
|
134
134
|
rgb: '#f5deb3',
|
|
135
135
|
},
|
|
136
|
-
navajowhite:
|
|
136
|
+
navajowhite: {
|
|
137
137
|
rgb: '#ffdead',
|
|
138
138
|
},
|
|
139
|
-
bisque:
|
|
139
|
+
bisque: {
|
|
140
140
|
rgb: '#ffe4c4',
|
|
141
141
|
},
|
|
142
|
-
blanchedalmond:
|
|
142
|
+
blanchedalmond: {
|
|
143
143
|
rgb: '#ffebcd',
|
|
144
144
|
},
|
|
145
|
-
cornsilk:
|
|
145
|
+
cornsilk: {
|
|
146
146
|
rgb: '#fff8dc',
|
|
147
147
|
},
|
|
148
|
-
darkgreen:
|
|
148
|
+
darkgreen: {
|
|
149
149
|
rgb: '#006400',
|
|
150
150
|
},
|
|
151
|
-
green:
|
|
151
|
+
green: {
|
|
152
152
|
rgb: '#008000',
|
|
153
153
|
},
|
|
154
|
-
darkolivegreen:
|
|
154
|
+
darkolivegreen: {
|
|
155
155
|
rgb: '#556b2f',
|
|
156
156
|
},
|
|
157
|
-
forestgreen:
|
|
157
|
+
forestgreen: {
|
|
158
158
|
rgb: '#228b22',
|
|
159
159
|
},
|
|
160
|
-
seagreen:
|
|
160
|
+
seagreen: {
|
|
161
161
|
rgb: '#2e8b57',
|
|
162
162
|
},
|
|
163
|
-
olive:
|
|
163
|
+
olive: {
|
|
164
164
|
rgb: '#808000',
|
|
165
165
|
},
|
|
166
|
-
olivedrab:
|
|
166
|
+
olivedrab: {
|
|
167
167
|
rgb: '#6b8e23',
|
|
168
168
|
},
|
|
169
|
-
mediumseagreen:
|
|
169
|
+
mediumseagreen: {
|
|
170
170
|
rgb: '#3cb371',
|
|
171
171
|
},
|
|
172
|
-
limegreen:
|
|
172
|
+
limegreen: {
|
|
173
173
|
rgb: '#32cd32',
|
|
174
174
|
},
|
|
175
|
-
lime:
|
|
175
|
+
lime: {
|
|
176
176
|
rgb: '#00ff00',
|
|
177
177
|
},
|
|
178
|
-
springgreen:
|
|
178
|
+
springgreen: {
|
|
179
179
|
rgb: '#00ff7f',
|
|
180
180
|
},
|
|
181
|
-
mediumspringgreen:
|
|
181
|
+
mediumspringgreen: {
|
|
182
182
|
rgb: '#00fa9a',
|
|
183
183
|
},
|
|
184
|
-
darkseagreen:
|
|
184
|
+
darkseagreen: {
|
|
185
185
|
rgb: '#8fbc8f',
|
|
186
186
|
},
|
|
187
|
-
mediumaquamarine:
|
|
187
|
+
mediumaquamarine: {
|
|
188
188
|
rgb: '#66cdaa',
|
|
189
189
|
},
|
|
190
|
-
yellowgreen:
|
|
190
|
+
yellowgreen: {
|
|
191
191
|
rgb: '#9acd32',
|
|
192
192
|
},
|
|
193
|
-
lawngreen:
|
|
193
|
+
lawngreen: {
|
|
194
194
|
rgb: '#7cfc00',
|
|
195
195
|
},
|
|
196
|
-
chartreuse:
|
|
196
|
+
chartreuse: {
|
|
197
197
|
rgb: '#7fff00',
|
|
198
198
|
},
|
|
199
|
-
lightgreen:
|
|
199
|
+
lightgreen: {
|
|
200
200
|
rgb: '#90ee90',
|
|
201
201
|
},
|
|
202
|
-
greenyellow:
|
|
202
|
+
greenyellow: {
|
|
203
203
|
rgb: '#adff2f',
|
|
204
204
|
},
|
|
205
|
-
palegreen:
|
|
205
|
+
palegreen: {
|
|
206
206
|
rgb: '#98fb98',
|
|
207
207
|
},
|
|
208
|
-
teal:
|
|
208
|
+
teal: {
|
|
209
209
|
rgb: '#008080',
|
|
210
210
|
},
|
|
211
|
-
darkcyan:
|
|
211
|
+
darkcyan: {
|
|
212
212
|
rgb: '#008b8b',
|
|
213
213
|
},
|
|
214
|
-
lightseagreen:
|
|
214
|
+
lightseagreen: {
|
|
215
215
|
rgb: '#20b2aa',
|
|
216
216
|
},
|
|
217
|
-
cadetblue:
|
|
217
|
+
cadetblue: {
|
|
218
218
|
rgb: '#5f9ea0',
|
|
219
219
|
},
|
|
220
|
-
darkturquoise:
|
|
220
|
+
darkturquoise: {
|
|
221
221
|
rgb: '#00ced1',
|
|
222
222
|
},
|
|
223
|
-
mediumturquoise:
|
|
223
|
+
mediumturquoise: {
|
|
224
224
|
rgb: '#48d1cc',
|
|
225
225
|
},
|
|
226
|
-
turquoise:
|
|
226
|
+
turquoise: {
|
|
227
227
|
rgb: '#40e0d0',
|
|
228
228
|
},
|
|
229
|
-
aqua:
|
|
229
|
+
aqua: {
|
|
230
230
|
rgb: '#00ffff',
|
|
231
231
|
},
|
|
232
|
-
cyan:
|
|
232
|
+
cyan: {
|
|
233
233
|
rgb: '#00ffff',
|
|
234
234
|
},
|
|
235
|
-
aquamarine:
|
|
235
|
+
aquamarine: {
|
|
236
236
|
rgb: '#7fffd4',
|
|
237
237
|
},
|
|
238
|
-
paleturquoise:
|
|
238
|
+
paleturquoise: {
|
|
239
239
|
rgb: '#afeeee',
|
|
240
240
|
},
|
|
241
|
-
lightcyan:
|
|
241
|
+
lightcyan: {
|
|
242
242
|
rgb: '#e0ffff',
|
|
243
243
|
},
|
|
244
|
-
navy:
|
|
244
|
+
navy: {
|
|
245
245
|
rgb: '#000080',
|
|
246
246
|
},
|
|
247
|
-
darkblue:
|
|
247
|
+
darkblue: {
|
|
248
248
|
rgb: '#00008b',
|
|
249
249
|
},
|
|
250
|
-
mediumblue:
|
|
250
|
+
mediumblue: {
|
|
251
251
|
rgb: '#0000cd',
|
|
252
252
|
},
|
|
253
|
-
blue:
|
|
253
|
+
blue: {
|
|
254
254
|
rgb: '#0000ff',
|
|
255
255
|
},
|
|
256
|
-
midnightblue:
|
|
256
|
+
midnightblue: {
|
|
257
257
|
rgb: '#191970',
|
|
258
258
|
},
|
|
259
|
-
royalblue:
|
|
259
|
+
royalblue: {
|
|
260
260
|
rgb: '#4169e1',
|
|
261
261
|
},
|
|
262
|
-
steelblue:
|
|
262
|
+
steelblue: {
|
|
263
263
|
rgb: '#4682b4',
|
|
264
264
|
},
|
|
265
|
-
dodgerblue:
|
|
265
|
+
dodgerblue: {
|
|
266
266
|
rgb: '#1e90ff',
|
|
267
267
|
},
|
|
268
|
-
deepskyblue:
|
|
268
|
+
deepskyblue: {
|
|
269
269
|
rgb: '#00bfff',
|
|
270
270
|
},
|
|
271
|
-
cornflowerblue:
|
|
271
|
+
cornflowerblue: {
|
|
272
272
|
rgb: '#6495ed',
|
|
273
273
|
},
|
|
274
|
-
skyblue:
|
|
274
|
+
skyblue: {
|
|
275
275
|
rgb: '#87ceeb',
|
|
276
276
|
},
|
|
277
|
-
lightskyblue:
|
|
277
|
+
lightskyblue: {
|
|
278
278
|
rgb: '#87cefa',
|
|
279
279
|
},
|
|
280
|
-
lightsteelblue:
|
|
280
|
+
lightsteelblue: {
|
|
281
281
|
rgb: '#b0c4de',
|
|
282
282
|
},
|
|
283
|
-
lightblue:
|
|
283
|
+
lightblue: {
|
|
284
284
|
rgb: '#add8e6',
|
|
285
285
|
},
|
|
286
|
-
powderblue:
|
|
286
|
+
powderblue: {
|
|
287
287
|
rgb: '#b0e0e6',
|
|
288
288
|
},
|
|
289
|
-
indigo:
|
|
289
|
+
indigo: {
|
|
290
290
|
rgb: '#4b0082',
|
|
291
291
|
},
|
|
292
|
-
purple:
|
|
292
|
+
purple: {
|
|
293
293
|
rgb: '#800080',
|
|
294
294
|
},
|
|
295
|
-
darkmagenta:
|
|
295
|
+
darkmagenta: {
|
|
296
296
|
rgb: '#8b008b',
|
|
297
297
|
},
|
|
298
|
-
darkviolet:
|
|
298
|
+
darkviolet: {
|
|
299
299
|
rgb: '#9400d3',
|
|
300
300
|
},
|
|
301
|
-
darkslateblue:
|
|
301
|
+
darkslateblue: {
|
|
302
302
|
rgb: '#483d8b',
|
|
303
303
|
},
|
|
304
|
-
blueviolet:
|
|
304
|
+
blueviolet: {
|
|
305
305
|
rgb: '#8a2be2',
|
|
306
306
|
},
|
|
307
|
-
darkorchid:
|
|
307
|
+
darkorchid: {
|
|
308
308
|
rgb: '#9932cc',
|
|
309
309
|
},
|
|
310
|
-
fuchsia:
|
|
310
|
+
fuchsia: {
|
|
311
311
|
rgb: '#ff00ff',
|
|
312
312
|
},
|
|
313
|
-
magenta:
|
|
313
|
+
magenta: {
|
|
314
314
|
rgb: '#ff00ff',
|
|
315
315
|
},
|
|
316
|
-
slateblue:
|
|
316
|
+
slateblue: {
|
|
317
317
|
rgb: '#6a5acd',
|
|
318
318
|
},
|
|
319
|
-
mediumslateblue:
|
|
319
|
+
mediumslateblue: {
|
|
320
320
|
rgb: '#7b68ee',
|
|
321
321
|
},
|
|
322
|
-
mediumorchid:
|
|
322
|
+
mediumorchid: {
|
|
323
323
|
rgb: '#ba55d3',
|
|
324
324
|
},
|
|
325
|
-
mediumpurple:
|
|
325
|
+
mediumpurple: {
|
|
326
326
|
rgb: '#9370db',
|
|
327
327
|
},
|
|
328
|
-
orchid:
|
|
328
|
+
orchid: {
|
|
329
329
|
rgb: '#da70d6',
|
|
330
330
|
},
|
|
331
|
-
violet:
|
|
331
|
+
violet: {
|
|
332
332
|
rgb: '#ee82ee',
|
|
333
333
|
},
|
|
334
|
-
plum:
|
|
334
|
+
plum: {
|
|
335
335
|
rgb: '#dda0dd',
|
|
336
336
|
},
|
|
337
|
-
thistle:
|
|
337
|
+
thistle: {
|
|
338
338
|
rgb: '#d8bfd8',
|
|
339
339
|
},
|
|
340
|
-
lavender:
|
|
340
|
+
lavender: {
|
|
341
341
|
rgb: '#e6e6fa',
|
|
342
342
|
},
|
|
343
|
-
mistyrose:
|
|
343
|
+
mistyrose: {
|
|
344
344
|
rgb: '#ffe4e1',
|
|
345
345
|
},
|
|
346
|
-
antiquewhite:
|
|
346
|
+
antiquewhite: {
|
|
347
347
|
rgb: '#faebd7',
|
|
348
348
|
},
|
|
349
|
-
linen:
|
|
349
|
+
linen: {
|
|
350
350
|
rgb: '#faf0e6',
|
|
351
351
|
},
|
|
352
|
-
beige:
|
|
352
|
+
beige: {
|
|
353
353
|
rgb: '#f5f5dc',
|
|
354
354
|
},
|
|
355
|
-
whitesmoke:
|
|
355
|
+
whitesmoke: {
|
|
356
356
|
rgb: '#f5f5f5',
|
|
357
357
|
},
|
|
358
|
-
lavenderblush:
|
|
358
|
+
lavenderblush: {
|
|
359
359
|
rgb: '#fff0f5',
|
|
360
360
|
},
|
|
361
|
-
oldlace:
|
|
361
|
+
oldlace: {
|
|
362
362
|
rgb: '#fdf5e6',
|
|
363
363
|
},
|
|
364
|
-
aliceblue:
|
|
364
|
+
aliceblue: {
|
|
365
365
|
rgb: '#f0f8ff',
|
|
366
366
|
},
|
|
367
|
-
seashell:
|
|
367
|
+
seashell: {
|
|
368
368
|
rgb: '#fff5ee',
|
|
369
369
|
},
|
|
370
|
-
ghostwhite:
|
|
370
|
+
ghostwhite: {
|
|
371
371
|
rgb: '#f8f8ff',
|
|
372
372
|
},
|
|
373
|
-
honeydew:
|
|
373
|
+
honeydew: {
|
|
374
374
|
rgb: '#f0fff0',
|
|
375
375
|
},
|
|
376
|
-
floralwhite:
|
|
376
|
+
floralwhite: {
|
|
377
377
|
rgb: '#fffaf0',
|
|
378
378
|
},
|
|
379
|
-
azure:
|
|
379
|
+
azure: {
|
|
380
380
|
rgb: '#f0ffff',
|
|
381
381
|
},
|
|
382
|
-
mintcream:
|
|
382
|
+
mintcream: {
|
|
383
383
|
rgb: '#f5fffa',
|
|
384
384
|
},
|
|
385
|
-
snow:
|
|
385
|
+
snow: {
|
|
386
386
|
rgb: '#fffafa',
|
|
387
387
|
},
|
|
388
|
-
ivory:
|
|
388
|
+
ivory: {
|
|
389
389
|
rgb: '#fffff0',
|
|
390
390
|
},
|
|
391
|
-
white:
|
|
391
|
+
white: {
|
|
392
392
|
rgb: '#ffffff',
|
|
393
393
|
},
|
|
394
|
-
black:
|
|
394
|
+
black: {
|
|
395
395
|
rgb: '#000000',
|
|
396
396
|
},
|
|
397
|
-
darkslategray:
|
|
397
|
+
darkslategray: {
|
|
398
398
|
rgb: '#2f4f4f',
|
|
399
399
|
},
|
|
400
|
-
dimgray:
|
|
400
|
+
dimgray: {
|
|
401
401
|
rgb: '#696969',
|
|
402
402
|
},
|
|
403
|
-
slategray:
|
|
403
|
+
slategray: {
|
|
404
404
|
rgb: '#708090',
|
|
405
405
|
},
|
|
406
|
-
gray:
|
|
406
|
+
gray: {
|
|
407
407
|
rgb: '#808080',
|
|
408
408
|
},
|
|
409
|
-
lightslategray:
|
|
409
|
+
lightslategray: {
|
|
410
410
|
rgb: '#778899',
|
|
411
411
|
},
|
|
412
|
-
darkgray:
|
|
412
|
+
darkgray: {
|
|
413
413
|
rgb: '#a9a9a9',
|
|
414
414
|
},
|
|
415
|
-
silver:
|
|
415
|
+
silver: {
|
|
416
416
|
rgb: '#c0c0c0',
|
|
417
417
|
},
|
|
418
|
-
lightgray:
|
|
418
|
+
lightgray: {
|
|
419
419
|
rgb: '#d3d3d3',
|
|
420
420
|
},
|
|
421
|
-
gainsboro:
|
|
421
|
+
gainsboro: {
|
|
422
422
|
rgb: '#dcdcdc',
|
|
423
423
|
},
|
|
424
424
|
};
|
|
@@ -432,21 +432,24 @@ function namedColorToRGBstring(name) {
|
|
|
432
432
|
}
|
|
433
433
|
|
|
434
434
|
function parseColor(rgbstring) {
|
|
435
|
-
if (typeof
|
|
435
|
+
if (typeof rgbstring === 'string') {
|
|
436
436
|
const lowerName = rgbstring.toLowerCase();
|
|
437
|
-
if (namedColors.hasOwnProperty(lowerName))
|
|
437
|
+
if (namedColors.hasOwnProperty(lowerName)) {
|
|
438
438
|
rgbstring = namedColors[lowerName].rgb;
|
|
439
|
+
}
|
|
439
440
|
rgbstring = rgbstring.trim();
|
|
440
|
-
if (rgbstring.startsWith('#'))
|
|
441
|
-
|
|
441
|
+
if (rgbstring.startsWith('#')) {
|
|
442
|
+
rgbstring = rgbstring.slice(1);
|
|
443
|
+
}
|
|
444
|
+
const val = parseInt(`0x${rgbstring}`);
|
|
442
445
|
const oneColor = {};
|
|
443
|
-
oneColor.r = Math.floor(val / (256*256));
|
|
444
|
-
oneColor.g = Math.floor(val % (256*256) / 256);
|
|
446
|
+
oneColor.r = Math.floor(val / (256 * 256));
|
|
447
|
+
oneColor.g = Math.floor(val % (256 * 256) / 256);
|
|
445
448
|
oneColor.b = val % 256;
|
|
446
449
|
return oneColor;
|
|
447
450
|
}
|
|
448
451
|
|
|
449
|
-
return {r: 0,g: 128,b: 255};
|
|
452
|
+
return {r: 0, g: 128, b: 255};
|
|
450
453
|
}
|
|
451
454
|
|
|
452
455
|
function namedColorToRGB(name) {
|