mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Replace knownEvents modules with static strings.
This commit is contained in:
22
data/observable-array/observable-array.d.ts
vendored
22
data/observable-array/observable-array.d.ts
vendored
@@ -6,13 +6,6 @@
|
||||
declare module "data/observable-array" {
|
||||
import observable = require("data/observable");
|
||||
|
||||
/**
|
||||
* Known event names.
|
||||
*/
|
||||
module knownEvents {
|
||||
export var change: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Event args for "changed" event.
|
||||
*/
|
||||
@@ -52,12 +45,23 @@ declare module "data/observable-array" {
|
||||
* Advanced array like class used when you want to be notified when a change occurs.
|
||||
*/
|
||||
class ObservableArray<T> extends observable.Observable {
|
||||
on(event: string, callback: (data: observable.EventData) => void);
|
||||
/**
|
||||
* String value used when hooking to change event.
|
||||
*/
|
||||
public static changeEvent: string;
|
||||
|
||||
/**
|
||||
* A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
|
||||
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").
|
||||
* @param callback - Callback function which will be executed when event is raised.
|
||||
* @param thisArg - An optional parameter which will be used as `this` context for callback execution.
|
||||
*/
|
||||
on(eventNames: string, callback: (data: observable.EventData) => void, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Raised when a change occurs.
|
||||
*/
|
||||
on(event: "change", callback: (args: ChangedData<T>) => void);
|
||||
on(event: "change", callback: (args: ChangedData<T>) => void, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Create ObservableArray<T> with specified length.
|
||||
|
||||
@@ -10,13 +10,9 @@ export class ChangeType implements observableArrayDef.ChangeType {
|
||||
|
||||
var CHANGE = "change";
|
||||
|
||||
export module knownEvents {
|
||||
export var change = CHANGE;
|
||||
}
|
||||
|
||||
export class ObservableArray<T> extends observable.Observable implements observableArrayDef.ObservableArray<T> { // implements Array<T> {
|
||||
|
||||
//[n: number]: T;
|
||||
public static changeEvent = CHANGE;
|
||||
|
||||
private _array: Array<any>;
|
||||
private _addArgs: observableArrayDef.ChangedData<T>;
|
||||
|
||||
26
data/observable/observable.d.ts
vendored
26
data/observable/observable.d.ts
vendored
@@ -30,20 +30,14 @@ declare module "data/observable" {
|
||||
value: any;
|
||||
}
|
||||
|
||||
/**
|
||||
* Known event names.
|
||||
*/
|
||||
module knownEvents {
|
||||
/**
|
||||
* The name of the property changed event.
|
||||
*/
|
||||
export var propertyChange: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Observable is used when you want to be notified when a change occurs. Use on/off methods to add/remove listener.
|
||||
*/
|
||||
class Observable {
|
||||
/**
|
||||
* String value used when hooking to propertyChange event.
|
||||
*/
|
||||
public static propertyChangeEvent: string;
|
||||
|
||||
/**
|
||||
* Creates an Observable instance and sets its properties accroding to the supplied JSON object.
|
||||
@@ -56,14 +50,22 @@ declare module "data/observable" {
|
||||
typeName: string;
|
||||
|
||||
/**
|
||||
* Shortcut alias to the addEventListener method.
|
||||
* A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
|
||||
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").
|
||||
* @param callback - Callback function which will be executed when event is raised.
|
||||
* @param thisArg - An optional parameter which will be used as `this` context for callback execution.
|
||||
*/
|
||||
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Raised when a propertyChange occurs.
|
||||
*/
|
||||
on(event: "propertyChange", callback: (data: EventData) => void, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Shortcut alias to the removeEventListener method.
|
||||
*/
|
||||
off(eventNames: string, callback?: any);
|
||||
off(eventNames: string, callback?: any, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Adds a listener for the specified event name.
|
||||
|
||||
@@ -6,11 +6,9 @@ interface ListenerEntry {
|
||||
thisArg: any;
|
||||
}
|
||||
|
||||
export module knownEvents {
|
||||
export var propertyChange = "propertyChange";
|
||||
}
|
||||
|
||||
export class Observable implements definition.Observable {
|
||||
public static propertyChangeEvent = "propertyChange";
|
||||
|
||||
private _observers = {};
|
||||
|
||||
constructor(json?: any) {
|
||||
@@ -31,8 +29,8 @@ export class Observable implements definition.Observable {
|
||||
this.addEventListener(eventNames, callback, thisArg);
|
||||
}
|
||||
|
||||
public off(eventNames: string, callback?: any) {
|
||||
this.removeEventListener(eventNames, callback);
|
||||
public off(eventNames: string, callback?: any, thisArg?: any) {
|
||||
this.removeEventListener(eventNames, callback, thisArg);
|
||||
}
|
||||
|
||||
public addEventListener(eventNames: string, callback: (data: definition.EventData) => void, thisArg?: any) {
|
||||
@@ -122,7 +120,7 @@ export class Observable implements definition.Observable {
|
||||
|
||||
public _createPropertyChangeData(name: string, value: any): definition.PropertyChangeData {
|
||||
return {
|
||||
eventName: knownEvents.propertyChange,
|
||||
eventName: Observable.propertyChangeEvent,
|
||||
propertyName: name,
|
||||
object: this,
|
||||
value: value
|
||||
|
||||
30
data/virtual-array/virtual-array.d.ts
vendored
30
data/virtual-array/virtual-array.d.ts
vendored
@@ -5,14 +5,6 @@ declare module "data/virtual-array" {
|
||||
import observable = require("data/observable");
|
||||
import observableArray = require("data/observable-array");
|
||||
|
||||
/**
|
||||
* Known event names.
|
||||
*/
|
||||
module knownEvents {
|
||||
export var itemsLoading: string;
|
||||
export var change: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provides event args for "changed" event.
|
||||
*/
|
||||
@@ -31,6 +23,16 @@ declare module "data/virtual-array" {
|
||||
* Advanced array like class that helps loading items on demand.
|
||||
*/
|
||||
export class VirtualArray<T> extends observable.Observable {
|
||||
/**
|
||||
* String value used when hooking to change event.
|
||||
*/
|
||||
public static changeEvent: string;
|
||||
|
||||
/**
|
||||
* String value used when hooking to itemsLoading event.
|
||||
*/
|
||||
public static itemsLoadingEvent: string;
|
||||
|
||||
constructor(arrayLength?: number);
|
||||
|
||||
/**
|
||||
@@ -58,17 +60,23 @@ declare module "data/virtual-array" {
|
||||
*/
|
||||
load(index: number, items: T[]): void;
|
||||
|
||||
on(event: string, callback: (data: observable.EventData) => void);
|
||||
/**
|
||||
* A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
|
||||
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").
|
||||
* @param callback - Callback function which will be executed when event is raised.
|
||||
* @param thisArg - An optional parameter which will be used as `this` context for callback execution.
|
||||
*/
|
||||
on(eventNames: string, callback: (data: observable.EventData) => void, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Raised when still not loaded items are requested.
|
||||
*/
|
||||
on(event: "itemsLoading", callback: (args: ItemsLoading) => void);
|
||||
on(event: "itemsLoading", callback: (args: ItemsLoading) => void, thisArg?: any);
|
||||
|
||||
/**
|
||||
* Raised when a change occurs.
|
||||
*/
|
||||
on(event: "change", callback: (args: ChangedData<T>) => void);
|
||||
on(event: "change", callback: (args: ChangedData<T>) => void, thisArg?: any);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -4,11 +4,6 @@ import virtualArrayDef = require("data/virtual-array");
|
||||
|
||||
var CHANGE = "change", UPDATE = "update", DELETE = "delete", ADD = "add";
|
||||
|
||||
export module knownEvents {
|
||||
export var itemsLoading = "itemsLoading";
|
||||
export var change = "change";
|
||||
}
|
||||
|
||||
export class ChangeType implements virtualArrayDef.ChangeType {
|
||||
static Add = "add";
|
||||
static Delete = "delete";
|
||||
@@ -17,6 +12,9 @@ export class ChangeType implements virtualArrayDef.ChangeType {
|
||||
}
|
||||
|
||||
export class VirtualArray<T> extends observable.Observable {
|
||||
public static changeEvent = CHANGE;
|
||||
public static itemsLoadingEvent = "itemsLoading";
|
||||
|
||||
private _requestedIndexes: Array<number>;
|
||||
private _loadedIndexes: Array<number>;
|
||||
private _length: number;
|
||||
@@ -139,7 +137,7 @@ export class VirtualArray<T> extends observable.Observable {
|
||||
} else {
|
||||
if (count > 0) {
|
||||
this.notify({
|
||||
eventName: knownEvents.itemsLoading, object: this,
|
||||
eventName: VirtualArray.itemsLoadingEvent, object: this,
|
||||
index: start,
|
||||
count: count
|
||||
});
|
||||
@@ -152,7 +150,7 @@ export class VirtualArray<T> extends observable.Observable {
|
||||
|
||||
if (start >= 0 && count > 0) {
|
||||
this.notify({
|
||||
eventName: knownEvents.itemsLoading, object: this,
|
||||
eventName: VirtualArray.itemsLoadingEvent, object: this,
|
||||
index: start,
|
||||
count: count
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user