Skip to content

Commit

Permalink
Rename q.options => q.creatorOptions fix #5308 (#5324)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewtelnov committed Mar 12, 2024
1 parent d6dc0e8 commit 6c0efcc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/survey-creator-core/src/property-grid/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ export class PropertyJSONGenerator {
var prop = props[q.name];
q.property = prop;
q.obj = this.obj;
q.options = this.options;
q.creatorOptions = this.options;
const eventVisibility = this.getVisibilityOnEvent(prop);
q.readOnly = q.readOnly || this.isPropertyReadOnly(prop);
q.visible = q.visible && eventVisibility;
Expand Down
8 changes: 4 additions & 4 deletions packages/survey-creator-core/src/property-grid/matrices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,13 @@ export abstract class PropertyGridEditorMatrix extends PropertyGridEditor {
row: MatrixDropdownRowModelBase,
panel: PanelModel
) => {
new PropertyJSONGenerator(row.editingObj, q.options,
new PropertyJSONGenerator(row.editingObj, q.creatorOptions,
q.obj, q.property, propGridDefinition
).setupObjPanel(panel, true);
};
matrix.allowRowsDragAndDrop = this.getAllowRowDragDrop(prop) && !matrix.isReadOnly;
if (!!q.options) {
this.setupUsingOptions(obj, matrix, q.options, prop);
if (!!q.creatorOptions) {
this.setupUsingOptions(obj, matrix, q.creatorOptions, prop);
}
if (!!prop.uniquePropertyName) {
const column = matrix.getColumnByName(prop.uniquePropertyName);
Expand All @@ -325,7 +325,7 @@ export abstract class PropertyGridEditorMatrix extends PropertyGridEditor {
var newObj = Serializer.createClass(prop.className);
if (!newObj) return true;
var panel = new PanelModel("");
new PropertyJSONGenerator(newObj, (<any>matrix).options, (<any>matrix).obj,
new PropertyJSONGenerator(newObj, (<any>matrix).creatorOptions, (<any>matrix).obj,
prop, propGridDefinition
).setupObjPanel(panel, true);
return panel.elements.length > 0;
Expand Down

0 comments on commit 6c0efcc

Please sign in to comment.