From a31194778df636eb05e9df9301a3df2c0f48fde3 Mon Sep 17 00:00:00 2001 From: Zubair Quraishi Date: Fri, 16 Feb 2024 06:24:06 +0000 Subject: [PATCH] Partially working upgrade from Vue 2 to Vue 3 --- public/go.html | 500 ++++++------ public/test.html | 283 ++----- public/visifile/consultancy.html | 4 +- public/visifile/download.html | 4 +- public/visifile/mac_app.html | 4 +- .../all_system_components/appEditorV3.js | 268 ++++--- .../appSqliteEditorComponent.js | 42 +- .../codePlugInTextEditor.js | 8 +- .../all_system_components/controlEditor.js | 6 +- .../deliverComponentScreen.js | 26 +- .../embedAppComponent.js | 4 +- .../environmentsEditor.js | 14 +- .../exportEditorComponent.js | 14 +- .../iconEditorComponent.js | 10 +- .../keycloakEditorComponent.js | 12 +- .../sqliteEditorComponent.js | 12 +- public/visifile_drivers/apps/homepage.js | 723 +++++++++--------- .../visifile_drivers/apps/mobilehomepage.js | 16 +- .../visifile_drivers/controls/ace_editor.js | 6 +- public/visifile_drivers/controls/button.js | 2 +- public/visifile_drivers/controls/chart.js | 2 +- public/visifile_drivers/controls/checkbox.js | 2 +- .../controls/component_builder.js | 2 +- .../visifile_drivers/controls/container_3d.js | 10 +- .../visifile_drivers/controls/data_window.js | 2 +- public/visifile_drivers/controls/database.js | 10 +- public/visifile_drivers/controls/draw.js | 4 +- .../visifile_drivers/controls/drive_list.js | 2 +- public/visifile_drivers/controls/dropdown.js | 2 +- .../visifile_drivers/controls/evm_contract.js | 2 +- public/visifile_drivers/controls/file_list.js | 2 +- .../visifile_drivers/controls/folder_list.js | 2 +- .../visifile_drivers/controls/horiz_scroll.js | 2 +- public/visifile_drivers/controls/image.js | 6 +- public/visifile_drivers/controls/input.js | 6 +- public/visifile_drivers/controls/item_3d.js | 2 +- public/visifile_drivers/controls/list.js | 2 +- public/visifile_drivers/controls/mixer.js | 2 +- public/visifile_drivers/controls/table.js | 2 +- public/visifile_drivers/controls/timer.js | 4 +- .../visifile_drivers/controls/vert_scroll.js | 2 +- src/runtimePipelineYazzUiMethods.js | 152 ++-- src/runtimePipelineYazzUiTemplate.js | 215 +++--- 43 files changed, 1140 insertions(+), 1255 deletions(-) diff --git a/public/go.html b/public/go.html index 7856ba481..3ab9ed73a 100644 --- a/public/go.html +++ b/public/go.html @@ -11,7 +11,11 @@ - + + + + + @@ -7860,6 +7864,7 @@ - - - - - - - - - - - - - - - Standard HTML and JS -
- - - Inside VueJS 2 -
- - - +
+ Standard HTML and JS below +
+ HI THERE! +
+ +
+ Inside VueJS 2 below +
+
- + diff --git a/public/visifile/consultancy.html b/public/visifile/consultancy.html index 671cee74c..3684fa70a 100644 --- a/public/visifile/consultancy.html +++ b/public/visifile/consultancy.html @@ -113,8 +113,8 @@
- + class='img-fluid' /> +
diff --git a/public/visifile/download.html b/public/visifile/download.html index 6714d0d45..b89e22a64 100644 --- a/public/visifile/download.html +++ b/public/visifile/download.html @@ -117,8 +117,8 @@
- + class='img-fluid' /> +
diff --git a/public/visifile/mac_app.html b/public/visifile/mac_app.html index e77e52302..52450a5f6 100644 --- a/public/visifile/mac_app.html +++ b/public/visifile/mac_app.html @@ -111,8 +111,8 @@
- + class='img-fluid' /> +
diff --git a/public/visifile_drivers/all_system_components/appEditorV3.js b/public/visifile_drivers/all_system_components/appEditorV3.js index ce99d44d0..ca06e16a4 100644 --- a/public/visifile_drivers/all_system_components/appEditorV3.js +++ b/public/visifile_drivers/all_system_components/appEditorV3.js @@ -164,8 +164,8 @@ ___________ - + class='img-fluid' /> +
{{component_display_name?"" + component_display_name.substring(0,30):""}}{{(component_display_name && ((component_display_name.length > 50))?"...":"")}} @@ -176,7 +176,7 @@ ___________ v-bind:style='"display: inline-block;" + (editor_shell_locked?"pointer-events: none;opacity: 0.4;":"")' v-if='edit_name' v-on:focusout='(async function(){await rename(component_display_name)})()' - v-model='component_display_name'> + v-model='component_display_name' /> @@ -207,7 +207,7 @@ ___________ + v-on:click='chooseProfiler()' >Profiler
@@ -239,15 +239,15 @@ ___________
-
-
@@ -288,11 +288,17 @@ $refs.editor_component_ref.runtimeComponentsInfo:
-Form runtime info -
-[ "{{form.name}}" ] -
+ + Form runtime info + +
+ +
+ + [ "{{form.name}}" ] +
+
@@ -316,7 +322,7 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms
- @@ -339,8 +345,8 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms - + class='img-fluid' /> + Icon @@ -353,7 +359,7 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms ---------------------------------------------- --> - + class='img-fluid' /> + DB @@ -407,8 +413,8 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms - + class='img-fluid' /> + Undo @@ -432,8 +438,8 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms - + class='img-fluid' /> + Redo @@ -462,8 +468,8 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms - + class='img-fluid' /> + Revisions @@ -491,7 +497,6 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" width="35px" - viewBox="0 0 210.107 210.107" height="35px" y="0px" viewBox="0 0 492 492" @@ -516,13 +521,14 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms v-on:mouseleave='setInfo(null)' v-on:click='setTimeout(function(){copyApp(base_component_id, null,code_id)},100)' type="button" class="btn btn-primary" - v-if='(mode != "profiler") && (!editor_overloaded) && ((preview_type == "app") || ((preview_type == "control")) && (yz.editor.lastEditingAppCodeId == null))'> + v-if='(mode != "profiler") && (!editor_overloaded) && ((preview_type == "app") || ((preview_type == "control")) && (yz().editor.lastEditingAppCodeId == null))'> - Remix + class='img-fluid' /> + + Remix @@ -534,14 +540,15 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms v-on:mouseleave='setInfo(null)' v-on:click='setTimeout(async function(){appClearIntervals();await save(base_component_id, code_id,null)},100)' type="button" class="btn btn-warning" - v-if="(((!hideImportButtons) || yz.mainVars.disableAutoSave) && (!read_only) && ((save_state == 'pending') || (!save_state)))" + v-if="(((!hideImportButtons) || yz().mainVars.disableAutoSave) && (!read_only) && ((save_state == 'pending') || (!save_state)))" > - {{saveCodeToFile?"Save":"Save"}} + class='img-fluid' /> + + {{saveCodeToFile?"Save":"Save"}} @@ -557,7 +564,7 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms Unsaved... @@ -588,11 +595,11 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms
- {{location.protocol + "//" + getNetworkHostName() + ":" + location.port + "/app/" + base_component_id + ".html"}} + {{window().location.protocol + "//" + window().getNetworkHostName() + ":" + window().location.port + "/app/" + base_component_id + ".html"}} @@ -643,8 +650,8 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms src='/driver_icons/reload.png' style='height:25px; margin-right: 0px;' class='img-fluid' - > - + /> + @@ -655,9 +662,8 @@ v-if="$refs.editor_component_ref.model && $refs.editor_component_ref.model.forms readonly v-if='preview_type=="app"' style='text-decoration: underline;flex:1;font-family:verdana,helvetica;font-size: 13px;margin-left:10px;' - v-on:click='let win = window.open(location.protocol + "//" + getNetworkHostName() + ":" + location.port + "/app/" + base_component_id + ".html", "_blank"); win.focus();' - v-bind:value='location.protocol + "//" + getNetworkHostName() + ":" + location.port + "/app/" + base_component_id + ".html"'> - + v-on:click='let win = window().open(window().location.protocol + "//" + window().getNetworkHostName() + ":" + window().location.port + "/app/" + base_component_id + ".html", "_blank"); win.focus();' + v-bind:value='window().location.protocol + "//" + window().getNetworkHostName() + ":" + window().location.port + "/app/" + base_component_id + ".html"' /> - + /> + - + class='img-fluid' /> +
@@ -747,7 +753,7 @@ End of app preview menu ref="control_preview_component" v-if='app_loaded && (preview_type=="control")' style='background-color: white;height:92%;' - v-bind:is='GLOBALS.baseComponentIdReturnsCommitId["control_preview_container_app"]' + v-bind:is='GLOBALS().baseComponentIdReturnsCommitId["control_preview_container_app"]' v-bind:args="{control_type: base_component_id , control_code_id: code_id}" > @@ -832,8 +838,7 @@ End of app preview menu - + v-model="execution_horiz_scale" /> @@ -921,7 +926,7 @@ End of app preview menu
-
@@ -1142,11 +1147,11 @@ End of app preview menu // // Sets the info message bar at the bottom of the editor pane // --------------------------------------------------------------- - this.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "set_info_text", text: text }) - }, + }, closeEditor: async function ( event,item ) { // --------------------------------------------------------------- // closeEditor @@ -1155,35 +1160,35 @@ End of app preview menu // with all the apps) // --------------------------------------------------------------- let mm = this - if (yz.editor.subEditorAction == "FORK_CONTROL") { - yz.editor.finalBaseComponentIdOfEditedUiControl = mm.base_component_id - yz.editor.finalCodeIdOfEditedUiControl = mm.code_id - this.$root.$emit("message", { + if (window.yz.editor.subEditorAction == "FORK_CONTROL") { + window.yz.editor.finalBaseComponentIdOfEditedUiControl = mm.base_component_id + window.yz.editor.finalCodeIdOfEditedUiControl = mm.code_id + window.globalEventBus.emit("message", { type: "return_from_fork_component", - base_component_id: yz.editor.lastEditingAppBaseComponentId, - code_id: yz.editor.lastEditingAppCodeId + base_component_id: window.yz.editor.lastEditingAppBaseComponentId, + code_id: window.yz.editor.lastEditingAppCodeId }) - } else if (yz.editor.subEditorAction == "EDIT_CONTROL") { - yz.editor.finalBaseComponentIdOfEditedUiControl = mm.base_component_id - yz.editor.finalCodeIdOfEditedUiControl = mm.code_id - this.$root.$emit("message", { type: "return_from_edit_component", - base_component_id: yz.editor.lastEditingAppBaseComponentId, - code_id: yz.editor.lastEditingAppCodeId + } else if (window.yz.editor.subEditorAction == "EDIT_CONTROL") { + window.yz.editor.finalBaseComponentIdOfEditedUiControl = mm.base_component_id + window.yz.editor.finalCodeIdOfEditedUiControl = mm.code_id + window.globalEventBus.emit("message", { type: "return_from_edit_component", + base_component_id: window.yz.editor.lastEditingAppBaseComponentId, + code_id: window.yz.editor.lastEditingAppCodeId }) - } else if (yz.editor.lastEditingAppBaseComponentId) { + } else if (window.yz.editor.lastEditingAppBaseComponentId) { debugger // where does "model" come from? - this.$root.$emit("message", { type: "edit_component", base_component_id: yz.editor.lastEditingAppBaseComponentId, form_id: active_form, control_name: model.forms[active_form].components[active_component_index].name}) + window.globalEventBus.emit("message", { type: "edit_component", base_component_id: window.yz.editor.lastEditingAppBaseComponentId, form_id: active_form, control_name: model.forms[active_form].components[active_component_index].name}) } else { - this.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "close_app" }) } - yz.editor.lastEditingAppBaseComponentId = null; - yz.editor.lastEditingAppCodeId = null; - yz.editor.inEditor = false + window.yz.editor.lastEditingAppBaseComponentId = null; + window.yz.editor.lastEditingAppCodeId = null; + window.yz.editor.inEditor = false }, chooseApp: async function ( ) { // --------------------------------------------------------------- @@ -1286,6 +1291,10 @@ End of app preview menu // can see the app debug view // --------------------------------------------------------------- let mm = this + if (mm.mode == "profiler") { + return + } + this.code_width = "0%" this.code_shown = false @@ -1325,15 +1334,15 @@ End of app preview menu this.editor_text = await this.$refs.editor_component_ref.getText() - this.editor_text = yz.helpers.deleteCodeString(this.editor_text, "display_name") - this.editor_text = yz.helpers.insertCodeString(this.editor_text, "display_name",nn) + this.editor_text = window.yz.helpers.deleteCodeString(this.editor_text, "display_name") + this.editor_text = window.yz.helpers.insertCodeString(this.editor_text, "display_name",nn) await mm.save( this.base_component_id, this.code_id, this.editor_text ) await mm.loadComponentIntoEditor({newApp: true, codeId: this.code_id } ) - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "update_editable_components_on_homepage", base_component_id: mm.base_component_id, display_name: mm.component_display_name @@ -1355,10 +1364,10 @@ End of app preview menu this.editor_text = await this.$refs.editor_component_ref.getText() - let eds = yz.helpers.getValueOfCodeString(this.editor_text, "editors") + let eds = window.yz.helpers.getValueOfCodeString(this.editor_text, "editors") if (eds) { - this.editor_text = yz.helpers.deleteCodeString(this.editor_text, "editors") - this.editor_text = yz.helpers.insertCodeString(this.editor_text, "editors_old",eds) + this.editor_text = window.yz.helpers.deleteCodeString(this.editor_text, "editors") + this.editor_text = window.yz.helpers.insertCodeString(this.editor_text, "editors_old",eds) } await mm.save( this.base_component_id, this.code_id, this.editor_text ) @@ -1424,8 +1433,8 @@ End of app preview menu } let result = await getFromYazzReturnJson("/http_get_copy_component",copyArgs) - if (isValidObject(result)) { - mm.$root.$emit('message', { + if (window.isValidObject(result)) { + window.globalEventBus.emit('message', { type: "insert_editable_component_on_homepage", base_component_id: result.base_component_id, display_name: result.new_display_name, @@ -1539,7 +1548,7 @@ End of app preview menu let editors2 = results[0].editors mm.base_component_id = results[0].base_component_id - if (isValidObject(editors2) && (mm.override_app_editor == null)) { + if (window.isValidObject(editors2) && (mm.override_app_editor == null)) { let edd = eval("(" + editors2 + ")") newEditor = edd[0] } @@ -1548,16 +1557,16 @@ End of app preview menu code = results[0].code codeId = results[0].id mm.code_id = codeId - GLOBALS.cacheThisComponentCode({codeId: codeId, code: code}) - yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "DYNAMIC"}) - GLOBALS.pointBaseComponentIdAtCode( + mm.GLOBALS().cacheThisComponentCode({codeId: codeId, code: code}) + window.yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "DYNAMIC"}) + mm.GLOBALS().pointBaseComponentIdAtCode( { baseComponentId: mm.base_component_id, codeId: codeId }) - this.component_display_name = yz.helpers.getValueOfCodeString(code.toString(),"display_name") - await GLOBALS.makeSureUiComponentLoadedV6( {codeId: mm.code_id }, {} ) + this.component_display_name = window.yz.helpers.getValueOfCodeString(code.toString(),"display_name") + await mm.GLOBALS().makeSureUiComponentLoadedV6( {codeId: mm.code_id }, {} ) } } @@ -1570,16 +1579,16 @@ End of app preview menu // load app from source code // } else if (code) { - let bci = yz.helpers.getValueOfCodeString(code.toString(),"base_component_id") + let bci = window.yz.helpers.getValueOfCodeString(code.toString(),"base_component_id") - GLOBALS.cacheThisComponentCode({codeId: codeId, code: code}) - yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "SOURCE"}) - GLOBALS.pointBaseComponentIdAtCode( + mm.GLOBALS().cacheThisComponentCode({codeId: codeId, code: code}) + window.yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "SOURCE"}) + mm.GLOBALS().pointBaseComponentIdAtCode( { baseComponentId: bci, codeId: codeId }) - await GLOBALS.makeSureUiComponentLoadedV6( {codeId: mm.code_id }, {} ) + await mm.GLOBALS().makeSureUiComponentLoadedV6( {codeId: mm.code_id }, {} ) @@ -1617,7 +1626,7 @@ End of app preview menu // ****** find the editor ******* let editors2 = results[0].editors - if (isValidObject(editors2) && (mm.override_app_editor == null)) { + if (window.isValidObject(editors2) && (mm.override_app_editor == null)) { let edd = eval("(" + editors2 + ")") newEditor = edd[0] } @@ -1626,10 +1635,10 @@ End of app preview menu code = results[0].code codeId = results[0].id mm.code_id = codeId - this.component_display_name = yz.helpers.getValueOfCodeString(code.toString(),"display_name") - GLOBALS.cacheThisComponentCode({codeId: codeId, code: code}) - yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "DYNAMIC"}) - GLOBALS.pointBaseComponentIdAtCode( + this.component_display_name = window.yz.helpers.getValueOfCodeString(code.toString(),"display_name") + mm.GLOBALS().cacheThisComponentCode({codeId: codeId, code: code}) + window.yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "DYNAMIC"}) + mm.GLOBALS().pointBaseComponentIdAtCode( { baseComponentId: baseComponentId, codeId: codeId @@ -1664,7 +1673,7 @@ End of app preview menu editorName = newEditor } - await GLOBALS.makeSureUiComponentLoadedV6( editorName ) + await mm.GLOBALS().makeSureUiComponentLoadedV6( editorName ) mm.refresh++ mm.editor_loaded = true @@ -1678,7 +1687,7 @@ End of app preview menu // // should we run this app? // - if ((isValidObject(runThisApp)) && (!runThisApp)) { + if ((window.isValidObject(runThisApp)) && (!runThisApp)) { //do nothing if we set "runthisapp" to false } else { this.resetDebugger() @@ -1704,7 +1713,7 @@ End of app preview menu // container around them, since they can not live independantly without // an app // - if (code && (yz.helpers.getValueOfCodeString(code,"component_type") == "VB")) { + if (code && (window.yz.helpers.getValueOfCodeString(code,"component_type") == "VB")) { mm.preview_type = "control" } else { mm.preview_type = "app" @@ -1713,9 +1722,9 @@ End of app preview menu // // set other vars based on the code // - mm.component_display_name = yz.helpers.getValueOfCodeString(code,"display_name") + mm.component_display_name = window.yz.helpers.getValueOfCodeString(code,"display_name") // ****** set readonly ******* - this.read_only = yz.helpers.getValueOfCodeString(code, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(code, "read_only") // @@ -1770,10 +1779,10 @@ End of app preview menu } if (!allowAppToWorkOffline) { - this.editor_text = GLOBALS.enhanceCodeBeforeSaving(this.editor_text, {parentHash: code_id, baseComponentId: base_component_id}) + this.editor_text = mm.GLOBALS().enhanceCodeBeforeSaving(this.editor_text, {parentHash: code_id, baseComponentId: base_component_id}) } - let baseCompIdFromSrcCode = yz.helpers.getValueOfCodeString(this.editor_text,"base_component_id") - await yz.savingCode.saveCodeViaWebWorker( + let baseCompIdFromSrcCode = window.yz.helpers.getValueOfCodeString(this.editor_text,"base_component_id") + await window.yz.savingCode.saveCodeViaWebWorker( this.editor_text , { @@ -1790,9 +1799,9 @@ End of app preview menu } mm.code_id = await getYazzContentHash(mm.editor_text) - GLOBALS.cacheThisComponentCode({codeId: mm.code_id, code: mm.editor_text}) - yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "SOURCE"}) - GLOBALS.pointBaseComponentIdAtCode( + mm.GLOBALS().cacheThisComponentCode({codeId: mm.code_id, code: mm.editor_text}) + window.yz.componentsAPI.vue.setComponentLoadedMethod({codeId: codeId, loadMethod: "SOURCE"}) + mm.GLOBALS().pointBaseComponentIdAtCode( { baseComponentId: baseCompIdFromSrcCode, codeId: mm.code_id @@ -1815,7 +1824,7 @@ End of app preview menu mm.inSave = false mm.editor_shell_locked = false - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "update_editable_components_on_homepage", base_component_id: baseCompIdFromSrcCode, code_id: mm.code_id @@ -1849,12 +1858,12 @@ End of app preview menu //-----------------------------------------------------------/ let mm = this - let parentHash = yz.helpers.getValueOfCodeString(this.editor_text, "parent_hash") + let parentHash = window.yz.helpers.getValueOfCodeString(this.editor_text, "parent_hash") if (parentHash) { mm.undo_list.push(mm.code_id) mm.code_id = parentHash await mm.closeSubEditor() - mm.$root.$emit( + window.globalEventBus.emit( 'message' , { @@ -1881,7 +1890,7 @@ End of app preview menu let codeId = mm.undo_list.pop( ) await mm.closeSubEditor() if (codeId) { - mm.$root.$emit( + window.globalEventBus.emit( 'message' , { @@ -1916,13 +1925,22 @@ End of app preview menu return returnVal }, + yz: function ( ) { + return window.yz + }, + GLOBALS: function ( ) { + return window.GLOBALS + }, + window: function ( ) { + return window + }, getVarAsBarChart: function ( value ) { // --------------------------------------------------------------- // getVarAsBarChart // // This views program variables in the debugger // --------------------------------------------------------------- - if (!isValidObject(value)) { + if (!window.isValidObject(value)) { return "
" } let html = "
" @@ -2045,7 +2063,7 @@ End of app preview menu (this.current_execution_step_y_line + this.execution_code[x.code_block_name].start) ) - elementTimeline.scrollTop - if (isValidObject(args) && args.allowScroll) { + if (window.isValidObject(args) && args.allowScroll) { if (this.timeline_x_cursor > elementTimeline.offsetWidth) { elementTimeline.scrollLeft += elementTimeline.offsetWidth this.timeline_x_cursor = (this.execution_horiz_scale * this.current_execution_step) - elementTimeline.scrollLeft @@ -2205,6 +2223,7 @@ End of app preview menu await useDiffJs() await useTabulatorJs() + uiDebuggerOn = true if ($HIDEIMPORTBUTTONS == 'false') { mm.hideImportButtons = false @@ -2218,19 +2237,20 @@ End of app preview menu - // // make sure we load the component that is being edited by this app // // ******* if we have the code ID ********* + console.log("loadComponentIntoEditor " + window.yz.editor.editingAppCodeId) + console.log("loadComponentIntoEditor " + mm.arg_edit_base_component_id) if (mm.arg_edit_code_id) { - yz.editor.editingAppBaseComponentId = mm.arg_edit_base_component_id - yz.editor.editingAppCodeId = mm.arg_edit_code_id - yz.editor.inEditor = true - await mm.loadComponentIntoEditor({codeId: yz.editor.editingAppCodeId}) + window.yz.editor.editingAppBaseComponentId = mm.arg_edit_base_component_id + window.yz.editor.editingAppCodeId = mm.arg_edit_code_id + window.yz.editor.inEditor = true + await mm.loadComponentIntoEditor({codeId: window.yz.editor.editingAppCodeId}) // ******* if we only have the BCI ********* } else if (mm.arg_edit_base_component_id) { - yz.editor.editingAppBaseComponentId = mm.arg_edit_base_component_id + window.yz.editor.editingAppBaseComponentId = mm.arg_edit_base_component_id await mm.loadComponentIntoEditor({baseComponentId: this.arg_edit_base_component_id}) } @@ -2241,7 +2261,7 @@ End of app preview menu // // some helper callbacks so outsiders can changed the state of the editor // - this.$root.$on('message', async function(message) { + window.globalEventBus.on('message', async function(message) { if (message.type == "set_info_text") { mm.info_text = message.text } else if (message.type == "saving") { @@ -2268,7 +2288,7 @@ End of app preview menu runThisApp: true }) - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "update_editable_components_on_homepage", base_component_id: mm.arg_edit_base_component_id, code_id: message.commitId @@ -2304,7 +2324,7 @@ End of app preview menu // ******** if a change has been made ************** if ((!mm.read_only) && (mm.save_state == 'pending' || (!mm.save_state))) { // ******** if AUTOSAVE is on then save the code ************ - if (!yz.mainVars.disableAutoSave) { + if (!window.yz.mainVars.disableAutoSave) { console.log(" saved: " + mm.code_id) appClearIntervals(); await mm.save(mm.base_component_id, mm.code_id, null) @@ -2327,7 +2347,7 @@ End of app preview menu // mm.refresh ++ }, - beforeDestroy() { + beforeUnmount() { this.deleteAutosaveTimer = true } diff --git a/public/visifile_drivers/all_system_components/appSqliteEditorComponent.js b/public/visifile_drivers/all_system_components/appSqliteEditorComponent.js index da096f40d..4a19e6e96 100644 --- a/public/visifile_drivers/all_system_components/appSqliteEditorComponent.js +++ b/public/visifile_drivers/all_system_components/appSqliteEditorComponent.js @@ -178,8 +178,8 @@ use_db("todo") - + class='img-fluid' /> + @@ -468,8 +468,8 @@ use_db("todo") - + class='img-fluid' /> + Old DB Editor
@@ -509,7 +509,7 @@ use_db("todo")
`, mounted: async function() { let mm = this - yz.mainVars.disableAutoSave = false + window.yz.mainVars.disableAutoSave = false mm.pane_home_selectedTable = null }, methods: { @@ -624,7 +624,7 @@ use_db("todo") - let oldParsedDatabaseEntry = yz.helpers.getValueOfCodeString(mm.text, "sqlite", ")//sqlite") + let oldParsedDatabaseEntry = window.yz.helpers.getValueOfCodeString(mm.text, "sqlite", ")//sqlite") if (!isValidObject(oldParsedDatabaseEntry) || (oldParsedDatabaseEntry.migrations == null)) { oldParsedDatabaseEntry = { @@ -638,7 +638,7 @@ use_db("todo") - let parsedDatabaseEntry = yz.helpers.getValueOfCodeString(mm.text, "database", ")//database") + let parsedDatabaseEntry = window.yz.helpers.getValueOfCodeString(mm.text, "database", ")//database") if (!isValidObject(parsedDatabaseEntry)) { parsedDatabaseEntry = { @@ -688,7 +688,7 @@ use_db("todo") } if (isValidObject(mm.text)) { - mm.read_only = yz.helpers.getValueOfCodeString(mm.text, "read_only") + mm.read_only = window.yz.helpers.getValueOfCodeString(mm.text, "read_only") } if (parsedDatabaseEntry && parsedDatabaseEntry.next_table_id) { @@ -704,7 +704,7 @@ use_db("todo") }, schemaChanged: async function ( ) { let mm = this - mm.$root.$emit( + window.globalEventBus.emit( 'message', { type: "pending" }) @@ -721,9 +721,9 @@ use_db("todo") // in the source code //------------------------------------------------------------------------/ let mm = this - let srcDatabaseEntry = yz.helpers.getValueOfCodeString(mm.text, "database", ")//database") + let srcDatabaseEntry = window.yz.helpers.getValueOfCodeString(mm.text, "database", ")//database") if (isValidObject(srcDatabaseEntry)) { - mm.text = yz.helpers.deleteCodeString(mm.text, "database", ")//database") + mm.text = window.yz.helpers.deleteCodeString(mm.text, "database", ")//database") } let newDatabaseEntry = @@ -740,7 +740,7 @@ use_db("todo") } mm.sqlText = JSON.stringify( newDatabaseEntry , null , 2 ) - mm.text = yz.helpers.insertCodeString(mm.text, "database", newDatabaseEntry , ")//database") + mm.text = window.yz.helpers.insertCodeString(mm.text, "database", newDatabaseEntry , ")//database") @@ -749,20 +749,20 @@ use_db("todo") // // old DB defn // - let srcOldDatabaseEntry = yz.helpers.getValueOfCodeString(mm.text, "sqlite", ")//sqlite") + let srcOldDatabaseEntry = window.yz.helpers.getValueOfCodeString(mm.text, "sqlite", ")//sqlite") if ((srcOldDatabaseEntry == null) || (srcOldDatabaseEntry.migrations == null)) { srcOldDatabaseEntry = { migrations: [] } } if (isValidObject(srcOldDatabaseEntry)) { - mm.text = yz.helpers.deleteCodeString(mm.text, "sqlite", ")//sqlite") + mm.text = window.yz.helpers.deleteCodeString(mm.text, "sqlite", ")//sqlite") } srcOldDatabaseEntry.migrations = mm.oldDatabaseDefn let oldSqlText = JSON.stringify( srcOldDatabaseEntry , null , 2 ) - mm.text = yz.helpers.insertCodeString(mm.text, "sqlite", srcOldDatabaseEntry , ")//sqlite") + mm.text = window.yz.helpers.insertCodeString(mm.text, "sqlite", srcOldDatabaseEntry , ")//sqlite") }, getText: async function ( ) { //----------------------------------------------------------------------------------/ @@ -980,7 +980,7 @@ use_db("todo") pane_home_addRow: async function ( ) { let mm = this let codeId = await mm.getCurrentCommitId() - let baseComponentId = yz.helpers.getValueOfCodeString(mm.text,"base_component_id") + let baseComponentId = window.yz.helpers.getValueOfCodeString(mm.text,"base_component_id") await sqlRx(codeId, baseComponentId, "insert into " + mm.pane_home_selectedTable + " DEFAULT VALUES") mm.pane_home_data_rows = await sqlRx(codeId, baseComponentId, "select * from " + mm.pane_home_selectedTable) @@ -994,7 +994,7 @@ use_db("todo") if (selectedData && (selectedData.length > 0)) { let rowId = selectedData[0].id let codeId = await mm.getCurrentCommitId() - let baseComponentId = yz.helpers.getValueOfCodeString(mm.text,"base_component_id") + let baseComponentId = window.yz.helpers.getValueOfCodeString(mm.text,"base_component_id") await sqlRx(codeId, baseComponentId, "delete from " + mm.pane_home_selectedTable + " where id = " + rowId) mm.pane_home_data_rows = await sqlRx(codeId, baseComponentId, "select * from " + mm.pane_home_selectedTable) @@ -1192,7 +1192,7 @@ use_db("todo") // You can now use the old and new values console.log('Cell edited. Old value:', oldValue, 'New value:', newValue); let codeId = await mm.getCurrentCommitId() - let baseComponentId = yz.helpers.getValueOfCodeString(mm.text, "base_component_id") + let baseComponentId = window.yz.helpers.getValueOfCodeString(mm.text, "base_component_id") let updateSql = "update " + mm.pane_home_selectedTable + " set " + fieldName + " = ? " + " where id = ?" @@ -1229,7 +1229,7 @@ use_db("todo") let mm = this setTimeout(async function ( ) { let codeId = await mm.getCurrentCommitId() - let baseComponentId = yz.helpers.getValueOfCodeString(mm.text, "base_component_id") + let baseComponentId = window.yz.helpers.getValueOfCodeString(mm.text, "base_component_id") mm.pane_home_data_rows = await sqlRx(codeId, baseComponentId, "select * from " + mm.pane_home_selectedTable) //mm.pane_home_data_rows = sql("select id,name from items") @@ -1423,7 +1423,7 @@ use_db("todo") let mm = this mm.pane_sql_message = null let codeId = await mm.getCurrentCommitId() - let baseComponentId = yz.helpers.getValueOfCodeString(mm.text,"base_component_id") + let baseComponentId = window.yz.helpers.getValueOfCodeString(mm.text,"base_component_id") let results = await sqlRx( codeId , baseComponentId , mm.pane_sql_query ) if (mm.pane_sql_tabulator != null) { mm.pane_sql_tabulator = null @@ -1502,7 +1502,7 @@ use_db("todo") }) } let codeId = await mm.getCurrentCommitId() - let baseComponentId = yz.helpers.getValueOfCodeString(mm.text, "base_component_id") + let baseComponentId = window.yz.helpers.getValueOfCodeString(mm.text, "base_component_id") mm.pane_sql_tabulator.setData(mm.pane_sql_queryResults) },200) diff --git a/public/visifile_drivers/all_system_components/codePlugInTextEditor.js b/public/visifile_drivers/all_system_components/codePlugInTextEditor.js index b7cfa7075..7bf13cc33 100644 --- a/public/visifile_drivers/all_system_components/codePlugInTextEditor.js +++ b/public/visifile_drivers/all_system_components/codePlugInTextEditor.js @@ -84,7 +84,7 @@ load_once_from_file(true) |________________________________________________________________________ */ mounted: function() { let mm = this - yz.mainVars.disableAutoSave = true + window.yz.mainVars.disableAutoSave = true ace.config.set('basePath', '/'); mm.editor = ace.edit( @@ -114,7 +114,7 @@ load_once_from_file(true) if (mm.text) { mm.editor.getSession().setValue( mm.text ); - mm.read_only = yz.helpers.getValueOfCodeString( mm.text, "read_only" ) + mm.read_only = window.yz.helpers.getValueOfCodeString( mm.text, "read_only" ) } mm.editor.getSession().setUseWorker(false); @@ -183,7 +183,7 @@ load_once_from_file(true) |________________________________________________________________________ */ changed: function() { let mm = this - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "pending" }) } @@ -254,7 +254,7 @@ load_once_from_file(true) setText: function(textValue) { let mm = this mm.text = textValue - mm.read_only = yz.helpers.getValueOfCodeString(mm.text, "read_only") + mm.read_only = window.yz.helpers.getValueOfCodeString(mm.text, "read_only") if (mm.read_only) { mm.editor.setReadOnly(true) } diff --git a/public/visifile_drivers/all_system_components/controlEditor.js b/public/visifile_drivers/all_system_components/controlEditor.js index b2fce913f..4f55944c3 100644 --- a/public/visifile_drivers/all_system_components/controlEditor.js +++ b/public/visifile_drivers/all_system_components/controlEditor.js @@ -259,7 +259,7 @@ load_once_from_file(true) // // ---------------------------------------------------------------------- mounted: async function() { - //yz.mainVars.disableAutoSave = true + //window.yz.mainVars.disableAutoSave = true }, methods: { @@ -304,7 +304,7 @@ load_once_from_file(true) - this.baseComponentId = yz.helpers.getValueOfCodeString(this.text, "base_component_id") + this.baseComponentId = window.yz.helpers.getValueOfCodeString(this.text, "base_component_id") //debugger this.currentCommithashId = await this.getCurrentCommitId() @@ -847,7 +847,7 @@ load_once_from_file(true) let responseJson = await getFromYazzReturnJson("/http_get_load_code_commit", {commit_id: mm.lockedSelectedCommit}) mm.text = responseJson.code - mm.$root.$emit( + window.globalEventBus.emit( 'message', { type: "force_raw_load", commitId: mm.lockedSelectedCommit diff --git a/public/visifile_drivers/all_system_components/deliverComponentScreen.js b/public/visifile_drivers/all_system_components/deliverComponentScreen.js index 07e2008c7..45181e91f 100644 --- a/public/visifile_drivers/all_system_components/deliverComponentScreen.js +++ b/public/visifile_drivers/all_system_components/deliverComponentScreen.js @@ -577,9 +577,9 @@ pane_release_description: {{pane_release_description}} // init release pane // ------------------------------------------------ if (tabName == "release") { - let release = yz.helpers.getValueOfCodeString(this.text, "release") - let commit = yz.helpers.getValueOfCodeString(this.text, "commit") - let envs = yz.helpers.getValueOfCodeString(this.text, "environments") + let release = window.yz.helpers.getValueOfCodeString(this.text, "release") + let commit = window.yz.helpers.getValueOfCodeString(this.text, "commit") + let envs = window.yz.helpers.getValueOfCodeString(this.text, "environments") if (commit) { mm.pane_release_in_dev_mode = false @@ -612,7 +612,7 @@ pane_release_description: {{pane_release_description}} mm.pane_release_next_env_id = null } - let environments = yz.helpers.getValueOfCodeString(this.text, "environments") + let environments = window.yz.helpers.getValueOfCodeString(this.text, "environments") if (environments) { mm.pane_release_env_list = environments.list_of_environments if (environments.last_env_is_live) { @@ -627,14 +627,14 @@ pane_release_description: {{pane_release_description}} // init environments pane // ------------------------------------------------ if (tabName == "environments") { - let release = yz.helpers.getValueOfCodeString(this.text, "release") + let release = window.yz.helpers.getValueOfCodeString(this.text, "release") if (release) { mm.pane_environments_in_dev_mode = false } else { mm.pane_environments_in_dev_mode = true } - let environments = yz.helpers.getValueOfCodeString(this.text, "environments") + let environments = window.yz.helpers.getValueOfCodeString(this.text, "environments") if (environments) { mm.pane_environments_env_list = environments.list_of_environments if (environments.last_env_is_live) { @@ -676,7 +676,7 @@ pane_release_description: {{pane_release_description}} let mm = this this.text = textValue - this.baseComponentId = yz.helpers.getValueOfCodeString(this.text, "base_component_id") + this.baseComponentId = window.yz.helpers.getValueOfCodeString(this.text, "base_component_id") this.codeId = await this.getCurrentCommitId() await mm.switchTab( {tabName: mm.selectedTab} ) @@ -725,7 +725,7 @@ pane_release_description: {{pane_release_description}} hideProgressBar() if (responseJson && responseJson.newCommitId) { - mm.$root.$emit( + window.globalEventBus.emit( 'message' , { @@ -1270,7 +1270,7 @@ pane_release_description: {{pane_release_description}} window.timelineEnd = mm.timelineEnd window.keepTimeline = true - mm.$root.$emit( + window.globalEventBus.emit( 'message' , { @@ -1319,7 +1319,7 @@ pane_release_description: {{pane_release_description}} hideProgressBar() if (responseJson && responseJson.newCommitId) { - mm.$root.$emit( + window.globalEventBus.emit( 'message' , { @@ -1669,15 +1669,15 @@ pane_release_description: {{pane_release_description}} //-------------------------------------------------------------------- try { let mm = this - this.text = yz.helpers.deleteCodeString(this.text, "environments") - this.text = yz.helpers.insertCodeString(this.text, "environments", + this.text = window.yz.helpers.deleteCodeString(this.text, "environments") + this.text = window.yz.helpers.insertCodeString(this.text, "environments", { list_of_environments: mm.pane_environments_env_list, last_env_is_live: mm.pane_environments_last_env_is_live } ) - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "pending" }) } catch (e) { diff --git a/public/visifile_drivers/all_system_components/embedAppComponent.js b/public/visifile_drivers/all_system_components/embedAppComponent.js index f0ee2ef47..e9a834b27 100644 --- a/public/visifile_drivers/all_system_components/embedAppComponent.js +++ b/public/visifile_drivers/all_system_components/embedAppComponent.js @@ -82,10 +82,10 @@ load_once_from_file(true) let mm = this let thisVueInstance = this args.text = null - this.baseComponentId = yz.helpers.getValueOfCodeString(thisVueInstance.text, "base_component_id") + this.baseComponentId = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "base_component_id") if (isValidObject(thisVueInstance.text)) { - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") } diff --git a/public/visifile_drivers/all_system_components/environmentsEditor.js b/public/visifile_drivers/all_system_components/environmentsEditor.js index 5b53ebf14..692afa236 100644 --- a/public/visifile_drivers/all_system_components/environmentsEditor.js +++ b/public/visifile_drivers/all_system_components/environmentsEditor.js @@ -350,14 +350,14 @@ pane_environments_last_env_is_live: {{pane_environments_last_env_is_live}} // init environments pane // ------------------------------------------------ if (tabName == "environments") { - let release = yz.helpers.getValueOfCodeString(this.text, "release") + let release = window.yz.helpers.getValueOfCodeString(this.text, "release") if (release) { mm.pane_environments_in_dev_mode = false } else { mm.pane_environments_in_dev_mode = true } - let environments = yz.helpers.getValueOfCodeString(this.text, "environments") + let environments = window.yz.helpers.getValueOfCodeString(this.text, "environments") if (environments) { mm.pane_environments_env_list = environments.list_of_environments if (environments.last_env_is_live) { @@ -399,9 +399,9 @@ pane_environments_last_env_is_live: {{pane_environments_last_env_is_live}} let mm = this this.text = textValue - this.baseComponentId = yz.helpers.getValueOfCodeString(this.text, "base_component_id") + this.baseComponentId = window.yz.helpers.getValueOfCodeString(this.text, "base_component_id") this.codeId = await this.getCurrentCommitId() - let readOnly = yz.helpers.getValueOfCodeString(this.text, "read_only") + let readOnly = window.yz.helpers.getValueOfCodeString(this.text, "read_only") mm.pane_environments_writable = true if (readOnly && (readOnly == true)) { mm.pane_environments_writable = false @@ -718,15 +718,15 @@ pane_environments_last_env_is_live: {{pane_environments_last_env_is_live}} //-------------------------------------------------------------------- try { let mm = this - this.text = yz.helpers.deleteCodeString(this.text, "environments") - this.text = yz.helpers.insertCodeString(this.text, "environments", + this.text = window.yz.helpers.deleteCodeString(this.text, "environments") + this.text = window.yz.helpers.insertCodeString(this.text, "environments", { list_of_environments: mm.pane_environments_env_list, last_env_is_live: mm.pane_environments_last_env_is_live } ) - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "pending" }) } catch (e) { diff --git a/public/visifile_drivers/all_system_components/exportEditorComponent.js b/public/visifile_drivers/all_system_components/exportEditorComponent.js index 6eaa77ece..0dace521f 100644 --- a/public/visifile_drivers/all_system_components/exportEditorComponent.js +++ b/public/visifile_drivers/all_system_components/exportEditorComponent.js @@ -40,12 +40,12 @@ load_once_from_file(true)
@@ -56,7 +56,7 @@ load_once_from_file(true)
- +

A) Export App as Docker Container

@@ -157,7 +157,7 @@ load_once_from_file(true)
- +

B) Export App for OpenShift

@@ -267,7 +267,7 @@ load_once_from_file(true) args.text = null if (isValidObject(thisVueInstance.text)) { - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") } if (this.read_only) { @@ -320,7 +320,7 @@ load_once_from_file(true) // - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") if (this.read_only) { } @@ -351,7 +351,7 @@ load_once_from_file(true) host: this.dockerHost, port: this.dockerPort, docker_local_port: this.dockerLocalPort, - app_base_component_id: yz.editor.editingAppBaseComponentId + app_base_component_id: window.yz.editor.editingAppBaseComponentId }) //alert(JSON.stringify(result,null,2)) diff --git a/public/visifile_drivers/all_system_components/iconEditorComponent.js b/public/visifile_drivers/all_system_components/iconEditorComponent.js index 9af2039d2..647abbdec 100644 --- a/public/visifile_drivers/all_system_components/iconEditorComponent.js +++ b/public/visifile_drivers/all_system_components/iconEditorComponent.js @@ -85,12 +85,12 @@ load_once_from_file(true) setText: async function ( textValue ) { let mm = this this.text = textValue - this.icon_image_data = yz.helpers.getValueOfCodeString(this.text, "logo_url") + this.icon_image_data = window.yz.helpers.getValueOfCodeString(this.text, "logo_url") if (!isValidObject(this.text)) { return } - this.baseComponentId = yz.helpers.getValueOfCodeString(this.text, "base_component_id") + this.baseComponentId = window.yz.helpers.getValueOfCodeString(this.text, "base_component_id") this.loadImageToCanvas() }, drawNow: function(event) { @@ -136,9 +136,9 @@ load_once_from_file(true) }, save: function() { let mm = this - this.text = yz.helpers.deleteCodeString(this.text, "logo_url") - this.text = yz.helpers.insertCodeString(this.text, "logo_url", this.icon_image_data) - mm.$root.$emit('message', { + this.text = window.yz.helpers.deleteCodeString(this.text, "logo_url") + this.text = window.yz.helpers.insertCodeString(this.text, "logo_url", this.icon_image_data) + window.globalEventBus.emit('message', { type: "pending" }) }, diff --git a/public/visifile_drivers/all_system_components/keycloakEditorComponent.js b/public/visifile_drivers/all_system_components/keycloakEditorComponent.js index 74b8f49a1..300bfae62 100644 --- a/public/visifile_drivers/all_system_components/keycloakEditorComponent.js +++ b/public/visifile_drivers/all_system_components/keycloakEditorComponent.js @@ -48,7 +48,7 @@ load_once_from_file(true) let thisVueInstance = this let mm = this args.text = null - yz.mainVars.disableAutoSave = true + window.yz.mainVars.disableAutoSave = true ace.config.set('basePath', '/'); this.editor = ace.edit( thisVueInstance.editorDomId, { @@ -78,7 +78,7 @@ load_once_from_file(true) document.getElementById(thisVueInstance.editorDomId).style.height="65vh" if (isValidObject(thisVueInstance.text)) { thisVueInstance.editor.getSession().setValue(thisVueInstance.sqlText); - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") } thisVueInstance.editor.getSession().setUseWorker(false); @@ -147,8 +147,8 @@ load_once_from_file(true) return null } - this.text = yz.helpers.deleteCodeString(this.text, "keycloak", ")//keycloak") - this.text = yz.helpers.insertCodeString(this.text, "keycloak", JSON.parse(this.sqlText) ,")//keycloak") + this.text = window.yz.helpers.deleteCodeString(this.text, "keycloak", ")//keycloak") + this.text = window.yz.helpers.insertCodeString(this.text, "keycloak", JSON.parse(this.sqlText) ,")//keycloak") return this.text } @@ -177,7 +177,7 @@ load_once_from_file(true) // - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") if (this.read_only) { this.editor.setReadOnly(true) } @@ -190,7 +190,7 @@ load_once_from_file(true) // If a database definition has been given then read it // - let llsqlText = yz.helpers.getValueOfCodeString(textValue, "keycloak", ")//keycloak") + let llsqlText = window.yz.helpers.getValueOfCodeString(textValue, "keycloak", ")//keycloak") if (isValidObject(llsqlText)) { this.editor.getSession().setValue( JSON.stringify( llsqlText , null , 2 )); } else { diff --git a/public/visifile_drivers/all_system_components/sqliteEditorComponent.js b/public/visifile_drivers/all_system_components/sqliteEditorComponent.js index 94923a292..5511d7039 100644 --- a/public/visifile_drivers/all_system_components/sqliteEditorComponent.js +++ b/public/visifile_drivers/all_system_components/sqliteEditorComponent.js @@ -48,7 +48,7 @@ load_once_from_file(true) let thisVueInstance = this let mm = this args.text = null - yz.mainVars.disableAutoSave = true + window.yz.mainVars.disableAutoSave = true ace.config.set('basePath', '/'); mm.editor = ace.edit( mm.editorDomId, { @@ -78,7 +78,7 @@ load_once_from_file(true) document.getElementById(mm.editorDomId).style.height="65vh" if (isValidObject(thisVueInstance.text)) { mm.editor.getSession().setValue(thisVueInstance.sqlText); - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") } mm.editor.getSession().setUseWorker(false); @@ -147,8 +147,8 @@ load_once_from_file(true) return null } - this.text = yz.helpers.deleteCodeString(this.text, "sqlite", ")//sqlite") - this.text = yz.helpers.insertCodeString(this.text, "sqlite", JSON.parse(this.sqlText) ,")//sqlite") + this.text = window.yz.helpers.deleteCodeString(this.text, "sqlite", ")//sqlite") + this.text = window.yz.helpers.insertCodeString(this.text, "sqlite", JSON.parse(this.sqlText) ,")//sqlite") return this.text } @@ -177,7 +177,7 @@ load_once_from_file(true) // - this.read_only = yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") + this.read_only = window.yz.helpers.getValueOfCodeString(thisVueInstance.text, "read_only") if (this.read_only) { this.editor.setReadOnly(true) } @@ -190,7 +190,7 @@ load_once_from_file(true) // If a database definition has been given then read it // - let llsqlText = yz.helpers.getValueOfCodeString(textValue, "sqlite", ")//sqlite") + let llsqlText = window.yz.helpers.getValueOfCodeString(textValue, "sqlite", ")//sqlite") if (isValidObject(llsqlText)) { this.editor.getSession().setValue( JSON.stringify( llsqlText , null , 2 )); } else { diff --git a/public/visifile_drivers/apps/homepage.js b/public/visifile_drivers/apps/homepage.js index ead5fb5fa..d7c50f11b 100644 --- a/public/visifile_drivers/apps/homepage.js +++ b/public/visifile_drivers/apps/homepage.js @@ -80,36 +80,36 @@ logo_url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxIQEg8SEBE ------------------------------------------------------------------------------ */ Yazz.component( { - template: - `
+ template: ` +
- - - -
- - - - - - - - -
- 
-    
Homepage Vars

+    
+    
+    
+    

+        
+
+
+
+    
+    
+    
+    
+        

+            
+
Homepage Vars

 lastEditedBaseComponentId:              {{ lastEditedBaseComponentId }}
 lastEditedCodeId:                       {{ lastEditedCodeId }}
 editingBaseComponentId:                 {{ editingBaseComponentId }}
@@ -136,8 +136,8 @@ open_file_list:                         {{ open_file_list }}
 open_file_name:                         {{ open_file_name }}
 disableHighlightEditableApp:            {{ disableHighlightEditableApp }}
 
-                      

-                    

+
+
@@ -146,61 +146,62 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} -
+
- - - - - - - - - - -
- - - -
- - - -
-
+ + + + + + + + + + + @@ -221,268 +222,263 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} - - - -
- -
- -
- -
- -
- -
- -
- - -
- -
- + + + +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
- - - Company - - - +
- - - - Discord - - - +
- - - - -
+ +
+ + + + + Company + + + + + + + + Discord + + + + + + + + +
+ + + + + + + + + + + + + + + - - -
- -

- - - - - - - - - - - - - - - - - - - - - -
- -
- Choose a .yazz file -
- -
- - - {{open_file_path}} -
- -
- -
- {{file_or_folder_item.name}} -
-
- - - -
- - + + + --> + +
+ +

+

+ - -
+ New App + -
- + + + + + - + + + + + + +
+ +
+ Choose a .yazz file +
+ +
+ + + {{open_file_path}} +
+ +
+ +
+ {{file_or_folder_item.name}} +
+
+ + +
+ + + + +
- + + + + + -

-
+
@@ -526,7 +522,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} --> - +
@@ -564,8 +560,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} v-bind:src='app_store_component_logos_by_BCI[item.base_component_id]' style='position:relative;max-width: 75%; left:0px; top: 10px;max-height: 150px;margin-left: auto;margin-right: auto;display: block;z-index:0;' v-bind:alt='app_store_component_logos_by_BCI[item.base_component_id]' - v-on:click='$event.stopPropagation();editApp(item.base_component_id)'> - + v-on:click='$event.stopPropagation();editApp(item.base_component_id)' /> @@ -585,8 +579,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} v-on:click='showProgressBar();$event.stopPropagation();addToEditableAppsAndEdit(item.content_hash)'> - + /> Edit @@ -609,8 +602,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} style='position:relative;max-width: 75%; left:0px; top: 10px;max-height: 150px;margin-left: auto;margin-right: auto;display: block;' v-bind:alt='app_store_component_logos_by_BCI[item.id]' v-on:click='$event.stopPropagation();editApp(item.id)' - > - + /> @@ -642,7 +634,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} --> - +
Editable Apps @@ -686,8 +678,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} v-bind:src='item.logo_url' style='position:relative;max-width: 75%; left:0px; top: 10px;max-height: 150px;margin-left: auto;margin-right: auto;display: block;z-index:0;' v-bind:alt='item.base_component_id' - v-on:click='$event.stopPropagation();editApp(item.base_component_id, item.code_id)'> - + v-on:click='$event.stopPropagation();editApp(item.base_component_id, item.code_id)' /> @@ -705,8 +695,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} v-on:click='showProgressBar();$event.stopPropagation();editApp(item.base_component_id,item.code_id)'> - + style='position:relative;max-width: 40px; left:0px; top: 0px;max-height: 40px;margin-left: auto;margin-right: auto;display: inline-block;' /> Edit
@@ -721,8 +710,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} v-bind:src='item.logo_url' style='position:relative;max-width: 75%; left:0px; top: 10px;max-height: 150px;margin-left: auto;margin-right: auto;display: block;' v-bind:alt='item.displayName' - v-on:click='$event.stopPropagation();editApp(item.base_component_id,item.code_id)'> - + v-on:click='$event.stopPropagation();editApp(item.base_component_id,item.code_id)' /> @@ -762,7 +750,8 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }}
-
`, +
+ `, data: function() { // data for the Vue object - see top of file for more info return { @@ -863,7 +852,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} | Add some events which update the | apps on the homepage |__________________________________ */ - mm.$root.$on('message', async function(text) { + window.globalEventBus.on('message', async function(text) { if (text.type == "insert_editable_component_on_homepage") { await mm.addEditableComponentToHomepage( text.base_component_id, @@ -912,7 +901,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} mm.open_file_name = "" mm.open_file_path = "/" saveCodeToFile = null - globalEventBus.$emit('show_settings', {}); + globalEventBus.emit('show_settings', {}); mm.refresh++ } @@ -935,13 +924,13 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} mm.open_file_name = "" mm.open_file_path = "/" saveCodeToFile = null - globalEventBus.$emit('show_settings', {}); + globalEventBus.emit('show_settings', {}); setTimeout(async function() { let bci = text.base_component_id let cid = text.code_id - if (!isValidObject(cid)) { - cid = GLOBALS.baseComponentIdReturnsCommitId[bci] + if (!window.isValidObject(cid)) { + cid = mm.GLOBALS().baseComponentIdReturnsCommitId[bci] } let fid = text.form_id let cni = text.control_name @@ -969,7 +958,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} mm.open_file_name = "" mm.open_file_path = "/" saveCodeToFile = null - globalEventBus.$emit('show_settings', {}); + globalEventBus.emit('show_settings', {}); setTimeout(function() { let bci = text.base_component_id @@ -1008,13 +997,13 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} mm.open_file_name = "" mm.open_file_path = "/" saveCodeToFile = null - globalEventBus.$emit('show_settings', {}); + globalEventBus.emit('show_settings', {}); setTimeout(async function() { let bci = text.base_component_id let cid = text.code_id - if ((!isValidObject(cid)) || (cid == "")) { - cid = GLOBALS.baseComponentIdReturnsCommitId[bci] + if ((!window.isValidObject(cid)) || (cid == "")) { + cid = mm.GLOBALS().baseComponentIdReturnsCommitId[bci] } let fid = text.form_id let cni = text.control_name @@ -1041,7 +1030,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} mm.open_file_name = "" mm.open_file_path = "/" saveCodeToFile = null - globalEventBus.$emit('show_settings', {}); + globalEventBus.emit('show_settings', {}); setTimeout(function() { let bci = text.base_component_id @@ -1069,7 +1058,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} | When we try to drag drop an app | into the Yazz editor |__________________________________ */ - globalEventBus.$on('new-appshare-app-uploaded', + globalEventBus.on('new-appshare-app-uploaded', async function({baseComponentId, codeId, logoUrl, displayName}) { await mm.addEditableComponentToHomepage( @@ -1551,7 +1540,7 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} let baseComponentId = compInfo.base_component_id let codeId = compInfo.code_id - globalEventBus.$emit('hide_settings', {}); + globalEventBus.emit('hide_settings', {}); this.open_file_name = "" this.open_file_path = "/" @@ -1669,15 +1658,15 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} //-------------------------------------------------------------------- let mm = this - globalEventBus.$emit('hide_settings', {}); + globalEventBus.emit('hide_settings', {}); - await GLOBALS.makeSureUiComponentLoadedV6([{baseComponentId: "app_editor_3"}]) + await (mm.GLOBALS()).makeSureUiComponentLoadedV6([{baseComponentId: "app_editor_3"}]) if (codeId) { - await GLOBALS.makeSureUiComponentLoadedV6([{codeId: codeId}]) + await (mm.GLOBALS()).makeSureUiComponentLoadedV6([{codeId: codeId}]) } else if (baseComponentId) { - if (!GLOBALS.isComponentTypeCached(baseComponentId)) { - await GLOBALS.makeSureUiComponentLoadedV6([{baseComponentId: baseComponentId}]) + if (!mm.GLOBALS().isComponentTypeCached(baseComponentId)) { + await (mm.GLOBALS()).makeSureUiComponentLoadedV6([{baseComponentId: baseComponentId}]) } } @@ -1737,9 +1726,17 @@ disableHighlightEditableApp: {{ disableHighlightEditableApp }} //error block }) mm.refresh++ + }, + showProgressBar: async function ( ) { + window.showProgressBar() + }, + isValidObject: function ( ) { + return window.isValidObject + }, + GLOBALS: function ( ) { + return window.GLOBALS } - -} + } } ) } diff --git a/public/visifile_drivers/apps/mobilehomepage.js b/public/visifile_drivers/apps/mobilehomepage.js index 273d6b812..a4d32c94e 100644 --- a/public/visifile_drivers/apps/mobilehomepage.js +++ b/public/visifile_drivers/apps/mobilehomepage.js @@ -143,8 +143,8 @@ logo_url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxIQEg8SEBE v-bind:src='app_logos[item.data.id]' style='position:relative;max-width: 75%; left:0px; top: 10px;max-height: 150px;margin-left: auto;margin-right: auto;display: block;z-index:0;' v-bind:alt='app_logos[item.data.id]' - > - + /> + @@ -171,8 +171,8 @@ logo_url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxIQEg8SEBE v-bind:src='app_logos[item.data.id]' style='position:relative;max-width: 75%; left:0px; top: 10px;max-height: 150px;margin-left: auto;margin-right: auto;display: block;' v-bind:alt='app_logos[item.data.id]' - > - + /> + @@ -289,7 +289,7 @@ logo_url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxIQEg8SEBE - mm.$root.$on('message', async function(text) { + window.globalEventBus.on('message', async function(text) { if (text.type == "insert_editable_component_on_homepage") { //debugger await mm.addLogoForApp(text.base_component_id) @@ -312,7 +312,7 @@ logo_url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxIQEg8SEBE }) - globalEventBus.$on('new-appshare-app-uploaded', + globalEventBus.on('new-appshare-app-uploaded', async function(data) { await mm.addLogoForApp(data) await mm.addApp(data) diff --git a/public/visifile_drivers/controls/ace_editor.js b/public/visifile_drivers/controls/ace_editor.js index b0c174020..70f459f02 100644 --- a/public/visifile_drivers/controls/ace_editor.js +++ b/public/visifile_drivers/controls/ace_editor.js @@ -339,7 +339,7 @@ logo_url("/driver_icons/ace_editor.jpeg") //console.log("----- button_control, click_event_callback: function() = " + this.name) //eval("(function(){" + this.args.click_event + "})")() - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, @@ -356,7 +356,7 @@ logo_url("/driver_icons/ace_editor.jpeg") console.log("mykeypressed: "+ mykeypressed) this.args.last_keypressed = mykeypressed - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, @@ -369,7 +369,7 @@ logo_url("/driver_icons/ace_editor.jpeg") focus_event_callback: function() { console.log("----- button_control, focus_event_callback: function() = " + this.name) - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, diff --git a/public/visifile_drivers/controls/button.js b/public/visifile_drivers/controls/button.js index 418317266..6718fd84e 100644 --- a/public/visifile_drivers/controls/button.js +++ b/public/visifile_drivers/controls/button.js @@ -111,7 +111,7 @@ logo_url("/driver_icons/button_control.png") //eval("(function(){" + this.properties.click_event + "})")() console.log(" design mode = " + this.design_mode) - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, diff --git a/public/visifile_drivers/controls/chart.js b/public/visifile_drivers/controls/chart.js index 4eb3f0c52..b33d4050e 100644 --- a/public/visifile_drivers/controls/chart.js +++ b/public/visifile_drivers/controls/chart.js @@ -191,7 +191,7 @@ logo_url("/driver_icons/chart.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/checkbox.js b/public/visifile_drivers/controls/checkbox.js index 1b80527d6..2a2a3d2bb 100644 --- a/public/visifile_drivers/controls/checkbox.js +++ b/public/visifile_drivers/controls/checkbox.js @@ -85,7 +85,7 @@ logo_url("/driver_icons/checkbox_control.png") } else { this.args.checked="False" } - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, diff --git a/public/visifile_drivers/controls/component_builder.js b/public/visifile_drivers/controls/component_builder.js index c85afa6f9..e15a5a21d 100644 --- a/public/visifile_drivers/controls/component_builder.js +++ b/public/visifile_drivers/controls/component_builder.js @@ -956,7 +956,7 @@ logo_url("/driver_icons/builder.png") , async function(response){ let responseJson = JSON.parse(response) - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "load_controls", }) mm.meta.getEditor().changeComponentBaseId( diff --git a/public/visifile_drivers/controls/container_3d.js b/public/visifile_drivers/controls/container_3d.js index 80da0e5a5..13031e5c1 100644 --- a/public/visifile_drivers/controls/container_3d.js +++ b/public/visifile_drivers/controls/container_3d.js @@ -539,7 +539,7 @@ logo_url("/driver_icons/threedee_item.png") , keyPressEventHandler: function(keyCode) { this.args.lastKeyPressed = String.fromCharCode(keyCode) - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "keypressed", @@ -554,7 +554,7 @@ logo_url("/driver_icons/threedee_item.png") , keyDownEventHandler: function(keyCode) { this.args.lastKeyDown = String.fromCharCode(keyCode) - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "keydown", @@ -566,7 +566,7 @@ logo_url("/driver_icons/threedee_item.png") }) if (keyCode == 8) { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "backspace", @@ -574,7 +574,7 @@ logo_url("/driver_icons/threedee_item.png") }) } if (keyCode == 46) { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "delete", @@ -582,7 +582,7 @@ logo_url("/driver_icons/threedee_item.png") }) } if (keyCode == 13) { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "enter", diff --git a/public/visifile_drivers/controls/data_window.js b/public/visifile_drivers/controls/data_window.js index f58be0511..947221365 100644 --- a/public/visifile_drivers/controls/data_window.js +++ b/public/visifile_drivers/controls/data_window.js @@ -720,7 +720,7 @@ logo_url("/driver_icons/data_window.png") this.table.addColumn(colData, true, "name"); }, runEventHandler: function ( ) { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/database.js b/public/visifile_drivers/controls/database.js index d08b2a496..18e13679e 100644 --- a/public/visifile_drivers/controls/database.js +++ b/public/visifile_drivers/controls/database.js @@ -893,8 +893,8 @@ logo_url("/driver_icons/data_control.png") } } }, - beforeDestroy: async function ( ) { - console.log('beforeDestroy'); + beforeUnmount: async function ( ) { + console.log('beforeUnmount'); await this.minimizeChildren() }, mounted: async function ( ) { @@ -1004,8 +1004,8 @@ logo_url("/driver_icons/data_control.png") //await mm.meta.getEditor().updateComponentMethods() let newcontrol = mm.meta.lookupComponent(mm.properties.sourceControlName) //newcontrol.height = 700 - //zzz - //mm.$root.$emit('message', { + + // window.globalEventBus.emit('message', { // type: "pending" //}) }, @@ -1090,7 +1090,7 @@ logo_url("/driver_icons/data_control.png") }, runEventHandler: function ( ) { let mm = this - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.properties.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/draw.js b/public/visifile_drivers/controls/draw.js index 8c155f1f4..702e7c2b1 100644 --- a/public/visifile_drivers/controls/draw.js +++ b/public/visifile_drivers/controls/draw.js @@ -115,10 +115,10 @@ logo_url("/driver_icons/draw.png") v-bind:width='args.width + "px"' v-bind:refresh='refresh' alt='No image set' - v-bind:src='"" + args.image_data'> + v-bind:src='"" + args.image_data' /> - +
` , data: function() { diff --git a/public/visifile_drivers/controls/drive_list.js b/public/visifile_drivers/controls/drive_list.js index a17226ae4..74e55960d 100644 --- a/public/visifile_drivers/controls/drive_list.js +++ b/public/visifile_drivers/controls/drive_list.js @@ -114,7 +114,7 @@ logo_url("/driver_icons/drive_list.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/dropdown.js b/public/visifile_drivers/controls/dropdown.js index 5756d7ca4..b2cb8b08a 100644 --- a/public/visifile_drivers/controls/dropdown.js +++ b/public/visifile_drivers/controls/dropdown.js @@ -208,7 +208,7 @@ logo_url("/driver_icons/dropdown.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/evm_contract.js b/public/visifile_drivers/controls/evm_contract.js index 34fd2b515..65199e7b2 100644 --- a/public/visifile_drivers/controls/evm_contract.js +++ b/public/visifile_drivers/controls/evm_contract.js @@ -492,7 +492,7 @@ return sdf , async function(response){ let responseJson = JSON.parse(response) - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "load_controls", }) mm.meta.getEditor().changeComponentBaseId( diff --git a/public/visifile_drivers/controls/file_list.js b/public/visifile_drivers/controls/file_list.js index f9de569fa..ba7b47bd5 100644 --- a/public/visifile_drivers/controls/file_list.js +++ b/public/visifile_drivers/controls/file_list.js @@ -114,7 +114,7 @@ logo_url("/driver_icons/file_list.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/folder_list.js b/public/visifile_drivers/controls/folder_list.js index c29bbb7bb..915259620 100644 --- a/public/visifile_drivers/controls/folder_list.js +++ b/public/visifile_drivers/controls/folder_list.js @@ -130,7 +130,7 @@ logo_url("/driver_icons/folder_list.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/horiz_scroll.js b/public/visifile_drivers/controls/horiz_scroll.js index 65a55a9f0..635170f22 100644 --- a/public/visifile_drivers/controls/horiz_scroll.js +++ b/public/visifile_drivers/controls/horiz_scroll.js @@ -117,7 +117,7 @@ logo_url("/driver_icons/horiz_scroll.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/image.js b/public/visifile_drivers/controls/image.js index 5ca311f83..c6dd787ff 100644 --- a/public/visifile_drivers/controls/image.js +++ b/public/visifile_drivers/controls/image.js @@ -46,8 +46,8 @@ logo_url("/driver_icons/image.png") template: `No image set - ` + v-bind:src='"" + args.image_data' /> + ` , data: function() { return { @@ -59,7 +59,7 @@ logo_url("/driver_icons/image.png") console.log("----- image_control, event_callback: function() = " + this.name) //eval("(function(){" + this.args.click_event + "})")() - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.name, sub_type: "click", diff --git a/public/visifile_drivers/controls/input.js b/public/visifile_drivers/controls/input.js index 3c391d731..5400b5581 100644 --- a/public/visifile_drivers/controls/input.js +++ b/public/visifile_drivers/controls/input.js @@ -166,7 +166,7 @@ logo_url("/driver_icons/input_box.png") //console.log("----- button_control, click_event_callback: function() = " + this.name) //eval("(function(){" + this.args.click_event + "})")() - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, @@ -183,7 +183,7 @@ logo_url("/driver_icons/input_box.png") console.log("mykeypressed: "+ mykeypressed) this.args.last_keypressed = mykeypressed - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, @@ -196,7 +196,7 @@ logo_url("/driver_icons/input_box.png") focus_event_callback: function() { console.log("----- button_control, focus_event_callback: function() = " + this.name) - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, diff --git a/public/visifile_drivers/controls/item_3d.js b/public/visifile_drivers/controls/item_3d.js index 751df1ded..84354b06f 100644 --- a/public/visifile_drivers/controls/item_3d.js +++ b/public/visifile_drivers/controls/item_3d.js @@ -261,7 +261,7 @@ logo_url("/driver_icons/threedee_control.png") console.log("----- 3d text, event_callback: function() = " + this.name) //eval("(function(){" + this.args.click_event + "})")() - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", form_name: this.meta.form, control_name: this.meta.name, diff --git a/public/visifile_drivers/controls/list.js b/public/visifile_drivers/controls/list.js index 1c0459387..32a3f2435 100644 --- a/public/visifile_drivers/controls/list.js +++ b/public/visifile_drivers/controls/list.js @@ -205,7 +205,7 @@ logo_url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMsAAAD5CAMAAAC+lzGnAAAA , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/mixer.js b/public/visifile_drivers/controls/mixer.js index d7d646c89..67ca926f6 100644 --- a/public/visifile_drivers/controls/mixer.js +++ b/public/visifile_drivers/controls/mixer.js @@ -985,7 +985,7 @@ logo_url("/driver_icons/mixer.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/table.js b/public/visifile_drivers/controls/table.js index 0d690f406..b86ffb5ad 100644 --- a/public/visifile_drivers/controls/table.js +++ b/public/visifile_drivers/controls/table.js @@ -175,7 +175,7 @@ logo_url("/driver_icons/table.png") } }, runEventHandler: function ( ) { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/public/visifile_drivers/controls/timer.js b/public/visifile_drivers/controls/timer.js index 472adaf5c..91d59092e 100644 --- a/public/visifile_drivers/controls/timer.js +++ b/public/visifile_drivers/controls/timer.js @@ -66,7 +66,7 @@ logo_url("/driver_icons/timer.png") + src="/driver_icons/timer.png" />
` , data: function() { @@ -85,7 +85,7 @@ logo_url("/driver_icons/timer.png") appSetInterval(function() { mm.args.counter ++ if (isValidObject(mm.args.tick_event)) { - mm.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: mm.args.name, sub_type: "tick", diff --git a/public/visifile_drivers/controls/vert_scroll.js b/public/visifile_drivers/controls/vert_scroll.js index 44cdc011f..bfa190120 100644 --- a/public/visifile_drivers/controls/vert_scroll.js +++ b/public/visifile_drivers/controls/vert_scroll.js @@ -121,7 +121,7 @@ logo_url("/driver_icons/vert_scroll_bar.png") , runEventHandler: function() { - this.$emit('send', { + window.globalEventBus.emit('send', { type: "subcomponent_event", control_name: this.args.name, sub_type: "changed", diff --git a/src/runtimePipelineYazzUiMethods.js b/src/runtimePipelineYazzUiMethods.js index 0d1112a7c..48af6db03 100644 --- a/src/runtimePipelineYazzUiMethods.js +++ b/src/runtimePipelineYazzUiMethods.js @@ -55,7 +55,7 @@ if (GLOBALS.isComponentTypeCached(componentId)) { let cachedComponentPropertiesDefinition = mm.getControlProperties(mm.model.forms[formName].components[compenentInFormIndex].base_component_id) - if (isValidObject(cachedComponentPropertiesDefinition)) { + if (window.isValidObject(cachedComponentPropertiesDefinition)) { for (let cpp = 0 ; cpp< cachedComponentPropertiesDefinition.length; cpp ++) { let prop = cachedComponentPropertiesDefinition[cpp].id let compId = mm.model.forms[formName].components[compenentInFormIndex].base_component_id @@ -65,7 +65,7 @@ mm.getControlMethod(cachedComponentPropertiesDefinition[cpp], mm.model.forms[formName].components[compenentInFormIndex]) - } else if (!isValidObject(mm.model.forms[formName].components[compenentInFormIndex][prop])){ + } else if (!window.isValidObject(mm.model.forms[formName].components[compenentInFormIndex][prop])){ mm.model.forms[formName].components[compenentInFormIndex][prop] = "" } } @@ -125,13 +125,13 @@ let form = mm.model.forms[formName] let components = form.components - if (!isValidObject(mm.runtimeFormsInfo[formName])) { + if (!window.isValidObject(mm.runtimeFormsInfo[formName])) { mm.runtimeFormsInfo[formName] = new Object() } mm.runtimeFormsInfo[formName].component_lookup_by_name = {} for (let cc of components) { - if (isValidObject(cc)) { + if (window.isValidObject(cc)) { mm.runtimeFormsInfo[formName].component_lookup_by_name[cc.name] = cc } if (!cc.uuid) { @@ -431,18 +431,18 @@ // newItem.code_id = GLOBALS.getCommitIdForBaseComponentId( newItem.base_component_id ) // let compEvaled = GLOBALS.getControlPropertyDefns({baseComponentId: newItem.base_component_id}) - //if (isValidObject(compEvaled1)) { + //if (window.isValidObject(compEvaled1)) { //newItem.code_id = compEvaled1.code_id //let compEvaled = compEvaled1.properties let compEvaled = GLOBALS.getControlPropertyDefns({baseComponentId: newItem.base_component_id}) - if (isValidObject(compEvaled)) { + if (window.isValidObject(compEvaled)) { for (let cpp = 0 ; cpp < compEvaled.length; cpp ++){ let prop = compEvaled[cpp].id - if (!isValidObject(newItem[prop])){ - if (isValidObject(compEvaled[cpp].default)) { + if (!window.isValidObject(newItem[prop])){ + if (window.isValidObject(compEvaled[cpp].default)) { newItem[prop] = JSON.parse(JSON.stringify(compEvaled[cpp].default)) - } else if (isValidObject(compEvaled[cpp].default_expression)){ + } else if (window.isValidObject(compEvaled[cpp].default_expression)){ newItem[prop] = eval("(" + compEvaled[cpp].default_expression + ")") } else { newItem[prop] = "" @@ -463,10 +463,10 @@ - if (!isValidObject(newItem.width)) { + if (!window.isValidObject(newItem.width)) { newItem.width = 100 } - if (!isValidObject(newItem.height)) { + if (!window.isValidObject(newItem.height)) { newItem.height = 100 } @@ -480,7 +480,7 @@ } - if (isValidObject( defProps )) { + if (window.isValidObject( defProps )) { let oo = Object.keys(defProps) for ( let ee = 0 ; ee < oo.length ; ee++ ) { let propName = oo[ee] @@ -495,7 +495,7 @@ let compCode = GLOBALS.getCodeForComponent({baseComponentId: newItem.base_component_id}) let childrenCode = yz.helpers.getValueOfCodeString(compCode, "children",")//children") - if (isValidObject(childrenCode)) { + if (window.isValidObject(childrenCode)) { for ( let ee = 0 ; ee < childrenCode.length ; ee++ ) { let childBaseId = childrenCode[ee].base_component_id let childDefProps = childrenCode[ee].properties @@ -518,10 +518,10 @@ mm.updateAllFormCaches() let selectParent = false let parentItemIndex = null - if (isValidObject(newItem.parent)) { + if (window.isValidObject(newItem.parent)) { let parentItem = mm.runtimeFormsInfo[mm.active_form].component_lookup_by_name[newItem.parent] - if (isValidObject(parentItem.select_parent_when_child_added) && + if (window.isValidObject(parentItem.select_parent_when_child_added) && (parentItem.select_parent_when_child_added == true)) { selectParent = true @@ -679,7 +679,7 @@ let ccode = "" // application code (THIS MUST BE FIST IN THE IF STATEMENT) - if (property_id && mm.model[property_id] && isValidObject(mm.model[property_id].fn)) { + if (property_id && mm.model[property_id] && window.isValidObject(mm.model[property_id].fn)) { ccode = mm.model[property_id].fn } else if (mm.app_selected) { ccode = mm.model[property_id] @@ -696,7 +696,7 @@ - if (!isValidObject(ccode)) { + if (!window.isValidObject(ccode)) { ccode = "" } @@ -743,7 +743,7 @@ - if (property_id && mm.model[property_id] && isValidObject(mm.model[property_id].fn)) { + if (property_id && mm.model[property_id] && window.isValidObject(mm.model[property_id].fn)) { mm.model[property_id].fn = newC } else if (app_selected) { mm.model[property_id] = newC @@ -753,7 +753,7 @@ } else if ((mm.active_component_index != null) && (mm.active_form != null)) { mm.model.forms[mm.active_form].components[mm.active_component_index][property_id] = newC } - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "pending" }) }) @@ -1319,7 +1319,7 @@ | | NONE |________________________________________________________________________ */ - this.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "delete_design_time_component", component_index: index }) @@ -1341,7 +1341,7 @@ | | NONE |________________________________________________________________________ */ - this.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "select_design_time_component", component_index: index }) @@ -1414,7 +1414,7 @@ }, - // helper fns + // SQL helper fns sqlQuery: async function ( sql , params ) { let mm = this console.log("Called sqlQuery:") @@ -1433,6 +1433,12 @@ }, // helper fns + GLOBALS: function ( ) { + return window.GLOBALS + }, + isValidObject: function ( ) { + return window.isValidObject + }, getEditor: function ( ) { /* ________________________________________ @@ -1554,7 +1560,7 @@ | | NONE |________________________________________________________________________ */ - this.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "pending" }) }, @@ -1637,7 +1643,7 @@ } // create the method if the method is described in a property - if (isValidObject(methodFn)) { + if (window.isValidObject(methodFn)) { let thecode = `(async function(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10) { ${methodFn} @@ -1694,7 +1700,7 @@ // find out if the method call should be asynchronous - if (!isValidObject(methodFn)) { + if (!window.isValidObject(methodFn)) { let allProps = GLOBALS.getControlPropertyDefns({baseComponentId: componentDetails.base_component_id}) if (allProps) { for ( let i = 0 ; i < allProps.length ; i++ ) { @@ -1711,7 +1717,7 @@ } // return an "async" method - if (isAsync || isValidObject(methodFn)){ + if (isAsync || window.isValidObject(methodFn)){ return mm.getControlAsyncMethod( componentDetails , isComponentInDesignMode , methodId ) // return a normal "NOT async" method @@ -1967,7 +1973,7 @@ ${innerMethodSrcCode} hasMoreDetailsUi: function ( formName , componentIndex ) { let mm = this let component = mm.model.forms[formName].components[componentIndex] - if (isValidObject(component.parent)) { + if (window.isValidObject(component.parent)) { let ccc = mm.model.forms[formName].components for (let ytr = 0;ytr < ccc.length;ytr++) { if (component.parent == ccc[ytr].name) { @@ -1996,7 +2002,7 @@ ${innerMethodSrcCode} return false } - if (isValidObject(component.parent)) { + if (window.isValidObject(component.parent)) { let ccc = mm.model.forms[formName].components for (let ytr = 0;ytr < ccc.length;ytr++) { if (ccc[ytr]) { @@ -2035,7 +2041,7 @@ ${innerMethodSrcCode} } let left = component.leftX - if (isValidObject(component.parent)) { + if (window.isValidObject(component.parent)) { let ccc = mm.model.forms[formName].components for (let ytr = 0;ytr < ccc.length;ytr++){ if (component.parent == ccc[ytr].name) { @@ -2070,7 +2076,7 @@ ${innerMethodSrcCode} return 0 } let top = component.topY - if (isValidObject(component.parent)) { + if (window.isValidObject(component.parent)) { let ccc = mm.model.forms[formName].components for (let ytr = 0;ytr < ccc.length;ytr++){ if (component.parent == ccc[ytr].name) { @@ -2463,10 +2469,10 @@ ${innerMethodSrcCode} if (mm.design_mode_pane.app_selected) { isApp = true - } else if (isValidObject(mm.design_mode_pane.active_component_index)) { + } else if (window.isValidObject(mm.design_mode_pane.active_component_index)) { componentId = mm.model.forms[mm.active_form].components[ mm.design_mode_pane.active_component_index ].base_component_id - } else if (isValidObject(mm.design_mode_pane.active_form)) { + } else if (window.isValidObject(mm.design_mode_pane.active_form)) { formName = mm.active_form } @@ -2478,13 +2484,13 @@ ${innerMethodSrcCode} if (mm.design_mode_pane.app_selected) { - } else if (isValidObject(mm.design_mode_pane.active_component_index)) { + } else if (window.isValidObject(mm.design_mode_pane.active_component_index)) { let parentId = mm.model.forms[mm.active_form].components[ mm.design_mode_pane.active_component_index ].parent - if (isValidObject(parentId)) { + if (window.isValidObject(parentId)) { componentId = mm.runtimeFormsInfo[mm.active_form].component_lookup_by_name[parentId].base_component_id } - } else if (isValidObject(mm.design_mode_pane.active_form)) { + } else if (window.isValidObject(mm.design_mode_pane.active_form)) { } } else if (textBeforeFirstDot == "app") { @@ -2529,10 +2535,10 @@ ${innerMethodSrcCode} let comm = controlProperties[fg] let propName = textBeforeFirstDot + "." + comm.id let meta = "Property" - if (isValidObject(comm.snippet)) { + if (window.isValidObject(comm.snippet)) { propName = textBeforeFirstDot + "." + comm.snippet } - if (isValidObject(comm.pre_snippet)) { + if (window.isValidObject(comm.pre_snippet)) { propName = comm.pre_snippet + propName } if (comm.type == "Action") { @@ -2572,10 +2578,10 @@ ${innerMethodSrcCode} let propName = textBeforeFirstDot + "." + propDetails.id let meta = "Property" - if (isValidObject(propDetails.snippet)) { + if (window.isValidObject(propDetails.snippet)) { propName = textBeforeFirstDot + "." + propDetails.snippet } - if (isValidObject(propDetails.pre_snippet)) { + if (window.isValidObject(propDetails.pre_snippet)) { propName = propDetails.pre_snippet + propName } if (propDetails.type == "Action") { @@ -2618,10 +2624,10 @@ ${innerMethodSrcCode} let comm = controlProperties[fg] let propName = textBeforeSecondDot + "." + comm.id let meta = "Property" - if (isValidObject(comm.snippet)) { + if (window.isValidObject(comm.snippet)) { propName = textBeforeSecondDot + "." + comm.snippet } - if (isValidObject(comm.pre_snippet)) { + if (window.isValidObject(comm.pre_snippet)) { propName = comm.pre_snippet + propName } if (comm.type == "Action") { @@ -2667,10 +2673,10 @@ ${innerMethodSrcCode} let propName = textBeforeFirstDot + "." + propDetails.id let meta = "Property" - if (isValidObject(propDetails.snippet)) { + if (window.isValidObject(propDetails.snippet)) { propName = textBeforeFirstDot + "." + propDetails.snippet } - if (isValidObject(propDetails.pre_snippet)) { + if (window.isValidObject(propDetails.pre_snippet)) { propName = propDetails.pre_snippet + propName } @@ -2760,7 +2766,7 @@ ${innerMethodSrcCode} // if we selected the app or a form - if (mm.app_selected || (!isValidObject(mm.active_component_index))) { + if (mm.app_selected || (!window.isValidObject(mm.active_component_index))) { if (mm.edited_app_component_id) { objectListForSelector.push( @@ -2823,7 +2829,7 @@ ${innerMethodSrcCode} // // if we selected a component // - } else if (isValidObject(mm.active_component_index)) { + } else if (window.isValidObject(mm.active_component_index)) { if (mm.edited_app_component_id) { objectListForSelector.push( @@ -2895,7 +2901,7 @@ ${innerMethodSrcCode} } - } else if ( isValidObject(mm.active_component_index) ) { + } else if ( window.isValidObject(mm.active_component_index) ) { let ccc = mm.model.forms[mm.active_form].components[mm.active_component_index] let properties = mm.getComponentProperties( ccc.base_component_id ) @@ -2997,7 +3003,7 @@ ${innerMethodSrcCode} // get the actions for the forms - } else if ( isValidObject(mm.active_form) ) { + } else if ( window.isValidObject(mm.active_form) ) { let ccc = mm.model.forms[mm.active_form] methodListForSelector.push( @@ -3212,9 +3218,9 @@ ${innerMethodSrcCode} let thisControl if (type == "subcomponent_event") { thisControl = mm.runtimeFormsInfo[this.active_form].component_lookup_by_name[control_name] - if (isValidObject(thisControl)) { + if (window.isValidObject(thisControl)) { - if (isValidObject(thisControl.parent)) { + if (window.isValidObject(thisControl.parent)) { argsToUserCode["parent"] = mm.runtimeFormsInfo[this.active_form].component_lookup_by_name[thisControl.parent]; } } @@ -3226,7 +3232,7 @@ ${innerMethodSrcCode} ` let listOfArgs = [] - if (isValidObject(args)) { + if (window.isValidObject(args)) { listOfArgs = Object.keys(args) for (let rtt=0;rtt
" } @@ -4185,7 +4191,7 @@ ${code} | | NONE |________________________________________________________________________ */ - if (!isValidObject(data)) { + if (!window.isValidObject(data)) { return "
" } @@ -4236,7 +4242,7 @@ ${code} let indexProp = 0 let selectedItem = null - if (mm.app_selected || (!isValidObject(mm.active_component_index))) { + if (mm.app_selected || (!window.isValidObject(mm.active_component_index))) { if (mm.edited_app_component_id) { sdata.push( @@ -4270,7 +4276,7 @@ ${code} indexProp++ } - } else if (isValidObject(mm.active_component_index)) { + } else if (window.isValidObject(mm.active_component_index)) { if (mm.edited_app_component_id) { sdata.push( @@ -4529,7 +4535,7 @@ return {} this.properties = this.getControlProperties(this.model.forms[this.active_form].components[index].base_component_id) this.updatePropertySelector() - if (isValidObject(showProps) && showProps) { + if (window.isValidObject(showProps) && showProps) { this.selected_pane = "properties"; this.chooseRight("properties"); } @@ -6052,13 +6058,19 @@ return {} mm.local_app = localAppshareApp mm.in_change_model = true + //debugger + if (mm.properties && mm.args) { mm.args = {...mm.args, ...mm.properties} mm.properties = mm.args } else if (mm.properties) { - mm.args = mm.properties + if (Vue.version.startsWith("2")) { + mm.args = mm.properties + } } else { - mm.properties = mm.args + if (Vue.version.startsWith("2")) { + mm.properties = mm.args + } } if (mm.design_mode) { @@ -6098,7 +6110,7 @@ return {} formDef[formprop.id] = mm.getFormMethod(formName, formprop) - } else if (!isValidObject(formprop)) { + } else if (!window.isValidObject(formprop)) { formDef[formprop.id] = "" } } @@ -6127,10 +6139,10 @@ return {} if (!mm.design_mode) { mm.model[propDetails.id] = mm.getAppMethod(propDetails.id) } - } else if (!isValidObject(mm.model[propDetails.id])) { - if (isValidObject(propDetails.default)) { + } else if (!window.isValidObject(mm.model[propDetails.id])) { + if (window.isValidObject(propDetails.default)) { mm.model[propDetails.id] = propDetails.default - } else if (isValidObject(propDetails.default_expression)) { + } else if (window.isValidObject(propDetails.default_expression)) { mm.model[propDetails.id] = eval("(" + propDetails.default_expression + ")") } } @@ -6171,7 +6183,7 @@ return {} }, 500) - mm.$root.$on('message', async function (text) { + window.globalEventBus.on('message', async function (text) { if (text.type == "delete_design_time_component") { if (mm.design_mode != false) { mm.model.forms[mm.active_form].components.splice(text.component_index, 1); @@ -6390,7 +6402,7 @@ return {} } if (ttt) { mm.old_model = JSON.parse(JSON.stringify(mm.model)); - mm.$root.$emit('message', { + window.globalEventBus.emit('message', { type: "pending" }) } @@ -6418,7 +6430,7 @@ return {} // // find out what components have changed in the current form // - if (isValidObject(ttt.forms)) { + if (window.isValidObject(ttt.forms)) { if (ttt.forms[this.active_form]) { let allComps = Object.keys(ttt.forms[this.active_form].components) let numComp = allComps.length diff --git a/src/runtimePipelineYazzUiTemplate.js b/src/runtimePipelineYazzUiTemplate.js index 70da24966..608068385 100644 --- a/src/runtimePipelineYazzUiTemplate.js +++ b/src/runtimePipelineYazzUiTemplate.js @@ -2,41 +2,40 @@ templateDefinition: //*** gen_start ***// - `
-
-
- Component type: {{ debug_component_bci }} - -
-
-
+ style="position:fixed; left:2vw;top:2vh;width:96vw;height:95%;background-color: white;z-index:100000000; border: black solid 2px;"> + +
+ Component type: {{ debug_component_bci }} + +
+
+
IPFS: {{debug_component_code_id?debug_component_code_id:"Error: No Commit ID"}} -
- 
-            {{debug_component_code_id?GLOBALS.getCodeForComponent({codeId: debug_component_code_id}):""}}
-
-
+ + 
+            {{debug_component_code_id?GLOBALS().getCodeForComponent({codeId: debug_component_code_id}):""}}
+
+ +
-
- + class='img-fluid' /> +
@@ -104,8 +103,8 @@ - + class='img-fluid' /> +
@@ -198,8 +197,8 @@ - + /> + Cancel @@ -341,7 +340,7 @@ v-bind:select_design_time_component='childSelectComponent' v-bind:children='getChildren( model.forms[active_form].components[active_component_detail_index].name)' v-on:send="processControlEvent" - v-bind:is='model.forms[active_form].components[active_component_detail_index].code_id?model.forms[active_form].components[active_component_detail_index].code_id:GLOBALS.baseComponentIdReturnsCommitId[model.forms[active_form].components[active_component_detail_index].base_component_id]' + v-bind:is='model.forms[active_form].components[active_component_detail_index].code_id?model.forms[active_form].components[active_component_detail_index].code_id:GLOBALS().baseComponentIdReturnsCommitId[model.forms[active_form].components[active_component_detail_index].base_component_id]' v-bind:name='model.forms[active_form].components[active_component_detail_index].name + "_design_mode_" + design_mode' v-bind:props='model.forms[active_form].components[active_component_detail_index]' v-if='model.forms[active_form].components[active_component_detail_index]' @@ -350,10 +349,10 @@ @@ -447,7 +447,8 @@ - + @@ -474,9 +475,11 @@ v-if="model.forms[active_form].components[active_component_links_index] && (curr
+ - + @@ -510,7 +513,7 @@ v-if="model.forms[active_form].components[active_component_links_index] && (curr - + @@ -1646,8 +1649,8 @@ Pushlist - + class='img-fluid' /> + {{active_form}} (Form)
@@ -1927,8 +1930,8 @@ Pushlist src='/driver_icons/builder.png' style='margin: auto;' zzz="" - class='img-fluid'> - + class='img-fluid' /> +
@@ -1952,8 +1955,8 @@ Pushlist - + class='img-fluid' /> + @@ -1981,7 +1984,8 @@ Pushlist
+ style=''> +
+ v-bind:style='(formName==active_form)?"position:relative;":"display:none;"' + v-for='child_item in getChildren(item.name)'> - - + App - {{edited_app_display_name}}
@@ -2130,41 +2134,43 @@ Pushlist
- + - + class='img-fluid' /> + {{form.name}} ({{form.components.length}})
-
- -
-
- - - {{av.name}} - -
- -
-
- - - {{av2.name}} -
+
@@ -2186,8 +2192,8 @@ Pushlist
- Properties - {{isValidObject(active_component_index)?model.forms[active_form].components[active_component_index].name + " (Component)" : (app_selected?"App":active_form + " (Form)")}} + v-on:click='chooseRight(selected_pane == "properties"?"project":"properties")'> + Properties - {{isValidObject(active_component_index) && model.forms[active_form].components[active_component_index]?model.forms[active_form].components[active_component_index].name + " (Component)" : (app_selected?"App":active_form + " (Form)")}}
@@ -2218,7 +2224,7 @@ Pushlist // if only a BCI } else { - debug_component_code_id=GLOBALS.getCommitIdForBaseComponentId( model.forms[active_form].components[active_component_index].base_component_id); + debug_component_code_id=GLOBALS().getCommitIdForBaseComponentId( model.forms[active_form].components[active_component_index].base_component_id); }' > ..
@@ -2255,8 +2261,8 @@ Pushlist @change='setVBEditorProperty( { property: property , value: $event.target.value } )' v-bind:value='getVBEditorProperty(property)' v-bind:type='property.password?"password":""' - style='width: 100%;border: 0px;font-family:verdana,helvetica;font-size: 13px;padding:0px;'> - + style='width: 100%;border: 0px;font-family:verdana,helvetica;font-size: 13px;padding:0px;' /> +