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

Renamed and moved to module Observable creation functions.

Browse Source
This commit is contained in:
Nedyalko Nikolov
2016-08-24 15:37:46 +03:00
parent fd552d4e84
commit b9385fc4cd
4 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/data/observable-tests.ts
View File

@ -529,7 +529,7 @@ export function test_CorrectPropertyValueAfterUsingWrappedValue() {
export function test_NestedObservablesWithObservableArrayShouldNotCrash() {
let someObservableArray = new ObservableArray<any>();
let testObservable = observable.Observable.fromJSONRecursive({
let testObservable = observable.fromObjectRecursive({
firstProp: "test string",
secondProp: someObservableArray
});

6
tests/app/ui/bindable-tests.ts
View File

@ -1265,7 +1265,7 @@ export function test_only_Bindable_BindingContext_Null_DoesNotThrow() {
export function test_Observable_from_nested_json_binds_correctly() {
let expectedValue = "Test";
let model = observable.Observable.fromJSONRecursive({
let model = observable.fromObjectRecursive({
"firstObject": {
"secondObject": {
"dummyProperty": "text"
@ -1286,7 +1286,7 @@ export function test_Observable_from_nested_json_binds_correctly() {
export function test_Observable_from_nested_json_binds_correctly_when_upper_object_is_changed() {
let expectedValue = "Test";
let model = observable.Observable.fromJSONRecursive({
let model = observable.fromObjectRecursive({
"firstObject": {
"secondObject": {
"dummyProperty": "text"
@ -1320,7 +1320,7 @@ export function test_BindingToBindingContextProperty_ShouldUseNewContext() {
targetProperty: 'text'
});
let testBindingContext = observable.Observable.fromJSONRecursive({
let testBindingContext = observable.fromObjectRecursive({
context: {
text: 'Alabala'
}

24
tns-core-modules/data/observable/observable.d.ts vendored
View File

@ -70,17 +70,6 @@ declare module "data/observable" {
*/
public static propertyChangeEvent: string;
/**
* Creates an Observable instance and sets its properties according to the supplied JSON object.
*/
public static fromJSON(json: any): Observable;
/**
* Creates an Observable instance and sets its properties according to the supplied JSON object.
* This function will create new Observable for each nested object (expect arrays and functions) from supplied JSON.
*/
public static fromJSONRecursive(json: any): Observable;
/**
* [Deprecated please use static functions fromJSON or fromJSONRecursive instead] Creates an Observable instance and sets its properties according to the supplied JSON object.
*/
@ -161,4 +150,17 @@ declare module "data/observable" {
_emit(eventNames: string);
//@endprivate
}
/**
* Creates an Observable instance and sets its properties according to the supplied JavaScript object.
* param obj - A JavaScript object used to initialize nativescript Observable instance.
*/
export function fromObject(obj: any): Observable;
/**
* Creates an Observable instance and sets its properties according to the supplied JavaScript object.
* This function will create new Observable for each nested object (expect arrays and functions) from supplied JavaScript object.
* param obj - A JavaScript object used to initialize nativescript Observable instance.
*/
export function fromObjectRecursive(obj: any): Observable;
}

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

@ -47,45 +47,17 @@ var _wrappedValues = [
export class Observable implements definition.Observable {
public static propertyChangeEvent = "propertyChange";
private _map: Map<string, Object>;
_map: Map<string, Object>;
private _observers = {};
public static fromJSON(json: any): Observable {
let observable = new Observable();
observable.addPropertiesFromJSON(observable, json, false);
return observable;
}
public static fromJSONRecursive(json: any): Observable {
let observable = new Observable();
observable.addPropertiesFromJSON(observable, json, true);
return observable;
}
private addPropertiesFromJSON(observable: Observable, json: any, recursive?: boolean) {
let isRecursive = recursive || false;
observable._map = new Map<string, Object>();
for (var prop in json) {
if (json.hasOwnProperty(prop)) {
if (isRecursive) {
if (!Array.isArray(json[prop]) && typeof json[prop] === 'object' && types.getClass(json[prop]) !== 'ObservableArray') {
json[prop] = Observable.fromJSONRecursive(json[prop]);
}
}
observable._defineNewProperty(prop);
observable.set(prop, json[prop]);
}
}
}
constructor(json?: any) {
if (json) {
this.addPropertiesFromJSON(this, json);
addPropertiesFromJSON(this, json);
}
}
private _defineNewProperty(propertyName: string): void {
_defineNewProperty(propertyName: string): void {
Object.defineProperty(this, propertyName, {
get: function () {
return this._map.get(propertyName);
@ -276,3 +248,31 @@ export class Observable implements definition.Observable {
return this.typeName;
}
}
function addPropertiesFromJSON(observable: Observable, json: any, recursive?: boolean) {
let isRecursive = recursive || false;
observable._map = new Map<string, Object>();
for (var prop in json) {
if (json.hasOwnProperty(prop)) {
if (isRecursive) {
if (!Array.isArray(json[prop]) && typeof json[prop] === 'object' && types.getClass(json[prop]) !== 'ObservableArray') {
json[prop] = fromObjectRecursive(json[prop]);
}
}
observable._defineNewProperty(prop);
observable.set(prop, json[prop]);
}
}
}
export function fromObject(json: any): Observable {
let observable = new Observable();
addPropertiesFromJSON(observable, json, false);
return observable;
}
export function fromObjectRecursive(json: any): Observable {
let observable = new Observable();
addPropertiesFromJSON(observable, json, true);
return observable;
}