javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #921 from NativeScript/nnikolov/PropertyAccessorsThreatedAsExpressions

Browse Source 
Fixed index property accessors are treated as expressions.
This commit is contained in:
Nedyalko Nikolov
2015-10-13 08:38:47 +03:00
parent e19779d7ec d6e0a2b598
commit ffa147fdeb
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/builder/binding-builder.ts
View File

@ -1,5 +1,5 @@
// regex that contains all symbols applicable for expression used to AI detect an expression.
var expressionSymbolsRegex = /[ \+\-\*%\?:<>=!\|&\(\)\[\]^~]/;
var expressionSymbolsRegex = /[\+\-\*\/%\?:<>=!\|&\(\)^~]/;
export module bindingConstants {
export var sourceProperty = "sourceProperty";

21
ui/core/bindable.ts
View File

@ -195,8 +195,27 @@ export class Binding {
}
private static getProperties(property: string): Array<string> {
var result: Array<string>;
if (property) {
return property.split(".");
// first replace all '$parents[..]' with a safe string
// second removes all ] since they are not important for property access and not needed
// then split properties either on '.' or '['
var parentsMatches = property.match(bindingBuilder.parentsRegex);
result = property.replace(bindingBuilder.parentsRegex, "parentsMatch")
.replace(/\]/g, "")
.split(/\.|\[/);
var i;
var resultLength = result.length;
var parentsMatchesCounter = 0;
for (i = 0; i < resultLength; i++) {
if (result[i] === "parentsMatch") {
result[i] = parentsMatches[parentsMatchesCounter];
parentsMatchesCounter++;
}
}
return result;
}
else {
return [];