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

Jump to bottom

[ALOY-1646] Add support for platform specific namespaces for xml attributes #922

Merged
merged 8 commits into from
Mar 29, 2019
Merged

[ALOY-1646] Add support for platform specific namespaces for xml attributes #922

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3004acf
Merge remote-tracking branch 'upstream/master'
brentonhouse Jan 22, 2019
9d7f80a
Merge remote-tracking branch 'upstream/master'
brentonhouse Mar 7, 2019
a84b61b
added support for platform specific namespaces for xml attributes
brentonhouse Mar 7, 2019
d281ff1
Merge remote-tracking branch 'upstream/master' into ALOY-1646
brentonhouse Mar 28, 2019
620a974
moved logic to compilerUtils
brentonhouse Mar 28, 2019
0b549a0
fixed attrName
brentonhouse Mar 28, 2019
a872ff8
fixed issues with platform attributes
brentonhouse Mar 28, 2019
54c5a26
Update Alloy/commands/compile/compilerUtils.js
ewanharris Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion Alloy/commands/compile/compilerUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,18 @@ exports.getParserArgs = function(node, state, opts) {
});
} else {
var theValue = node.getAttribute(attrName);

// find platform specific attributes
var attributeParts = attrName.split(':');
if ( attributeParts.length === 2 && _.includes(CONST.PLATFORMS, attributeParts[0])) {
// if this attribute is for this platform, create it without namespace.
if ( attributeParts[0] === compilerConfig.alloyConfig.platform ) {
attrName = attributeParts[1];
} else {
return;
}
}

if (/(^|\+)\s*(?:(?:Ti|Titanium|Alloy.Globals|Alloy.CFG)\.|L\(.+\)\s*$)/.test(theValue)) {
var match = theValue.match(/^\s*L\([^'"]+\)\s*$/);
if (match !== null) {
Expand All @@ -220,7 +232,6 @@ exports.getParserArgs = function(node, state, opts) {
theValue = styler.STYLE_EXPR_PREFIX + theValue;
}


if (attrName === 'class') {
if (autoStyle) {
createArgs[CONST.CLASS_PROPERTY] = theValue.split(/\s+/) || [];
Expand Down