x4js 1.4.2

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.
Files changed (176) hide show
  1. package/lib/application.d.ts +95 -0
  2. package/lib/application.js +137 -0
  3. package/lib/base64.d.ts +31 -0
  4. package/lib/base64.js +135 -0
  5. package/lib/base_component.d.ts +64 -0
  6. package/lib/base_component.js +77 -0
  7. package/lib/button.d.ts +145 -0
  8. package/lib/button.js +235 -0
  9. package/lib/calendar.d.ts +77 -0
  10. package/lib/calendar.js +236 -0
  11. package/lib/canvas.d.ts +88 -0
  12. package/lib/canvas.js +354 -0
  13. package/lib/cardview.d.ts +83 -0
  14. package/lib/cardview.js +152 -0
  15. package/lib/checkbox.d.ts +72 -0
  16. package/lib/checkbox.js +126 -0
  17. package/lib/color.d.ts +144 -0
  18. package/lib/color.js +584 -0
  19. package/lib/colorpicker.d.ts +98 -0
  20. package/lib/colorpicker.js +1457 -0
  21. package/lib/combobox.d.ts +97 -0
  22. package/lib/combobox.js +246 -0
  23. package/lib/component.d.ts +572 -0
  24. package/lib/component.js +1712 -0
  25. package/lib/datastore.d.ts +392 -0
  26. package/lib/datastore.js +986 -0
  27. package/lib/dialog.d.ts +171 -0
  28. package/lib/dialog.js +468 -0
  29. package/lib/dom_events.d.ts +284 -0
  30. package/lib/dom_events.js +13 -0
  31. package/lib/drag_manager.d.ts +26 -0
  32. package/lib/drag_manager.js +118 -0
  33. package/lib/drawtext.d.ts +43 -0
  34. package/lib/drawtext.js +261 -0
  35. package/lib/fileupload.d.ts +60 -0
  36. package/lib/fileupload.js +158 -0
  37. package/lib/form.d.ts +122 -0
  38. package/lib/form.js +293 -0
  39. package/lib/formatters.d.ts +31 -0
  40. package/lib/formatters.js +75 -0
  41. package/lib/gridview.d.ts +171 -0
  42. package/lib/gridview.js +786 -0
  43. package/lib/hosts/host.d.ts +44 -0
  44. package/lib/hosts/host.js +69 -0
  45. package/lib/i18n.d.ts +67 -0
  46. package/lib/i18n.js +169 -0
  47. package/lib/icon.d.ts +56 -0
  48. package/lib/icon.js +173 -0
  49. package/lib/image.d.ts +51 -0
  50. package/lib/image.js +149 -0
  51. package/lib/index.js +1 -0
  52. package/lib/input.d.ts +86 -0
  53. package/lib/input.js +172 -0
  54. package/lib/label.d.ts +54 -0
  55. package/lib/label.js +86 -0
  56. package/lib/layout.d.ts +77 -0
  57. package/lib/layout.js +261 -0
  58. package/lib/link.d.ts +46 -0
  59. package/lib/link.js +55 -0
  60. package/lib/listview.d.ts +173 -0
  61. package/lib/listview.js +532 -0
  62. package/lib/md5.d.ts +56 -0
  63. package/lib/md5.js +397 -0
  64. package/lib/menu.d.ts +122 -0
  65. package/lib/menu.js +276 -0
  66. package/lib/messagebox.d.ts +64 -0
  67. package/lib/messagebox.js +141 -0
  68. package/lib/panel.d.ts +42 -0
  69. package/lib/panel.js +61 -0
  70. package/lib/popup.d.ts +71 -0
  71. package/lib/popup.js +373 -0
  72. package/lib/property_editor.d.ts +67 -0
  73. package/lib/property_editor.js +247 -0
  74. package/lib/radiobtn.d.ts +68 -0
  75. package/lib/radiobtn.js +131 -0
  76. package/lib/rating.d.ts +49 -0
  77. package/lib/rating.js +93 -0
  78. package/lib/request.d.ts +48 -0
  79. package/lib/request.js +220 -0
  80. package/lib/router.d.ts +13 -0
  81. package/lib/router.js +27 -0
  82. package/lib/settings.d.ts +33 -0
  83. package/lib/settings.js +63 -0
  84. package/lib/sidebarview.d.ts +44 -0
  85. package/lib/sidebarview.js +73 -0
  86. package/lib/smartedit.d.ts +103 -0
  87. package/lib/smartedit.js +381 -0
  88. package/lib/spreadsheet.d.ts +214 -0
  89. package/lib/spreadsheet.js +1073 -0
  90. package/lib/styles.d.ts +81 -0
  91. package/lib/styles.js +262 -0
  92. package/lib/svgcomponent.d.ts +165 -0
  93. package/lib/svgcomponent.js +350 -0
  94. package/lib/tabbar.d.ts +41 -0
  95. package/lib/tabbar.js +66 -0
  96. package/lib/tabview.d.ts +45 -0
  97. package/lib/tabview.js +79 -0
  98. package/lib/textarea.d.ts +59 -0
  99. package/lib/textarea.js +119 -0
  100. package/lib/textedit.d.ts +118 -0
  101. package/lib/textedit.js +406 -0
  102. package/lib/texthiliter.d.ts +56 -0
  103. package/lib/texthiliter.js +219 -0
  104. package/lib/toaster.d.ts +38 -0
  105. package/lib/toaster.js +58 -0
  106. package/lib/tools.d.ts +382 -0
  107. package/lib/tools.js +1096 -0
  108. package/lib/tooltips.d.ts +42 -0
  109. package/lib/tooltips.js +148 -0
  110. package/lib/treeview.d.ts +128 -0
  111. package/lib/treeview.js +490 -0
  112. package/lib/x4_events.d.ts +253 -0
  113. package/lib/x4_events.js +363 -0
  114. package/package.json +21 -0
  115. package/src/README.md +2 -0
  116. package/src/application.ts +191 -0
  117. package/src/base64.ts +162 -0
  118. package/src/base_component.ts +118 -0
  119. package/src/button.ts +327 -0
  120. package/src/calendar.ts +312 -0
  121. package/src/canvas.ts +501 -0
  122. package/src/cardview.ts +220 -0
  123. package/src/checkbox.ts +178 -0
  124. package/src/color.ts +748 -0
  125. package/src/colorpicker.ts +1618 -0
  126. package/src/combobox.ts +348 -0
  127. package/src/component.ts +2330 -0
  128. package/src/datastore.ts +1318 -0
  129. package/src/dialog.ts +631 -0
  130. package/src/dom_events.ts +297 -0
  131. package/src/drag_manager.ts +168 -0
  132. package/src/drawtext.ts +342 -0
  133. package/src/fileupload.ts +208 -0
  134. package/src/form.ts +362 -0
  135. package/src/formatters.ts +96 -0
  136. package/src/gridview.ts +1051 -0
  137. package/src/hosts/electron.ts +161 -0
  138. package/src/hosts/host.ts +100 -0
  139. package/src/hosts/nwjs.ts +141 -0
  140. package/src/hosts/nwjs_types.ts +339 -0
  141. package/src/i18n.ts +205 -0
  142. package/src/icon.ts +237 -0
  143. package/src/image.ts +198 -0
  144. package/src/input.ts +236 -0
  145. package/src/label.ts +124 -0
  146. package/src/layout.ts +366 -0
  147. package/src/link.ts +82 -0
  148. package/src/listview.ts +749 -0
  149. package/src/md5.ts +432 -0
  150. package/src/menu.ts +394 -0
  151. package/src/messagebox.ts +199 -0
  152. package/src/panel.ts +81 -0
  153. package/src/popup.ts +488 -0
  154. package/src/property_editor.ts +333 -0
  155. package/src/radiobtn.ts +190 -0
  156. package/src/rating.ts +131 -0
  157. package/src/request.ts +296 -0
  158. package/src/router.ts +43 -0
  159. package/src/settings.ts +75 -0
  160. package/src/sidebarview.ts +97 -0
  161. package/src/smartedit.ts +532 -0
  162. package/src/spreadsheet.ts +1423 -0
  163. package/src/styles.ts +332 -0
  164. package/src/svgcomponent.ts +440 -0
  165. package/src/tabbar.ts +105 -0
  166. package/src/tabview.ts +106 -0
  167. package/src/textarea.ts +183 -0
  168. package/src/textedit.ts +535 -0
  169. package/src/texthiliter.ts +284 -0
  170. package/src/toaster.ts +76 -0
  171. package/src/tools.ts +1391 -0
  172. package/src/tooltips.ts +185 -0
  173. package/src/treeview.ts +670 -0
  174. package/src/x4.less +1940 -0
  175. package/src/x4_events.ts +558 -0
  176. package/tsconfig.json +14 -0
