Added some checks for binding infrastructure.

Nedyalko Nikolov · Nedyalko Nikolov · commit a44c9f9aa6cb · 2015-11-25T08:51:36.000+02:00
diff --git a/ui/core/bindable.ts b/ui/core/bindable.ts
@@ -258,9 +258,9 @@ export class Binding {
             }
             result.push({ instance: currentObject, property: objProp });
             if (!currentObjectChanged) {
-                currentObject = currentObject[propsArray[i]];
-                currentObjectChanged = false;
+                currentObject = currentObject ? currentObject[propsArray[i]] : null;
             }
+            currentObjectChanged = false;
         }
         return result;
     }
@@ -273,7 +273,7 @@ export class Binding {
             for (i = 0; i < objectsAndPropertiesLength; i++) {
                 var prop = objectsAndProperties[i].property;
                 var currentObject = objectsAndProperties[i].instance;
-                if (!this.propertyChangeListeners[prop] && currentObject instanceof observable.Observable) {
+                if (currentObject && !this.propertyChangeListeners[prop] && currentObject instanceof observable.Observable) {
                     weakEvents.addWeakEventListener(
                         currentObject,
                         observable.Observable.propertyChangeEvent,
@@ -563,14 +563,14 @@ export class Binding {
         if (objectsAndProperties.length > 0) {
             var resolvedObj = objectsAndProperties[objectsAndProperties.length - 1].instance;
             var prop = objectsAndProperties[objectsAndProperties.length - 1].property;
-            return {
-                instance: new WeakRef(resolvedObj),
-                property: prop
+            if (resolvedObj) {
+                return {
+                    instance: new WeakRef(resolvedObj),
+                    property: prop
+                }
             }
         }
-        else {
-            return null;
-        }
+        return null;
     }
 
     private updateOptions(options: { instance: WeakRef<any>; property: any }, value: any) {
diff --git a/ui/list-view/list-view.ios.ts b/ui/list-view/list-view.ios.ts
@@ -206,6 +206,7 @@ export class ListView extends common.ListView {
         this._ios.registerClassForCellReuseIdentifier(ListViewCell.class(), CELLIDENTIFIER);
         this._ios.autoresizingMask = UIViewAutoresizing.UIViewAutoresizingNone;
         this._ios.estimatedRowHeight = DEFAULT_HEIGHT;
+        this._ios.rowHeight = UITableViewAutomaticDimension;
         this._ios.dataSource = this._dataSource = DataSource.initWithOwner(new WeakRef(this));
         this._delegate = UITableViewDelegateImpl.initWithOwner(new WeakRef(this));
         this._heights = new Array<number>();

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,9 @@ export class Binding {`
`258`	`258`	`}`
`259`	`259`	`result.push({ instance: currentObject, property: objProp });`
`260`	`260`	`if (!currentObjectChanged) {`
`261`		`- currentObject = currentObject[propsArray[i]];`
`262`		`- currentObjectChanged = false;`
	`261`	`+ currentObject = currentObject ? currentObject[propsArray[i]] : null;`
`263`	`262`	`}`
	`263`	`+ currentObjectChanged = false;`
`264`	`264`	`}`
`265`	`265`	`return result;`
`266`	`266`	`}`
`@@ -273,7 +273,7 @@ export class Binding {`
`273`	`273`	`for (i = 0; i < objectsAndPropertiesLength; i++) {`
`274`	`274`	`var prop = objectsAndProperties[i].property;`
`275`	`275`	`var currentObject = objectsAndProperties[i].instance;`
`276`		`- if (!this.propertyChangeListeners[prop] && currentObject instanceof observable.Observable) {`
	`276`	`+ if (currentObject && !this.propertyChangeListeners[prop] && currentObject instanceof observable.Observable) {`
`277`	`277`	`weakEvents.addWeakEventListener(`
`278`	`278`	`currentObject,`
`279`	`279`	`observable.Observable.propertyChangeEvent,`
`@@ -563,14 +563,14 @@ export class Binding {`
`563`	`563`	`if (objectsAndProperties.length > 0) {`
`564`	`564`	`var resolvedObj = objectsAndProperties[objectsAndProperties.length - 1].instance;`
`565`	`565`	`var prop = objectsAndProperties[objectsAndProperties.length - 1].property;`
`566`		`- return {`
`567`		`- instance: new WeakRef(resolvedObj),`
`568`		`- property: prop`
	`566`	`+ if (resolvedObj) {`
	`567`	`+ return {`
	`568`	`+ instance: new WeakRef(resolvedObj),`
	`569`	`+ property: prop`
	`570`	`+ }`
`569`	`571`	`}`
`570`	`572`	`}`
`571`		`- else {`
`572`		`- return null;`
`573`		`- }`
	`573`	`+ return null;`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`private updateOptions(options: { instance: WeakRef<any>; property: any }, value: any) {`