Removed PIXI.EventListener and VideoTexture as it's no longer required.

This commit is contained in:
photonstorm 2015-05-06 01:59:49 +01:00
parent f623e68eb7
commit 7674060afc
4 changed files with 1 additions and 33 deletions

View file

@ -52,7 +52,6 @@
<script src="$path/src/pixi/text/BitmapText.js"></script>
<script src="$path/src/pixi/display/Stage.js"></script>
<script src="$path/src/pixi/utils/EventTarget.js"></script>
<script src="$path/src/pixi/utils/Utils.js"></script>
<script src="$path/src/pixi/utils/Polyk.js"></script>
@ -88,7 +87,6 @@
<script src="$path/src/pixi/textures/BaseTexture.js"></script>
<script src="$path/src/pixi/textures/Texture.js"></script>
<script src="$path/src/pixi/textures/RenderTexture.js"></script>
<script src="$path/src/pixi/textures/VideoTexture.js"></script>
<script src="$path/src/pixi/filters/AbstractFilter.js"></script>

View file

@ -117,26 +117,6 @@ PIXI.BaseTexture = function(source, scaleMode)
this.height = this.source.naturalHeight || this.source.height;
this.dirty();
}
else
{
var scope = this;
this.source.onload = function() {
scope.hasLoaded = true;
scope.width = scope.source.naturalWidth || scope.source.width;
scope.height = scope.source.naturalHeight || scope.source.height;
scope.dirty();
// add it to somewhere...
scope.dispatchEvent( { type: 'loaded', content: scope } );
};
this.source.onerror = function() {
scope.dispatchEvent( { type: 'error', content: scope } );
};
}
/**
* @property imageUrl
@ -154,7 +134,6 @@ PIXI.BaseTexture = function(source, scaleMode)
};
PIXI.BaseTexture.prototype.constructor = PIXI.BaseTexture;
PIXI.EventTarget.mixin(PIXI.BaseTexture.prototype);
/**
* Forces this BaseTexture to be set as loaded, with the given width and height.

View file

@ -136,14 +136,10 @@ PIXI.Texture = function(baseTexture, frame, crop, trim)
if (this.noFrame) frame = new PIXI.Rectangle(0, 0, baseTexture.width, baseTexture.height);
this.setFrame(frame);
}
else
{
baseTexture.addEventListener('loaded', this.onBaseTextureLoaded.bind(this));
}
};
PIXI.Texture.prototype.constructor = PIXI.Texture;
PIXI.EventTarget.mixin(PIXI.Texture.prototype);
/**
* Called when the base texture is loaded
@ -154,7 +150,6 @@ PIXI.EventTarget.mixin(PIXI.Texture.prototype);
PIXI.Texture.prototype.onBaseTextureLoaded = function()
{
var baseTexture = this.baseTexture;
baseTexture.removeEventListener('loaded', this.onLoaded);
if (this.noFrame)
{
@ -162,8 +157,6 @@ PIXI.Texture.prototype.onBaseTextureLoaded = function()
}
this.setFrame(this.frame);
this.dispatchEvent( { type: 'update', content: this } );
};
/**

View file

@ -10,7 +10,6 @@
"src/pixi/text/BitmapText.js",
"src/pixi/display/Stage.js",
"src/pixi/utils/EventTarget.js",
"src/pixi/utils/Utils.js",
"src/pixi/utils/Polyk.js",
@ -46,7 +45,6 @@
"src/pixi/textures/BaseTexture.js",
"src/pixi/textures/Texture.js",
"src/pixi/textures/RenderTexture.js",
"src/pixi/textures/VideoTexture.js",
"src/pixi/filters/AbstractFilter.js",