diff --git a/apps/app/ui-tests-app/css/all-non-uniform-border.css b/apps/app/ui-tests-app/css/all-non-uniform-border.css
new file mode 100644
index 000000000..686b78eaa
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-non-uniform-border.css
@@ -0,0 +1,6 @@
+.s0 {
+ border-width: 1 2 5 10; border-color: red green blue yellow;
+ width: 100;
+ height: 100;
+ font-size: 10;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-non-uniform-border.xml b/apps/app/ui-tests-app/css/all-non-uniform-border.xml
new file mode 100644
index 000000000..4fa204ff7
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-non-uniform-border.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-uniform-border.css b/apps/app/ui-tests-app/css/all-uniform-border.css
new file mode 100644
index 000000000..80a348e33
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-uniform-border.css
@@ -0,0 +1,6 @@
+.s0 {
+ border-width: 5; border-color: red; border-radius: 5;
+ width: 100;
+ height: 100;
+ font-size: 10;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-uniform-border.xml b/apps/app/ui-tests-app/css/all-uniform-border.xml
new file mode 100644
index 000000000..4fa204ff7
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-uniform-border.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
index 9442ebfc0..20c6db6d6 100644
--- a/apps/app/ui-tests-app/css/main-page.ts
+++ b/apps/app/ui-tests-app/css/main-page.ts
@@ -34,6 +34,8 @@ export function pageLoaded(args: EventData) {
examples.set("image-border", "css/image-border");
examples.set("layouts-border-overlap", "css/layouts-border-overlap");
examples.set("measure-tests", "css/measure-tests");
+ examples.set("all-uniform-border", "css/all-uniform-border");
+ examples.set("all-non-uniform-border", "css/all-non-uniform-border");
//examples.set("border-playground", "css/border-playground");
let viewModel = new SubMianPageViewModel(wrapLayout, examples);
diff --git a/tns-core-modules/ui/progress/progress.android.ts b/tns-core-modules/ui/progress/progress.android.ts
index 6a98e14c3..a2c1efb42 100644
--- a/tns-core-modules/ui/progress/progress.android.ts
+++ b/tns-core-modules/ui/progress/progress.android.ts
@@ -78,21 +78,6 @@ export class ProgressStyler implements style.Styler {
ProgressStyler.setBackgroundAndBorderProperty,
ProgressStyler.resetBackgroundAndBorderProperty), "Progress");
- style.registerHandler(style.borderTopColorProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderRightColorProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderBottomColorProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderLeftColorProperty, style.ignorePropertyHandler, "Progress");
-
- style.registerHandler(style.borderTopWidthProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderRightWidthProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderBottomWidthProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderLeftWidthProperty, style.ignorePropertyHandler, "Progress");
-
- style.registerHandler(style.borderTopLeftRadiusProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderTopRightRadiusProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderBottomRightRadiusProperty, style.ignorePropertyHandler, "Progress");
- style.registerHandler(style.borderBottomLeftRadiusProperty, style.ignorePropertyHandler, "Progress");
-
style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Progress");
}
}
diff --git a/tns-core-modules/ui/progress/progress.ios.ts b/tns-core-modules/ui/progress/progress.ios.ts
index 2e4e07755..07e576abb 100644
--- a/tns-core-modules/ui/progress/progress.ios.ts
+++ b/tns-core-modules/ui/progress/progress.ios.ts
@@ -76,6 +76,8 @@ export class ProgressStyler implements style.Styler {
ProgressStyler.setBackgroundColorProperty,
ProgressStyler.resetBackgroundColorProperty,
ProgressStyler.getBackgroundColorProperty), "Progress");
+
+ style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Progress");
}
}
diff --git a/tns-core-modules/ui/search-bar/search-bar.android.ts b/tns-core-modules/ui/search-bar/search-bar.android.ts
index 4abbada43..401efbbaf 100644
--- a/tns-core-modules/ui/search-bar/search-bar.android.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.android.ts
@@ -278,6 +278,8 @@ export class SearchBarStyler implements style.Styler {
SearchBarStyler.setFontInternalProperty,
SearchBarStyler.resetFontInternalProperty,
SearchBarStyler.getNativeFontInternalValue), "SearchBar");
+
+ style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "SearchBar");
}
private static _getSearchViewTextView(bar: android.widget.SearchView): android.widget.TextView {
diff --git a/tns-core-modules/ui/search-bar/search-bar.ios.ts b/tns-core-modules/ui/search-bar/search-bar.ios.ts
index 6a4b80cd8..3fef83fe9 100644
--- a/tns-core-modules/ui/search-bar/search-bar.ios.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.ios.ts
@@ -239,6 +239,8 @@ export class SearchBarStyler implements style.Styler {
SearchBarStyler.setFontInternalProperty,
SearchBarStyler.resetFontInternalProperty,
SearchBarStyler.getNativeFontInternalValue), "SearchBar");
+
+ style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "SearchBar");
}
}
diff --git a/tns-core-modules/ui/slider/slider.android.ts b/tns-core-modules/ui/slider/slider.android.ts
index fecd5a3d9..12c047d87 100644
--- a/tns-core-modules/ui/slider/slider.android.ts
+++ b/tns-core-modules/ui/slider/slider.android.ts
@@ -127,21 +127,6 @@ export class SliderStyler implements style.Styler {
SliderStyler.setBackgroundAndBorderProperty,
SliderStyler.resetBackgroundAndBorderProperty), "Slider");
- style.registerHandler(style.borderTopColorProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderRightColorProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderBottomColorProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderLeftColorProperty, style.ignorePropertyHandler, "Slider");
-
- style.registerHandler(style.borderTopWidthProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderRightWidthProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderBottomWidthProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderLeftWidthProperty, style.ignorePropertyHandler, "Slider");
-
- style.registerHandler(style.borderTopLeftRadiusProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderTopRightRadiusProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderBottomRightRadiusProperty, style.ignorePropertyHandler, "Slider");
- style.registerHandler(style.borderBottomLeftRadiusProperty, style.ignorePropertyHandler, "Slider");
-
style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Slider");
}
}
diff --git a/tns-core-modules/ui/switch/switch.android.ts b/tns-core-modules/ui/switch/switch.android.ts
index 0049e98ae..efbc13511 100644
--- a/tns-core-modules/ui/switch/switch.android.ts
+++ b/tns-core-modules/ui/switch/switch.android.ts
@@ -81,21 +81,6 @@ export class SwitchStyler implements style.Styler {
SwitchStyler.setBackgroundAndBorderProperty,
SwitchStyler.resetBackgroundAndBorderProperty), "Switch");
- style.registerHandler(style.borderTopColorProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderRightColorProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderBottomColorProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderLeftColorProperty, style.ignorePropertyHandler, "Switch");
-
- style.registerHandler(style.borderTopWidthProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderRightWidthProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderBottomWidthProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderLeftWidthProperty, style.ignorePropertyHandler, "Switch");
-
- style.registerHandler(style.borderTopLeftRadiusProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderTopRightRadiusProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderBottomRightRadiusProperty, style.ignorePropertyHandler, "Switch");
- style.registerHandler(style.borderBottomLeftRadiusProperty, style.ignorePropertyHandler, "Switch");
-
style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Switch");
}
}
diff --git a/tns-core-modules/ui/switch/switch.ios.ts b/tns-core-modules/ui/switch/switch.ios.ts
index fcb9f5eee..959a52b8c 100644
--- a/tns-core-modules/ui/switch/switch.ios.ts
+++ b/tns-core-modules/ui/switch/switch.ios.ts
@@ -107,7 +107,6 @@ export class SwitchStyler implements style.Styler {
SwitchStyler.resetBackgroundColorProperty,
SwitchStyler.getBackgroundColorProperty), "Switch");
- // Ignore the default backgroundInternalProperty handler
style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Switch");
}
}