javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in edit-text.android

Browse Source 
Fix fromObjectRecursive to doesn't override source object
This commit is contained in:
Hristo Hristov
2018-01-11 13:25:03 +02:00
parent 82f081d603
commit 18fe9392d6
5 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tns-core-modules/data/observable/observable.ts
View File

@@ -188,7 +188,7 @@ class ObservableFromObject extends Observable {
public get(name: string): any {
return this._map[name];
}
public set(name: string, value: any) {
const currentValue = this._map[name];
if (currentValue === value) {
@@ -218,13 +218,17 @@ function addPropertiesFromObject(observable: ObservableFromObject, source: any,
let isRecursive = recursive;
for (let prop in source) {
if (source.hasOwnProperty(prop)) {
if (isRecursive) {
if (!Array.isArray(source[prop]) && source[prop] && typeof source[prop] === 'object' && !(source[prop] instanceof Observable)) {
source[prop] = fromObjectRecursive(source[prop]);
}
let value = source[prop];
if (isRecursive
&& !Array.isArray(value)
&& value
&& typeof value === 'object'
&& !(value instanceof Observable)) {
value = fromObjectRecursive(value);
}
defineNewProperty(observable, prop);
observable.set(prop, source[prop]);
observable.set(prop, value);
}
}
}