From ed0969d96da72d2e976c16ec2623c84e28f572a4 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Tue, 3 Jan 2017 09:50:05 +0200
Subject: [PATCH] Revert "Fix: Trying to clear inherited props after the view
 has been detached throws"

This reverts commit f64f74fb7b61d16fc7c6624b7d9e02bb430b3197.
---
 tns-core-modules/ui/core/view-base.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tns-core-modules/ui/core/view-base.ts b/tns-core-modules/ui/core/view-base.ts
index 9ee34affc..de5cbc37a 100644
--- a/tns-core-modules/ui/core/view-base.ts
+++ b/tns-core-modules/ui/core/view-base.ts
@@ -424,7 +424,6 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
             throw new Error("View not added to this instance. View: " + view + " CurrentParent: " + view.parent + " ExpectedParent: " + this);
         }
 
-        clearInheritedProperties(view);
         this._removeViewCore(view);
         view.parent = undefined;
         view._parentChanged(this);
@@ -474,6 +473,10 @@ export class ViewBase extends Observable implements ViewBaseDefinition {
 
     public _parentChanged(oldParent: ViewBase): void {
         //Overridden
+        if (oldParent) {
+            // Move these method in property class.
+            clearInheritedProperties(this);
+        }
     }
 
     public _registerAnimation(animation: KeyframeAnimation) {