Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion flatn/flatn-cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -9216,7 +9216,8 @@ function print (object, quote = '\"') {
if (object && Array.isArray(object)) { return '[' + object.map(print) + ']'; }
if (typeof object !== 'string') { return String(object); }
let result = String(object);
result = result.replace(/\n/g, '\\n\\\n');
result = result.replace(/\\/g, '\\\\');
result = result.replace(/\n/g, '\\n');
result = result.replace(/(")/g, '\\$1');
result = result.replace(/(')/g, '\\$1');
result = quote + result + quote;
Expand Down
6 changes: 3 additions & 3 deletions lively.halos/morph.js
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,8 @@ class NameHolder extends Morph {
this.validName = !owner || !owner.getSubmorphNamed(newName) || oldName === newName;
if (this.target.isComponent && !evt.hasArrowPressed) {
// also confirm we are not in conflict with other stuff in the module scope
System.import('lively.ide/components/reconciliation.js').then(({ canBeRenamed }) => {
this.validName = this.validName && canBeRenamed(moduleManager.module(this.target[Symbol.for('lively-module-meta')].moduleId), oldName, newName);
System.import('lively.ide/components/component-definition.js').then(({ canBeRenamed }) => {
this.validName = this.validName && canBeRenamed(moduleManager.module(this.target[Symbol.for('lively-module-meta')].moduleId), newName);
signal(this, 'valid', [this.validName, newName]);
});
return;
Expand Down Expand Up @@ -1193,7 +1193,7 @@ class ComponentHaloItem extends RoundHaloItem {
const {
insertComponentDefinition,
removeComponentDefinition
} = await System.import('lively.ide/components/reconciliation.js');
} = await System.import('lively.ide/components/component-definition.js');
const { InteractiveComponentDescriptor } = await System.import('lively.ide/components/editor.js');
const Browser = await System.import('lively.ide/js/browser/ui.cp.js');
if (toBeComponent) {
Expand Down
Loading
Loading