Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow using widget as primary control in XML View #949

Merged
merged 6 commits into from
Apr 27, 2020
Merged

fix: allow using widget as primary control in XML View #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3004acf
Merge remote-tracking branch 'upstream/master'
brentonhouse Jan 22, 2019
10fc51d
add support for getting view from widget/require elements
brentonhouse Dec 17, 2019
47c2144
Merge remote-tracking branch 'upstream/master' into root-issue
brentonhouse Dec 18, 2019
ed44c6d
change how parent is set
brentonhouse Dec 19, 2019
26d106c
changed indentation to fix build
brentonhouse Jan 22, 2020
5d4889e
add support for widgets in tabs
brentonhouse Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Alloy/commands/compile/parsers/Alloy.Require.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,24 @@ function parse(node, state, args) {
type === 'widget' ? 'Alloy.Widget' : 'Alloy.Require',
args.createArgs,
state
) + ');\n';
if (args.parent.symbol && !state.templateObject && !state.androidMenu) {
code += args.symbol + '.setParent(' + args.parent.symbol + ');\n';
) + ')';
let parent = { symbol: args.symbol };
if (args.parent.symbol && !state.templateObject && !state.androidMenu && !state.insideContainer) {
code += ';\n' + args.symbol + '.setParent(' + args.parent.symbol + ');\n';
parent = {
symbol: args.symbol + '.getViewEx({recurse:true})'
};
} else if ( state.insideContainer ) {
code += ';\n';
parent = {
symbol: args.symbol + '.getViewEx({recurse:true})'
};
} else {
code += '.getViewEx({recurse:true});\n';
}

return {
parent: {
symbol: args.symbol + '.getViewEx({recurse:true})'
},
parent: parent,
controller: args.symbol,
styles: state.styles,
code: code
Expand Down
1 change: 1 addition & 0 deletions Alloy/commands/compile/parsers/Ti.UI.Tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function parse(node, state, args) {
if (theNode) {
code += CU.generateNodeExtended(child, state, {
parent: {},
insideContainer: true,
post: function(node, state, args) {
windowSymbol = state.parent.symbol;
}
Expand Down