Skip to content

Commit

Permalink
Merge pull request #1522 from lucasnetau/fix/1-instanceconfig
Browse files Browse the repository at this point in the history 
Ensure config is per instance
  • Loading branch information
@kevinchappell
kevinchappell committed Mar 1, 2024
2 parents 80d1a4a + c44dbc4 commit 4eeaee8
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/js/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const defaultI18n = {
location: 'assets/lang/',
}

export const config = {}
export const instanceConfig = {}

export const gridClassNames = {
rowWrapperClass: 'rowWrapper',
Expand Down
4 changes: 2 additions & 2 deletions src/js/form-builder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Helpers from './helpers'
import {
defaultOptions,
defaultI18n,
config,
instanceConfig,
styles,
gridClassNames,
defaultTimeout,
Expand Down Expand Up @@ -55,6 +55,7 @@ function FormBuilder(opts, element, $) {
const formID = `frmb-${Date.now()}`
const data = new Data(formID)
const d = new Dom(formID)
const config = instanceConfig[formID] = {}

/** @var formRows Allocated rows IDs in the builder */
let formRows = []
Expand Down Expand Up @@ -2478,7 +2479,6 @@ function FormBuilder(opts, element, $) {
const pluginInit = function(options,elem) {
const _this = this
const { i18n, ...opts } = jQuery.extend({}, defaultOptions, options, true)
config.opts = opts
this.i18nOpts = jQuery.extend({}, defaultI18n, i18n, true)

const notInitialised = () => {
Expand Down
53 changes: 29 additions & 24 deletions src/js/helpers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
getAllGridRelatedClasses,
} from './utils'
import events from './events'
import { config, defaultTimeout, styles } from './config'
import { instanceConfig, defaultTimeout, styles } from './config'
import control from './control'
import storageAvailable from 'storage-available'

Expand All @@ -35,6 +35,7 @@ export default class Helpers {
constructor(formId, layout, formBuilder) {
this.data = instanceData[formId]
this.d = instanceDom[formId]
this.config = instanceConfig[formId]
this.doCancel = false
this.layout = layout
this.handleKeyDown = this.handleKeyDown.bind(this)
Expand Down Expand Up @@ -82,7 +83,7 @@ export default class Helpers {
*/
beforeStop(event, ui) {
const _this = this
const opts = config.opts
const opts = this.config.opts
const form = _this.d.stage
const lastIndex = form.childNodes.length - 1
const cancelArray = []
Expand Down Expand Up @@ -196,6 +197,7 @@ export default class Helpers {
const formData = []
const d = this.d
const _this = this
const config = this.config

if (form.childNodes.length !== 0) {
const fields = []
Expand Down Expand Up @@ -302,7 +304,7 @@ export default class Helpers {
const data = this.data

if (!formData) {
formData = config.opts.formData
formData = this.config.opts.formData
}

if (!formData) {
Expand All @@ -319,7 +321,7 @@ export default class Helpers {
},
}

data.formData = setData[config.opts.dataType](formData) || []
data.formData = setData[this.config.opts.dataType](formData) || []

return data.formData
}
Expand All @@ -339,7 +341,7 @@ export default class Helpers {
}

// save action for current `dataType`
data.formData = doSave[config.opts.dataType](minify)
data.formData = doSave[this.config.opts.dataType](minify)

// trigger formSaved event
document.dispatchEvent(events.formSaved)
Expand All @@ -365,6 +367,7 @@ export default class Helpers {
* @return {Object} fieldData
*/
getAttrVals(field) {
const config = this.config
const fieldData = Object.create(null)
const attrs = field.querySelectorAll('[class*="fld-"]')
forEach(attrs, index => {
Expand Down Expand Up @@ -671,6 +674,7 @@ export default class Helpers {
*/
confirmRemoveAll(e) {
const _this = this
const config = this.config
const formID = e.target.id.match(/frmb-\d{13}/)[0]
const stage = document.getElementById(formID)
const i18n = mi18n.current
Expand Down Expand Up @@ -703,7 +707,7 @@ export default class Helpers {

addDefaultFields() {
// Load default fields if none are set
config.opts.defaultFields.forEach(field => this.formBuilder.prepFieldVars(field))
this.config.opts.defaultFields.forEach(field => this.formBuilder.prepFieldVars(field))
this.d.stage.classList.remove('empty')
}

Expand All @@ -714,7 +718,7 @@ export default class Helpers {
*/
removeAllFields(stage) {
const i18n = mi18n.current
const opts = config.opts
const opts = this.config.opts
const fields = stage.querySelectorAll(this.formBuilder.fieldSelector)
const markEmptyArray = []

Expand Down Expand Up @@ -761,7 +765,7 @@ export default class Helpers {
* @return {Array|false} fieldOrder
*/
setFieldOrder($cbUL) {
if (!config.opts.sortableControls) {
if (!this.config.opts.sortableControls) {
return false
}
const JSON = window.JSON
Expand Down Expand Up @@ -859,7 +863,7 @@ export default class Helpers {

this.removeContainerProtection(rowContainer.attr('id'))

config.opts.onCloseFieldEdit($editPanel[0])
this.config.opts.onCloseFieldEdit($editPanel[0])
document.dispatchEvent(events.fieldEditClosed)

const prevHolder = liContainer.find('.prev-holder')
Expand Down Expand Up @@ -929,7 +933,7 @@ export default class Helpers {
liContainer.insertAfter(rowWrapper)

this.formBuilder.currentEditPanel = $editPanel[0]
config.opts.onOpenFieldEdit($editPanel[0])
this.config.opts.onOpenFieldEdit($editPanel[0])
document.dispatchEvent(events.fieldEditOpened)

$(document).trigger('fieldOpened', [{ rowWrapperID: rowWrapper.attr('id') }])
Expand Down Expand Up @@ -959,6 +963,7 @@ export default class Helpers {
* Controls follow scroll to the bottom of the editor
*/
stickyControls() {
const config = this.config
const { controls, stage } = this.d
const $cbWrap = $(controls).parent()
const cbPosition = controls.getBoundingClientRect()
Expand Down Expand Up @@ -1011,10 +1016,10 @@ export default class Helpers {
* Open a dialog with the form's data
*/
showData() {
const formData = escapeHtml(this.getFormData(config.opts.dataType, true))
const formData = escapeHtml(this.getFormData(this.config.opts.dataType, true))

const code = m('code', formData, {
className: `formData-${config.opts.dataType}`,
className: `formData-${this.config.opts.dataType}`,
})

this.dialog(m('pre', code), false, 'data-dialog')
Expand All @@ -1033,23 +1038,23 @@ export default class Helpers {
const fields = form.getElementsByClassName('form-field')

if (!fields.length) {
config.opts.notify.warning('No fields to remove')
this.config.opts.notify.warning('No fields to remove')
return false
}

if (!fieldID) {
const availableIds = [].slice.call(fields).map(field => {
return field.id
})
config.opts.notify.warning('fieldID required to remove specific fields.')
config.opts.notify.warning('Removing last field since no ID was supplied.')
config.opts.notify.warning('Available IDs: ' + availableIds.join(', '))
fieldID = form.lastChild.id
this.config.opts.notify.warning('fieldID required to remove specific fields.')
this.config.opts.notify.warning('Removing last field since no ID was supplied.')
this.config.opts.notify.warning('Available IDs: ' + availableIds.join(', '))
fieldID = availableIds[availableIds.length-1]
}

const field = document.getElementById(fieldID)
if (!field) {
config.opts.notify.warning('Field not found')
this.config.opts.notify.warning('Field not found')
return false
}

Expand All @@ -1067,7 +1072,7 @@ export default class Helpers {
}
})

const userEvents = Object.assign({}, config.opts.typeUserEvents['*'], config.opts.typeUserEvents[field.type])
const userEvents = Object.assign({}, this.config.opts.typeUserEvents['*'], this.config.opts.typeUserEvents[field.type])

if (userEvents && userEvents.onremove) {
userEvents.onremove(field)
Expand Down Expand Up @@ -1131,7 +1136,7 @@ export default class Helpers {
* @return {Array} subtypes
*/
processSubtypes(subtypeOpts) {
const disabledSubtypes = config.opts.disabledSubtypes
const disabledSubtypes = this.config.opts.disabledSubtypes
// first register any passed subtype options against the appropriate type control class
for (const fieldType in subtypeOpts) {
if (subtypeOpts.hasOwnProperty(fieldType)) {
Expand Down Expand Up @@ -1205,7 +1210,7 @@ export default class Helpers {
* @return {HTMLElement[]} formActions btn-group
*/
formActionButtons() {
const opts = config.opts
const opts = this.config.opts
return opts.actionButtons
.map(btnData => {
if (btnData.id && opts.disabledActionButtons.indexOf(btnData.id) === -1) {
Expand Down Expand Up @@ -1252,7 +1257,7 @@ export default class Helpers {
events: {
click: evt => {
_this.save()
config.opts.onSave(evt, _this.data.formData)
_this.config.opts.onSave(evt, _this.data.formData)
},
},
},
Expand All @@ -1265,8 +1270,8 @@ export default class Helpers {
// html labels are not available using xml dataType
opts.disableHTMLLabels = true
}
config.opts = Object.assign({}, { actionButtons: mergedActionButtons }, { fieldEditContainer }, opts)
return config.opts
_this.config.opts = Object.assign({}, { actionButtons: mergedActionButtons }, { fieldEditContainer }, opts)
return _this.config.opts
}

/**
Expand Down

0 comments on commit 4eeaee8

Please sign in to comment.