diff --git a/src2/kiri/utils.js b/src2/kiri/utils.js index 78957a18..eb29046a 100644 --- a/src2/kiri/utils.js +++ b/src2/kiri/utils.js @@ -99,7 +99,7 @@ function trackFn(fn, name) { function noop() {} -export let utils = { +export { trackFn, areEqual, parseOpt, @@ -114,4 +114,17 @@ export let utils = { a2c }; -export { parseOpt, encodeOpt, ajax, o2js, js2o, ls2o, rgb, a2c, avgc, areEqual, trackFn, noop }; +export let utils = { + trackFn, + areEqual, + parseOpt, + encodeOpt, + noop, + ajax, + o2js, + js2o, + ls2o, + avgc, + rgb, + a2c +}; diff --git a/src2/kiri/widget.js b/src2/kiri/widget.js index 619c879c..21b0cf71 100644 --- a/src2/kiri/widget.js +++ b/src2/kiri/widget.js @@ -1,6 +1,7 @@ /** Copyright Stewart Allen -- All Rights Reserved */ import { base } from '../geo/base.js'; +import { avgc } from './utils.js'; import { verticesToPoints } from '../geo/points.js'; import { util as mesh_util } from '../mesh/util.js'; diff --git a/src2/kiri/widgets.js b/src2/kiri/widgets.js index f01d48cc..dce88a44 100644 --- a/src2/kiri/widgets.js +++ b/src2/kiri/widgets.js @@ -1,5 +1,6 @@ /** Copyright Stewart Allen -- All Rights Reserved */ +import { $ } from '../moto/webui.js'; import { api } from './api.js'; import { load } from '../load/file.js'; import { Widget, newWidget } from './widget.js'; @@ -30,7 +31,7 @@ function rename(sel) { return; } let widget = widgets[0]; - kiri.ui.prompt("new widget name", widget.meta.file || "no name").then(newname => { + api.uc.prompt("new widget name", widget.meta.file || "no name").then(newname => { if (newname) { widget.meta.file = newname; api.platform.changed();