Fixed a problem that causes a conflict when used tweenjs and preloadjs at the same time.

This commit is contained in:
satoru kimura
2014-03-30 13:47:28 +09:00
parent 4891ed9bd1
commit f5a20d6c3e
2 changed files with 14 additions and 0 deletions
+7
View File
@@ -72,11 +72,18 @@ declare module createjs {
static version: string;
}
/*
NOTE: It is commented out because it conflicts with SamplePlugin class of TweenJS.
this class is mainly for documentation purposes.
http://www.createjs.com/Docs/PreloadJS/classes/SamplePlugin.html
*/
/*
export class SamplePlugin {
static fileLoadHandler(event: Object): void;
static getPreloadHandlers(): Object;
static preloadHandler(src: string, type: string, id: string, data: any, basePath: string, queue: LoadQueue): any;
}
*/
export class TagLoader extends AbstractLoader {
constructor (item: Object);
+7
View File
@@ -75,6 +75,12 @@ declare module createjs {
static install(): Object;
}
/*
NOTE: It is commented out because it conflicts with SamplePlugin Class of PreloadJS.
this class is mainly for documentation purposes.
http://www.createjs.com/Docs/TweenJS/classes/SamplePlugin.html
*/
/*
export class SamplePlugin {
constructor();
@@ -87,6 +93,7 @@ declare module createjs {
static install(): void;
static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any;
}
*/
export class Timeline extends EventDispatcher {
constructor (tweens: Tween[], labels: Object, props: Object);