Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
KlausSchaefers committed Jun 13, 2024
1 parent bfd3d7b commit f584e96
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
4 changes: 1 addition & 3 deletions src/canvas/toolbar/components/Rule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export default {
input.setValue(rule.databinding)
input.setHints(options);
this.tempOwn(on(input, "change", lang.hitch(this, "setDataBinding")));
window.requestAnimationFrame(() => input.focus())
setTimeout(() => input.focus(), 100)
}
},
Expand Down Expand Up @@ -398,8 +398,6 @@ export default {
if(this.widgetOutputTypes[widget.type] && !_ids[widget.id]){
result.push({"value" : widget.id, label:widget.name});
_ids[widget.id] = true;
} else {
console.warn("getUIWidgets() > No widget with id : " , id);
}
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/canvas/toolbar/mixins/_Render.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
hasPadding : ["Button", "DateDropDown", "DropDown", "TypeAheadTextBox", "MobileDropDown", "Label", "TextBox", 'LockSlider',
"TextArea", "Password", "SegmentButton", "SegmentPicker", "ToggleButton", "Table", 'Tree',
'VerticalNavigation', 'Paging', 'LabeledTextBox', 'NavBar', 'NavMenu', 'LabeledTextArea',
'SortableList', 'RadioTable', 'DragNDropTarget'],
'SortableList', 'RadioTable', 'DragNDropTarget', 'Upload'],
hasData : ["ToggleButton", "DateDropDown", "SegmentButton", "SegmentPicker", "DropDown", "MobileDropDown", "TextBox", "TextArea", "Password",
"CheckBox", "RadioBox", "RadioBox2", "HSlider", "Spinner", "Switch", "DragNDrop", "Date", "DateDropDown", "Icon", "Table", "Rating",
Expand Down
8 changes: 6 additions & 2 deletions src/canvas/toolbar/mixins/_Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ export default {
showTemplate (widget){
css.remove(this.templateDiv, "MatcToolbarSectionHidden");
const btn = this.$refs.templateBTN
btn.setWidget(widget)
setTimeout(() => {
const btn = this.$refs.templateBTN
if (btn) {
btn.setWidget(widget)
}
}, 30)
},
showTemplateMerge () {
Expand Down
2 changes: 1 addition & 1 deletion src/nls/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
"hotspot": "Hotspot",
"logic": "Logic",
"rest": "Web Service",
"or": "Or Conenctor",
"or": "Or Connector",
"ab": "AB Test",
"script": "Script",
"vector": "Vector",
Expand Down
4 changes: 3 additions & 1 deletion src/themes/wireframe/upload.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"padding": true
},
"actions": {},
"style": {}
"style": {
"verticalAlign": "middle"
}
}
]

0 comments on commit f584e96

Please sign in to comment.