Skip to content

Commit 7674060

Browse files
committed
Removed PIXI.EventListener and VideoTexture as it's no longer required.
1 parent f623e68 commit 7674060

4 files changed

Lines changed: 1 addition & 33 deletions

File tree

build/config.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<script src="$path/src/pixi/text/BitmapText.js"></script>
5353
<script src="$path/src/pixi/display/Stage.js"></script>
5454
55-
<script src="$path/src/pixi/utils/EventTarget.js"></script>
5655
<script src="$path/src/pixi/utils/Utils.js"></script>
5756
<script src="$path/src/pixi/utils/Polyk.js"></script>
5857
@@ -88,7 +87,6 @@
8887
<script src="$path/src/pixi/textures/BaseTexture.js"></script>
8988
<script src="$path/src/pixi/textures/Texture.js"></script>
9089
<script src="$path/src/pixi/textures/RenderTexture.js"></script>
91-
<script src="$path/src/pixi/textures/VideoTexture.js"></script>
9290
9391
<script src="$path/src/pixi/filters/AbstractFilter.js"></script>
9492

src/pixi/textures/BaseTexture.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,26 +117,6 @@ PIXI.BaseTexture = function(source, scaleMode)
117117
this.height = this.source.naturalHeight || this.source.height;
118118
this.dirty();
119119
}
120-
else
121-
{
122-
var scope = this;
123-
124-
this.source.onload = function() {
125-
126-
scope.hasLoaded = true;
127-
scope.width = scope.source.naturalWidth || scope.source.width;
128-
scope.height = scope.source.naturalHeight || scope.source.height;
129-
130-
scope.dirty();
131-
132-
// add it to somewhere...
133-
scope.dispatchEvent( { type: 'loaded', content: scope } );
134-
};
135-
136-
this.source.onerror = function() {
137-
scope.dispatchEvent( { type: 'error', content: scope } );
138-
};
139-
}
140120

141121
/**
142122
* @property imageUrl
@@ -154,7 +134,6 @@ PIXI.BaseTexture = function(source, scaleMode)
154134
};
155135

156136
PIXI.BaseTexture.prototype.constructor = PIXI.BaseTexture;
157-
PIXI.EventTarget.mixin(PIXI.BaseTexture.prototype);
158137

159138
/**
160139
* Forces this BaseTexture to be set as loaded, with the given width and height.

src/pixi/textures/Texture.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,10 @@ PIXI.Texture = function(baseTexture, frame, crop, trim)
136136
if (this.noFrame) frame = new PIXI.Rectangle(0, 0, baseTexture.width, baseTexture.height);
137137
this.setFrame(frame);
138138
}
139-
else
140-
{
141-
baseTexture.addEventListener('loaded', this.onBaseTextureLoaded.bind(this));
142-
}
139+
143140
};
144141

145142
PIXI.Texture.prototype.constructor = PIXI.Texture;
146-
PIXI.EventTarget.mixin(PIXI.Texture.prototype);
147143

148144
/**
149145
* Called when the base texture is loaded
@@ -154,16 +150,13 @@ PIXI.EventTarget.mixin(PIXI.Texture.prototype);
154150
PIXI.Texture.prototype.onBaseTextureLoaded = function()
155151
{
156152
var baseTexture = this.baseTexture;
157-
baseTexture.removeEventListener('loaded', this.onLoaded);
158153

159154
if (this.noFrame)
160155
{
161156
this.frame = new PIXI.Rectangle(0, 0, baseTexture.width, baseTexture.height);
162157
}
163158

164159
this.setFrame(this.frame);
165-
166-
this.dispatchEvent( { type: 'update', content: this } );
167160
};
168161

169162
/**

tasks/manifests/pixi.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"src/pixi/text/BitmapText.js",
1111
"src/pixi/display/Stage.js",
1212

13-
"src/pixi/utils/EventTarget.js",
1413
"src/pixi/utils/Utils.js",
1514
"src/pixi/utils/Polyk.js",
1615

@@ -46,7 +45,6 @@
4645
"src/pixi/textures/BaseTexture.js",
4746
"src/pixi/textures/Texture.js",
4847
"src/pixi/textures/RenderTexture.js",
49-
"src/pixi/textures/VideoTexture.js",
5048

5149
"src/pixi/filters/AbstractFilter.js",
5250

0 commit comments

Comments
 (0)