From 0dcb0c9b36269a1440698744e014c12fffc9ad13 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 18 Jul 2016 14:24:15 +0300
Subject: [PATCH] Remove the _originalBindingContext caching

---
 tns-core-modules/ui/page/page-common.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/tns-core-modules/ui/page/page-common.ts b/tns-core-modules/ui/page/page-common.ts
index be89f004e..e85b228c6 100644
--- a/tns-core-modules/ui/page/page-common.ts
+++ b/tns-core-modules/ui/page/page-common.ts
@@ -9,6 +9,7 @@ import * as fileSystemModule from "file-system";
 import * as frameModule from "ui/frame";
 import proxy = require("ui/core/proxy");
 import keyframeAnimation = require("ui/animation/keyframe-animation");
+import types = require("utils/types");
 
 let fs: typeof fileSystemModule;
 function ensureFS() {
@@ -199,13 +200,11 @@ export class Page extends ContentView implements dts.Page {
         };
     }
 
-    private _originalBindingContext: any;
     public onNavigatingTo(context: any, isBackNavigation: boolean) {
         this._navigationContext = context;
         
         //https://github.com/NativeScript/NativeScript/issues/731
-        if (!isBackNavigation && context && this.bindingContext !== context){
-            this._originalBindingContext = this.bindingContext;
+        if (!isBackNavigation && !types.isNullOrUndefined(context)){
             this.bindingContext = context;
         }
         this.notify(this.createNavigatedData(Page.navigatingToEvent, isBackNavigation));
@@ -223,12 +222,6 @@ export class Page extends ContentView implements dts.Page {
         this.notify(this.createNavigatedData(Page.navigatedFromEvent, isBackNavigation));
 
         this._navigationContext = undefined;
-        
-        //https://github.com/NativeScript/NativeScript/issues/731
-        if (isBackNavigation && this._originalBindingContext && this.bindingContext !== this._originalBindingContext){
-            this.bindingContext = this._originalBindingContext;
-            this._originalBindingContext = undefined;
-        }
     }
 
     public showModal(): Page {