TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace use of parseJSON with JSON.parse (#4517) 

Credit to @DanHarrin
This commit is contained in:
Dan Harrin 2019-09-14 13:25:18 +01:00 committed by Luke Towers
parent 2962f75221
commit 7b8fecaa51
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js
View File

@ -58,7 +58,7 @@
this.$el.on('hidden.oc.inspector', '[data-inspectable]', function() { this.$el.on('hidden.oc.inspector', '[data-inspectable]', function() {
var values = $('[data-inspector-values]', this).val(), var values = $('[data-inspector-values]', this).val(),
parsedValues = $.parseJSON(values), parsedValues = JSON.parse(values),
li = $(this).closest('li').get(0) li = $(this).closest('li').get(0)
self.$form.request(self.alias + '::onUpdateWidget', { self.$form.request(self.alias + '::onUpdateWidget', {

4
modules/cms/assets/js/october.cmspage.js
View File

@ -397,7 +397,7 @@
CmsPage.prototype.onInspectorHidden = function(ev) { CmsPage.prototype.onInspectorHidden = function(ev) {
var element = ev.target, var element = ev.target,
values = $.parseJSON($('[data-inspector-values]', element).val()) values = JSON.parse($('[data-inspector-values]', element).val())
$('[name="component_aliases[]"]', element).val(values['oc.alias']) $('[name="component_aliases[]"]', element).val(values['oc.alias'])
$('span.alias', element).text(values['oc.alias']) $('span.alias', element).text(values['oc.alias'])
@ -405,7 +405,7 @@
CmsPage.prototype.onInspectorHiding = function(ev, values) { CmsPage.prototype.onInspectorHiding = function(ev, values) {
var element = ev.target, var element = ev.target,
values = $.parseJSON($('[data-inspector-values]', element).val()), values = JSON.parse($('[data-inspector-values]', element).val()),
alias = values['oc.alias'], alias = values['oc.alias'],
$componentList = $('#cms-master-tabs > div.tab-content > .tab-pane.active .control-componentlist .layout'), $componentList = $('#cms-master-tabs > div.tab-content > .tab-pane.active .control-componentlist .layout'),
$cell = $(ev.target).parent() $cell = $(ev.target).parent()

4
modules/system/assets/ui/js/inspector.datainteraction.js
View File

@ -52,7 +52,7 @@
var valuesStr = $.trim(valuesField.value) var valuesStr = $.trim(valuesField.value)
try { try {
return valuesStr.length === 0 ? {} : $.parseJSON(valuesStr) return valuesStr.length === 0 ? {} : JSON.parse(valuesStr)
} }
catch (err) { catch (err) {
throw new Error('Error parsing Inspector field values. ' + err) throw new Error('Error parsing Inspector field values. ' + err)
@ -134,7 +134,7 @@
} }
try { try {
return $.parseJSON(configuration) return JSON.parse(configuration)
} }
catch(err) { catch(err) {
throw new Error('Error parsing Inspector configuration. ' + err) throw new Error('Error parsing Inspector configuration. ' + err)

6
modules/system/assets/ui/js/inspector.editor.objectlist.js
View File

@ -297,7 +297,7 @@
} }
var properties = this.propertyDefinition.itemProperties, var properties = this.propertyDefinition.itemProperties,
values = $.parseJSON(dataStr), values = JSON.parse(dataStr),
options = { options = {
enableExternalParameterEditor: false, enableExternalParameterEditor: false,
onChange: this.proxy(this.onInspectorDataChange), onChange: this.proxy(this.onInspectorDataChange),
@ -447,7 +447,7 @@
for (var i = 0, len = dataRows.length; i < len; i++) { for (var i = 0, len = dataRows.length; i < len; i++) {
var dataRow = dataRows[i], var dataRow = dataRows[i],
rowData = $.parseJSON(dataRow.getAttribute('data-inspector-values')) rowData = JSON.parse(dataRow.getAttribute('data-inspector-values'))
if (!this.isKeyValueMode()) { if (!this.isKeyValueMode()) {
result.push(rowData) result.push(rowData)
@ -500,7 +500,7 @@
for (var i = 0, len = dataRows.length; i < len; i++) { for (var i = 0, len = dataRows.length; i < len; i++) {
var dataRow = dataRows[i], var dataRow = dataRows[i],
rowData = $.parseJSON(dataRow.getAttribute('data-inspector-values')) rowData = JSON.parse(dataRow.getAttribute('data-inspector-values'))
if (selectedRow == dataRow) { if (selectedRow == dataRow) {
continue continue

4
modules/system/assets/ui/js/inspector.wrapper.base.js
View File

@ -168,7 +168,7 @@
var valuesStr = $.trim($valuesField.val()) var valuesStr = $.trim($valuesField.val())
try { try {
return valuesStr.length === 0 ? {} : $.parseJSON(valuesStr) return valuesStr.length === 0 ? {} : JSON.parse(valuesStr)
} }
catch (err) { catch (err) {
throw new Error('Error parsing Inspector field values. ' + err) throw new Error('Error parsing Inspector field values. ' + err)
@ -338,7 +338,7 @@
} }
try { try {
return $.parseJSON(configuration) return JSON.parse(configuration)
} }
catch(err) { catch(err) {
throw new Error('Error parsing Inspector configuration. ' + err) throw new Error('Error parsing Inspector configuration. ' + err)

10
modules/system/assets/ui/storm-min.js vendored
View File

@ -5097,7 +5097,7 @@ BaseWrapper.prototype.cleanupAfterSwitch=function(){this.switched=true
this.dispose()} this.dispose()}
BaseWrapper.prototype.loadValues=function(configuration){var $valuesField=this.getElementValuesInput() BaseWrapper.prototype.loadValues=function(configuration){var $valuesField=this.getElementValuesInput()
if($valuesField.length>0){var valuesStr=$.trim($valuesField.val()) if($valuesField.length>0){var valuesStr=$.trim($valuesField.val())
try{return valuesStr.length===0?{}:$.parseJSON(valuesStr)} try{return valuesStr.length===0?{}:JSON.parse(valuesStr)}
catch(err){throw new Error('Error parsing Inspector field values. '+err)}} catch(err){throw new Error('Error parsing Inspector field values. '+err)}}
var values={},attributes=this.$element.get(0).attributes var values={},attributes=this.$element.get(0).attributes
for(var i=0,len=attributes.length;i<len;i++){var attribute=attributes[i],matches=[] for(var i=0,len=attributes.length;i<len;i++){var attribute=attributes[i],matches=[]
@ -5134,7 +5134,7 @@ var $form=this.$element.closest('form'),data=this.$element.data(),self=this
$.oc.stripeLoadIndicator.show() $.oc.stripeLoadIndicator.show()
$form.request('onGetInspectorConfiguration',{data:data}).done(function inspectorConfigurationRequestDoneClosure(data){self.onConfigurartionRequestDone(data,result)}).always(function(){$.oc.stripeLoadIndicator.hide()})} $form.request('onGetInspectorConfiguration',{data:data}).done(function inspectorConfigurationRequestDoneClosure(data){self.onConfigurartionRequestDone(data,result)}).always(function(){$.oc.stripeLoadIndicator.hide()})}
BaseWrapper.prototype.parseConfiguration=function(configuration){if(!$.isArray(configuration)&&!$.isPlainObject(configuration)){if($.trim(configuration)===0){return{}} BaseWrapper.prototype.parseConfiguration=function(configuration){if(!$.isArray(configuration)&&!$.isPlainObject(configuration)){if($.trim(configuration)===0){return{}}
try{return $.parseJSON(configuration)} try{return JSON.parse(configuration)}
catch(err){throw new Error('Error parsing Inspector configuration. '+err)}} catch(err){throw new Error('Error parsing Inspector configuration. '+err)}}
else{return configuration}} else{return configuration}}
BaseWrapper.prototype.configurationLoaded=function(configuration){var values=this.loadValues(configuration.properties) BaseWrapper.prototype.configurationLoaded=function(configuration){var values=this.loadValues(configuration.properties)
@ -6009,7 +6009,7 @@ $.oc.foundation.element.addClass(row,'active')
this.createInspectorForRow(row,inspectorContainer)} this.createInspectorForRow(row,inspectorContainer)}
ObjectListEditor.prototype.createInspectorForRow=function(row,inspectorContainer){var dataStr=row.getAttribute('data-inspector-values') ObjectListEditor.prototype.createInspectorForRow=function(row,inspectorContainer){var dataStr=row.getAttribute('data-inspector-values')
if(dataStr===undefined||typeof dataStr!=='string'){throw new Error('Values not found for the selected row.')} if(dataStr===undefined||typeof dataStr!=='string'){throw new Error('Values not found for the selected row.')}
var properties=this.propertyDefinition.itemProperties,values=$.parseJSON(dataStr),options={enableExternalParameterEditor:false,onChange:this.proxy(this.onInspectorDataChange),inspectorClass:this.inspector.options.inspectorClass} var properties=this.propertyDefinition.itemProperties,values=JSON.parse(dataStr),options={enableExternalParameterEditor:false,onChange:this.proxy(this.onInspectorDataChange),inspectorClass:this.inspector.options.inspectorClass}
this.currentRowInspector=new $.oc.inspector.surface(inspectorContainer,properties,values,$.oc.inspector.helpers.generateElementUniqueId(inspectorContainer),options)} this.currentRowInspector=new $.oc.inspector.surface(inspectorContainer,properties,values,$.oc.inspector.helpers.generateElementUniqueId(inspectorContainer),options)}
ObjectListEditor.prototype.disposeInspector=function(){$.oc.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]')) ObjectListEditor.prototype.disposeInspector=function(){$.oc.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]'))
this.currentRowInspector=null} this.currentRowInspector=null}
@ -6054,7 +6054,7 @@ ObjectListEditor.prototype.applyDataToParentInspector=function(){var selectedRow
if(selectedRow){if(!this.validateKeyValue()){return} if(selectedRow){if(!this.validateKeyValue()){return}
if(this.currentRowInspector){if(!this.currentRowInspector.validate()){return}} if(this.currentRowInspector){if(!this.currentRowInspector.validate()){return}}
this.applyDataToRow(selectedRow)} this.applyDataToRow(selectedRow)}
for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=$.parseJSON(dataRow.getAttribute('data-inspector-values')) for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=JSON.parse(dataRow.getAttribute('data-inspector-values'))
if(!this.isKeyValueMode()){result.push(rowData)} if(!this.isKeyValueMode()){result.push(rowData)}
else{var rowKey=rowData[this.propertyDefinition.keyProperty] else{var rowKey=rowData[this.propertyDefinition.keyProperty]
result[rowKey]=this.removeKeyProperty(rowData)}} result[rowKey]=this.removeKeyProperty(rowData)}}
@ -6071,7 +6071,7 @@ if(typeof keyPropertyValue!=='string'){throw new Error('Key property ('+keyPrope
if($.trim(keyPropertyValue).length===0){$.oc.flashMsg({text:'The value of key property '+keyPropertyTitle+' cannot be empty.','class':'error','interval':3}) if($.trim(keyPropertyValue).length===0){$.oc.flashMsg({text:'The value of key property '+keyPropertyTitle+' cannot be empty.','class':'error','interval':3})
return false} return false}
var selectedRow=this.getSelectedRow(),tbody=this.getTableBody(),dataRows=tbody.querySelectorAll('tr[data-inspector-values]') var selectedRow=this.getSelectedRow(),tbody=this.getTableBody(),dataRows=tbody.querySelectorAll('tr[data-inspector-values]')
for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=$.parseJSON(dataRow.getAttribute('data-inspector-values')) for(var i=0,len=dataRows.length;i<len;i++){var dataRow=dataRows[i],rowData=JSON.parse(dataRow.getAttribute('data-inspector-values'))
if(selectedRow==dataRow){continue} if(selectedRow==dataRow){continue}
if(rowData[keyProperty]==keyPropertyValue){$.oc.flashMsg({text:'The value of key property '+keyPropertyTitle+' should be unique.','class':'error','interval':3}) if(rowData[keyProperty]==keyPropertyValue){$.oc.flashMsg({text:'The value of key property '+keyPropertyTitle+' should be unique.','class':'error','interval':3})
return false}} return false}}