From b45718b1ef31acc22687aa5474aaac34a3cf15d6 Mon Sep 17 00:00:00 2001
From: Nedyalko Nikolov <nedyalko.nikolov@telerik.com>
Date: Tue, 14 Jul 2015 14:47:40 +0300
Subject: [PATCH 1/3] BindingContext set two times on adding item to ListView.
 Fixes issue #410.

---
 apps/tests/ui/list-view/list-view-tests.ts | 27 ++++++++++++++++++++++
 ui/core/view-common.ts                     | 10 ++++----
 ui/core/view.d.ts                          |  2 ++
 ui/list-view/list-view-common.ts           |  5 ++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts
index e7053a84a..1f16e0e1e 100644
--- a/apps/tests/ui/list-view/list-view-tests.ts
+++ b/apps/tests/ui/list-view/list-view-tests.ts
@@ -580,6 +580,33 @@ export function test_bindingToParentObjectWithSpacesInIndexer() {
     helper.buildUIAndRunTest(listView, testAction);
 }
 
+export function test_ConverterIsCalledJustOnce_onAddingItemsToListView() {
+    var listView = new listViewModule.ListView();
+    var converterCalledCounter = 0;
+
+    var testConverter = function (value) {
+        converterCalledCounter++;
+        return value;
+    }
+
+    app.resources["testConverter"] = testConverter;
+
+    function testAction(views: Array<viewModule.View>) {
+        var listViewModel = new observable.Observable();
+        listViewModel.set("items", [1, 2, 3]);
+        listView.bindingContext = listViewModel;
+
+        listView.bind({ sourceProperty: "items", targetProperty: "items" });
+        listView.itemTemplate = "<Label id=\"testLabel\" text=\"{{ $value, $value | testConverter }}\" />";
+
+        TKUnit.wait(ASYNC);
+
+        TKUnit.assertEqual(converterCalledCounter, listViewModel.get("items").length, "Converter should be called once for every item.");
+    }
+
+    helper.buildUIAndRunTest(listView, testAction);
+}
+
 export function test_no_memory_leak_when_items_is_regular_array() {
     var createFunc = function (): listViewModule.ListView {
         var listView = new listViewModule.ListView();
diff --git a/ui/core/view-common.ts b/ui/core/view-common.ts
index 8e63e4621..32d02702b 100644
--- a/ui/core/view-common.ts
+++ b/ui/core/view-common.ts
@@ -829,9 +829,7 @@ export class View extends proxy.ProxyObject implements definition.View {
      * Method is intended to be overridden by inheritors and used as "protected"
      */
     public _addViewCore(view: View) {
-        view._setValue(bindable.Bindable.bindingContextProperty, this.bindingContext, dependencyObservable.ValueSource.Inherited);
-
-        view._inheritProperties(this);
+        this._propagateInheritableProperties(view);
 
         view.style._inheritStyleProperties();
 
@@ -845,7 +843,11 @@ export class View extends proxy.ProxyObject implements definition.View {
         }
     }
 
-    private _inheritProperties(parentView: View) {
+    public _propagateInheritableProperties(view: View) {
+        view._inheritProperties(this);
+    }
+
+    public _inheritProperties(parentView: View) {
         var that = this;
         var inheritablePropertySetCallback = function (property: dependencyObservable.Property) {
             if (property instanceof styling.Property) {
diff --git a/ui/core/view.d.ts b/ui/core/view.d.ts
index b2011359a..0d6997fcb 100644
--- a/ui/core/view.d.ts
+++ b/ui/core/view.d.ts
@@ -409,6 +409,8 @@ declare module "ui/core/view" {
         isLoaded: boolean;
 
         _addView(view: View);
+        _propagateInheritableProperties(view: View)
+        _inheritProperties(parentView: View)
         _removeView(view: View);
         _context: android.content.Context;
 
diff --git a/ui/list-view/list-view-common.ts b/ui/list-view/list-view-common.ts
index 164b8a172..04c2c3f29 100644
--- a/ui/list-view/list-view-common.ts
+++ b/ui/list-view/list-view-common.ts
@@ -114,6 +114,7 @@ export class ListView extends view.View implements definition.ListView {
     public _prepareItem(item: view.View, index: number) {
         if (item) {
             item.bindingContext = this._getDataItem(index);
+            item._inheritProperties(this);
         }
     }
 
@@ -145,4 +146,8 @@ export class ListView extends view.View implements definition.ListView {
     private _onItemsChanged(args: observable.EventData) {
         this.refresh();
     }
+
+    public _propagateInheritableProperties(view: view.View) {
+        // do not get binding context from parent when adding items, since the binding context of the items will be different.
+    }
 }
\ No newline at end of file

From d78929afebb3f2ab7f68349cf981c370720eb4bd Mon Sep 17 00:00:00 2001
From: Nedyalko Nikolov <nedyalko.nikolov@telerik.com>
Date: Wed, 15 Jul 2015 15:39:49 +0300
Subject: [PATCH 2/3] Test reworked due to some limitations in ios 7.

---
 apps/tests/ui/list-view/list-view-tests.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts
index 1f16e0e1e..704657e54 100644
--- a/apps/tests/ui/list-view/list-view-tests.ts
+++ b/apps/tests/ui/list-view/list-view-tests.ts
@@ -5,6 +5,7 @@ import viewModule = require("ui/core/view");
 import observable = require("data/observable");
 import types = require("utils/types");
 import platform = require("platform");
+import utils = require("utils/utils");
 
 // <snippet module="ui/list-view" title="list-view">
 // # ListView
@@ -601,7 +602,12 @@ export function test_ConverterIsCalledJustOnce_onAddingItemsToListView() {
 
         TKUnit.wait(ASYNC);
 
-        TKUnit.assertEqual(converterCalledCounter, listViewModel.get("items").length, "Converter should be called once for every item.");
+        if (utils.ios.MajorVersion < 8) {
+            TKUnit.assertEqual(converterCalledCounter, listViewModel.get("items").length * 2, "Converter should be called once for every item.");
+        }
+        else {
+            TKUnit.assertEqual(converterCalledCounter, listViewModel.get("items").length, "Converter should be called once for every item.");
+        }
     }
 
     helper.buildUIAndRunTest(listView, testAction);

From b3414e29fc01206b7cbe56dda89599265f18e473 Mon Sep 17 00:00:00 2001
From: Nedyalko Nikolov <nedyalko.nikolov@telerik.com>
Date: Wed, 15 Jul 2015 18:04:41 +0300
Subject: [PATCH 3/3] Fixed test for android.

---
 apps/tests/ui/list-view/list-view-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts
index 704657e54..2ae38aeb4 100644
--- a/apps/tests/ui/list-view/list-view-tests.ts
+++ b/apps/tests/ui/list-view/list-view-tests.ts
@@ -602,7 +602,7 @@ export function test_ConverterIsCalledJustOnce_onAddingItemsToListView() {
 
         TKUnit.wait(ASYNC);
 
-        if (utils.ios.MajorVersion < 8) {
+        if (utils.ios && utils.ios.MajorVersion < 8) {
             TKUnit.assertEqual(converterCalledCounter, listViewModel.get("items").length * 2, "Converter should be called once for every item.");
         }
         else {