diff --git a/bricks/dataviewer.js b/bricks/dataviewer.js index f58c4fa..08cb9c5 100644 --- a/bricks/dataviewer.js +++ b/bricks/dataviewer.js @@ -229,7 +229,7 @@ bricks.DataViewer = class extends bricks.VBox { if (data){ f.value = data[f.name]; } - fields.push(f); + fs.push(f); } opts.options.fields = fs var title = "Add record"; @@ -256,7 +256,7 @@ bricks.DataViewer = class extends bricks.VBox { } } async add_record(){ - var widgets = await build_editform(null); + var widgets = await this.build_editform(null); widgets.form.bind('submited', this.add_record_finish.bind(this, widgets.win)); } async add_record_finish(f, event){ @@ -268,7 +268,7 @@ bricks.DataViewer = class extends bricks.VBox { } async update_record(){ var record = this.select_row.user_data; - var widgets = await build_editform(record); + var widgets = await this.build_editform(record); widgets.form.bind('submited', this.update_record_finish.bind(this, widgets.win)); } async update_record_finish(form, event){ diff --git a/bricks/svg.js b/bricks/svg.js index 8952d9b..d0ec2bb 100644 --- a/bricks/svg.js +++ b/bricks/svg.js @@ -93,9 +93,6 @@ bricks.StatedSvg = class extends bricks.Svg { if (! this.state){ this.state = this.states[0].state; } -<<<<<<< HEAD - var url = this.set_state(this.state); -======= this.set_state(this.state); } this.bind('click', this.trigger.bind(this)); @@ -113,7 +110,6 @@ bricks.StatedSvg = class extends bricks.Svg { this.set_state(this.states[k].state); return; } ->>>>>>> 174b4c0d1cad4e6157bb7819670bd5cff9f74a7b } } set_state(state){