diff --git a/tsconfig.json b/tsconfig.json index f5f19ea65..39d74ba01 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -159,6 +159,7 @@ "./apps/tests/pages/page15.ts", "./apps/tests/pages/page16.ts", "./apps/tests/pages/page17.ts", + "./apps/tests/pages/page18.ts", "./apps/tests/pages/page5.ts", "./apps/tests/pages/page6.ts", "./apps/tests/pages/page7.ts", @@ -176,6 +177,9 @@ "./apps/tests/ui-test.ts", "./apps/tests/ui/activity-indicator/activity-indicator-tests.ts", "./apps/tests/ui/bindable-tests.ts", + "./apps/tests/ui/bindingContext_testPage.ts", + "./apps/tests/ui/bindingContext_testPage1.ts", + "./apps/tests/ui/bindingContext_testPage2.ts", "./apps/tests/ui/border/border-tests.ts", "./apps/tests/ui/button/button-tests-native.android.ts", "./apps/tests/ui/button/button-tests-native.d.ts", diff --git a/ui/builder/component-builder.ts b/ui/builder/component-builder.ts index ee1672cf6..afbabad5e 100644 --- a/ui/builder/component-builder.ts +++ b/ui/builder/component-builder.ts @@ -9,6 +9,7 @@ import definition = require("ui/builder/component-builder"); import fs = require("file-system"); import gestures = require("ui/gestures"); import bindingBuilder = require("ui/builder/binding-builder"); +import platform = require("platform"); var EVENT = "Event"; var UI_PATH = "ui/"; @@ -76,6 +77,13 @@ export function getComponentModule(elementName: string, namespace: string, attri var attrValue = attributes[attr]; + if (attr.indexOf(":") !== -1){ + var platformName = attr.split(":")[0].trim(); + if(platformName.toLowerCase() !== platform.device.os.toLowerCase()) { + continue; + } + } + if (attr.indexOf(".") !== -1) { var subObj = instance; var properties = attr.split(".");