@@ -0,0 +1,490 @@
1
+ /**
2
+ * ___ ___ __
3
+ * \ \_/ / / _
4
+ * \ / /_| |_
5
+ * / _ \____ _|
6
+ * /__/ \__\ |_|
7
+ *
8
+ * @file treeview.ts
9
+ * @author Etienne Cochard
10
+ * @license
11
+ * Copyright (c) 2019-2021 R-libre ingenierie
12
+ *
13
+ * This program is free software; you can redistribute it and/or modify
14
+ * it under the terms of the GNU General Public License as published by
15
+ * the Free Software Foundation; either version 3 of the License, or
16
+ * (at your option) any later version.
17
+ *
18
+ * This program is distributed in the hope that it will be useful,
19
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
20
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21
+ * GNU General Public License for more details.
22
+ *
23
+ * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
24
+ **/
25
+ import { Component, Container, EvDblClick } from './component';
26
+ import { Icon } from './icon';
27
+ import { Label } from './label';
28
+ import { HLayout, VLayout } from './layout';
29
+ import { EvClick, BasicEvent, EvDrag, EvSelectionChange, EvContextMenu } from './x4_events';
30
+ function EvExpand(node) {
31
+ return BasicEvent({ node });
32
+ }
33
+ /**
34
+ *
35
+ */
36
+ export class TreeView extends VLayout {
37
+ m_view;
38
+ m_container;
39
+ m_selection;
40
+ constructor(props) {
41
+ super(props);
42
+ props.root = props.root;
43
+ props.indent = props.indent ?? 8;
44
+ props.gadgets = props.gadgets;
45
+ props.sort = props.sort ?? false;
46
+ this.m_selection = null;
47
+ this.m_container = new Container({ cls: '@scroll-container' });
48
+ this.m_view = new Container({
49
+ cls: '@scroll-view',
50
+ flex: 1,
51
+ content: this.m_container
52
+ });
53
+ this.setContent([
54
+ this.m_view,
55
+ props.gadgets ? new HLayout({
56
+ cls: 'gadgets',
57
+ content: props.gadgets
58
+ }) : null,
59
+ ]);
60
+ this.setDomEvent('click', (e) => this._click(e));
61
+ this.setDomEvent('dblclick', (e) => this._click(e));
62
+ this.setDomEvent('contextmenu', (e) => this._handleCtxMenu(e));
63
+ if (props.canDragItems) {
64
+ this.setDomEvent('dragstart', (ev) => {
65
+ let hit = Component.getElement(ev.target, Component);
66
+ let node = hit?.getData("node");
67
+ if (node) {
68
+ ev.dataTransfer.effectAllowed = 'move';
69
+ ev.dataTransfer.items.add(JSON.stringify({
70
+ type: 'treeview',
71
+ id: node.id
72
+ }), 'string');
73
+ }
74
+ else {
75
+ ev.preventDefault();
76
+ ev.stopPropagation();
77
+ }
78
+ });
79
+ this.setDomEvent('dragover', ev => this._dragEnter(ev));
80
+ this.setDomEvent('dragenter', ev => this._dragEnter(ev));
81
+ this.setDomEvent('dragend', ev => this._dragLeave(ev));
82
+ this.setDomEvent('dragleave', ev => this._dragLeave(ev));
83
+ this.setDomEvent('drop', ev => this._dragLeave(ev));
84
+ this.setDomEvent('drop', ev => this._drop(ev));
85
+ }
86
+ this.mapPropEvents(props, 'dblclick', 'drag', 'selectionchange', 'contextMenu');
87
+ }
88
+ _dragEnter(ev) {
89
+ ev.preventDefault();
90
+ let hit = Component.getElement(ev.target, Component);
91
+ let node = hit?.getData("node");
92
+ if (node) {
93
+ hit.addClass('@drag-over');
94
+ ev.dataTransfer.dropEffect = 'move';
95
+ }
96
+ }
97
+ _dragLeave(ev) {
98
+ let hit = Component.getElement(ev.target, Component);
99
+ let node = hit?.getData("node");
100
+ if (node) {
101
+ hit.removeClass('@drag-over');
102
+ }
103
+ }
104
+ _drop(ev) {
105
+ let hit = Component.getElement(ev.target, Component);
106
+ let node = hit?.getData("node");
107
+ if (!node) {
108
+ node = this.m_props.root;
109
+ }
110
+ if (node) {
111
+ let parent;
112
+ // is a folder
113
+ if (node.children) {
114
+ parent = node;
115
+ }
116
+ // in it's parent node
117
+ else {
118
+ parent = hit.getData("parent");
119
+ }
120
+ for (let i = 0; i < ev.dataTransfer.items.length; i++) {
121
+ ev.dataTransfer.items[0].getAsString((value) => {
122
+ let data = JSON.parse(value);
123
+ this.emit('drag', EvDrag(node, data, parent));
124
+ });
125
+ }
126
+ }
127
+ }
128
+ render() {
129
+ this.__update();
130
+ }
131
+ __update() {
132
+ if (this.m_props.root) {
133
+ let items = [];
134
+ this._buildBranch(this.m_props.root, -1, items, this.m_props.root);
135
+ this.m_container.setContent(items);
136
+ }
137
+ }
138
+ updateElement(id) {
139
+ const { node: child, item } = this._getNode(id);
140
+ if (child) {
141
+ const pn = child.dom.parentNode;
142
+ const newchild = this._makeNode(item, child.dom.classList.value, child.getData('icon'), child.getData('level'));
143
+ const dm = newchild._build();
144
+ pn.replaceChild(dm, child.dom);
145
+ if (this.m_selection?.el === child) {
146
+ this.m_selection.el = newchild;
147
+ }
148
+ }
149
+ }
150
+ set root(root) {
151
+ this.m_props.root = root;
152
+ this.update();
153
+ }
154
+ /**
155
+ * same as root = xxx but keep elements open
156
+ */
157
+ refreshRoot(root) {
158
+ let openList = [];
159
+ this.forEach((node) => {
160
+ if (node.open) {
161
+ openList.push(node.id);
162
+ }
163
+ return false;
164
+ });
165
+ let oldSel = this.selection;
166
+ this.m_props.root = root;
167
+ this.forEach((node) => {
168
+ if (openList.indexOf(node.id) >= 0) {
169
+ node.open = true;
170
+ }
171
+ return false;
172
+ });
173
+ this.__update();
174
+ }
175
+ _buildBranch(node, level, items, parent) {
176
+ let cls = '@tree-item';
177
+ if (node.cls) {
178
+ cls += ' ' + node.cls;
179
+ }
180
+ if (!node.open && node.children) {
181
+ cls += ' collapsed';
182
+ }
183
+ if (node.children) {
184
+ cls += ' folder';
185
+ if (node.children.length == 0) {
186
+ cls += ' empty';
187
+ }
188
+ }
189
+ let icon = node.icon;
190
+ if (icon === undefined) {
191
+ if (node.children) {
192
+ icon = 'cls(far fa-chevron-down)';
193
+ }
194
+ else {
195
+ icon = 'cls(far fa-file-archive)';
196
+ }
197
+ }
198
+ if (level >= 0) {
199
+ const item = this._makeNode(node, cls, icon, level);
200
+ if (this.m_selection?.id == node.id) {
201
+ this.m_selection.el = item;
202
+ item.addClass('selected');
203
+ }
204
+ items.push(item);
205
+ }
206
+ if (level == -1 || node.open) {
207
+ if (node.children) {
208
+ if (this.m_props.sort) {
209
+ // sort items case insensitive:
210
+ // first folders
211
+ // then items
212
+ node.children = node.children.sort((a, b) => {
213
+ let at = (a.children ? '0' + a.text : a.text)?.toLocaleLowerCase();
214
+ let bt = (b.children ? '0' + b.text : b.text)?.toLocaleLowerCase();
215
+ return at < bt ? -1 : at > bt ? 1 : 0;
216
+ });
217
+ }
218
+ node.children.forEach((c) => {
219
+ this._buildBranch(c, level + 1, items, node);
220
+ });
221
+ }
222
+ }
223
+ }
224
+ _renderDef(node) {
225
+ return new Label({ cls: 'tree-label', flex: 1, text: node.text });
226
+ }
227
+ _makeNode(node, cls, icon, level) {
228
+ const item = new HLayout({
229
+ cls,
230
+ content: [
231
+ new Icon({ cls: 'tree-icon', icon }),
232
+ this.m_props.renderItem ? this.m_props.renderItem(node) : this._renderDef(node),
233
+ ],
234
+ data: {
235
+ 'node': node,
236
+ 'level': level,
237
+ 'icon': icon,
238
+ },
239
+ style: {
240
+ paddingLeft: 4 + level * this.m_props.indent
241
+ },
242
+ attrs: {
243
+ draggable: this.m_props.canDragItems ? true : undefined
244
+ },
245
+ });
246
+ return item;
247
+ }
248
+ /**
249
+ *
250
+ */
251
+ forEach(cb) {
252
+ let found = null;
253
+ function scan(node) {
254
+ if (cb(node) == true) {
255
+ return true;
256
+ }
257
+ if (node.children) {
258
+ for (let i = 0; i < node.children.length; i++) {
259
+ if (scan(node.children[i])) {
260
+ return true;
261
+ }
262
+ }
263
+ }
264
+ }
265
+ if (this.m_props.root) {
266
+ scan(this.m_props.root);
267
+ }
268
+ return found;
269
+ }
270
+ ensureVisible(id) {
271
+ const { node } = this._getNode(id);
272
+ if (node) {
273
+ node.scrollIntoView();
274
+ }
275
+ }
276
+ set selection(id) {
277
+ if (this.m_selection?.el) {
278
+ this.m_selection.el.removeClass('selected');
279
+ }
280
+ this.m_selection = null;
281
+ if (id !== undefined) {
282
+ const { node: sel } = this._getNode(id);
283
+ if (sel) {
284
+ this.m_selection = {
285
+ id: id,
286
+ el: sel
287
+ };
288
+ sel.addClass('selected');
289
+ sel.scrollIntoView();
290
+ }
291
+ }
292
+ }
293
+ _getNode(id) {
294
+ let found = { node: null, item: null };
295
+ this.m_container.enumChilds((c) => {
296
+ let node = c.getData('node');
297
+ if (node?.id == id) {
298
+ found = { node: c, item: node };
299
+ return true;
300
+ }
301
+ });
302
+ return found;
303
+ }
304
+ get selection() {
305
+ return this.m_selection?.id;
306
+ }
307
+ getNodeWithId(id) {
308
+ return this.forEach((node) => node.id == id);
309
+ }
310
+ /**
311
+ *
312
+ */
313
+ _click(ev) {
314
+ let dom = ev.target;
315
+ let idom = dom;
316
+ let onsub = false;
317
+ // avoid getting click on sub childs
318
+ if (dom.tabIndex !== -1) {
319
+ onsub = true;
320
+ }
321
+ while (dom != this.dom) {
322
+ let el = Component.getElement(dom);
323
+ let nd = el?.getData('node');
324
+ if (nd) {
325
+ if (nd.children && !onsub) {
326
+ // on text or on expando ?
327
+ if (el.hasClass('selected') || idom.classList.contains('tree-icon')) { //expando
328
+ nd.open = nd.open ? false : true;
329
+ }
330
+ this.m_selection = { id: nd.id, el: null };
331
+ let offset = this.m_view?.dom?.scrollTop;
332
+ this.update();
333
+ if (offset) {
334
+ this.m_view.dom.scrollTo(0, offset);
335
+ }
336
+ this.emit('expand', EvExpand(nd));
337
+ }
338
+ else {
339
+ this.selection = nd.id;
340
+ if (!onsub) {
341
+ if (ev.type == 'click') {
342
+ this.emit('click', EvClick(nd));
343
+ }
344
+ else {
345
+ this.emit('dblclick', EvDblClick(nd));
346
+ }
347
+ }
348
+ }
349
+ this.emit('selectionchange', EvSelectionChange(nd));
350
+ return;
351
+ }
352
+ dom = dom.parentElement;
353
+ }
354
+ if (ev.type == 'click') {
355
+ this.m_selection = null;
356
+ this.update();
357
+ this.emit('selectionchange', EvSelectionChange(null));
358
+ }
359
+ }
360
+ _handleCtxMenu(ev) {
361
+ ev.preventDefault();
362
+ let dom = ev.target;
363
+ let idom = dom;
364
+ while (dom != this.dom) {
365
+ let el = Component.getElement(dom);
366
+ let nd = el?.getData('node');
367
+ if (nd) {
368
+ if (nd.children) {
369
+ // on text or on expando ?
370
+ if (idom.classList.contains('tree-icon')) { //expando
371
+ return;
372
+ }
373
+ }
374
+ this.m_selection = { id: nd.id, el: null };
375
+ this.update();
376
+ this.emit('contextMenu', EvContextMenu(ev, nd));
377
+ return;
378
+ }
379
+ dom = dom.parentElement;
380
+ }
381
+ this.m_selection = null;
382
+ this.update();
383
+ this.emit('contextMenu', EvContextMenu(ev, null));
384
+ }
385
+ /**
386
+ * constructs a tree node from an array of strings
387
+ * elements are organized like folders (separator = /)
388
+ * @example
389
+ * let root = TreeView.buildFromString( [
390
+ * 'this/is/a/final/file'
391
+ * 'this/is/another/file'
392
+ * ] );
393
+ */
394
+ static buildFromStrings(paths, separator = '/') {
395
+ let root = {
396
+ id: 0,
397
+ text: '<root>',
398
+ children: []
399
+ };
400
+ function insert(elements, path) {
401
+ let pos = path.indexOf(separator);
402
+ let main = path.substr(0, pos < 0 ? undefined : pos);
403
+ let elem;
404
+ if (pos >= 0) {
405
+ elem = elements.find((el) => {
406
+ return el.text == main;
407
+ });
408
+ }
409
+ if (!elem) {
410
+ elem = {
411
+ id: path,
412
+ text: main,
413
+ };
414
+ elements.push(elem);
415
+ }
416
+ if (pos >= 0) {
417
+ if (!elem.children) {
418
+ elem.children = [];
419
+ }
420
+ insert(elem.children, path.substr(pos + separator.length));
421
+ }
422
+ }
423
+ paths.forEach((path) => {
424
+ insert(root.children, path);
425
+ });
426
+ return root;
427
+ }
428
+ /**
429
+ * constructs a tree node from an array of nodes like
430
+ * node {
431
+ * id: number,
432
+ * parent: number,
433
+ * name: string
434
+ * }
435
+ */
436
+ static buildFromHierarchy(nodes, cb) {
437
+ let root = {
438
+ id: 0,
439
+ text: '<root>',
440
+ children: []
441
+ };
442
+ let tree_nodes = [];
443
+ function insert(node) {
444
+ let elem;
445
+ let pelem;
446
+ if (node.parent > 0) {
447
+ pelem = tree_nodes.find((tnode) => tnode.id == node.parent);
448
+ if (!pelem) {
449
+ pelem = {
450
+ id: node.parent,
451
+ text: '',
452
+ children: []
453
+ };
454
+ tree_nodes.push(pelem);
455
+ }
456
+ if (!pelem.children) {
457
+ pelem.children = [];
458
+ }
459
+ }
460
+ else {
461
+ pelem = root;
462
+ }
463
+ elem = tree_nodes.find((tnode) => tnode.id == node.id);
464
+ if (!elem) {
465
+ elem = {
466
+ id: node.id,
467
+ text: node.name,
468
+ parent: node.parent,
469
+ };
470
+ if (!node.leaf) {
471
+ elem.children = [];
472
+ }
473
+ else {
474
+ elem.icon = null;
475
+ }
476
+ }
477
+ else {
478
+ elem.text = node.name;
479
+ elem.parent = node.parent;
480
+ }
481
+ tree_nodes.push(elem);
482
+ pelem.children.push(elem);
483
+ }
484
+ nodes.forEach(insert);
485
+ if (cb) {
486
+ tree_nodes.forEach(cb);
487
+ }
488
+ return root;
489
+ }
490
+ }