Merge branch 'master' of github.com:CreateJS/EaselJS

Author: David Gillen

lib/easeljs-NEXT.js

@@ -10367,7 +10367,7 @@ this.createjs = this.createjs||{};
 				-1,							1,								0,							1
 			]);
 
-			if (this._bufferTextureOutput !== null) {
+			if (this._bufferTextureOutput !== this && this._bufferTextureOutput !== null) {
 				this.resizeTexture(this._bufferTextureOutput, this._viewportWidth, this._viewportHeight);
 			}
 			if (this._bufferTextureConcat !== null) {
@@ -17463,6 +17463,6 @@ this.createjs = this.createjs || {};
 	 * @type String
 	 * @static
 	 **/
-	s.buildDate = /*=date*/"Fri, 06 Apr 2018 15:06:22 GMT"; // injected by build process
+	s.buildDate = /*=date*/"Mon, 09 Apr 2018 20:50:19 GMT"; // injected by build process
 
 })();

lib/easeljs-NEXT.min.js

@@ -53,8 +53,8 @@ this.createjs = this.createjs||{};
 	 * rely on an event object's state outside of the call stack it was received in.
 	 * @class Event
 	 * @param {String} type The event type.
-	 * @param {Boolean} bubbles Indicates whether the event will bubble through the display list.
-	 * @param {Boolean} cancelable Indicates whether the default behaviour of this event can be cancelled.
+	 * @param {Boolean} [bubbles=false] Indicates whether the event will bubble through the display list.
+	 * @param {Boolean} [cancelable=false] Indicates whether the default behaviour of this event can be cancelled.
 	 * @constructor
 	 **/
 	function Event(type, bubbles, cancelable) {

src/createjs/events/Event.js

@@ -316,6 +316,11 @@ this.createjs = this.createjs||{};
 		if (!Ticker._inited) { return; }
 		Ticker._setupTick();
 	};
+
+	/**
+	 * @method setInterval
+	 * @deprecated Use the {{#crossLink "Ticker/interval:property"}}{{/crossLink}} property instead.
+	 */
 	// Ticker.setInterval is @deprecated. Remove for 1.1+
 	Ticker.setInterval = createjs.deprecate(Ticker._setInterval, "Ticker.setInterval");
 
@@ -329,6 +334,11 @@ this.createjs = this.createjs||{};
 	Ticker._getInterval = function() {
 		return Ticker._interval;
 	};
+
+	/**
+	 * @method getInterval
+	 * @deprecated Use the {{#crossLink "Ticker/interval:property"}}{{/crossLink}} property instead.
+	 */
 	// Ticker.getInterval is @deprecated. Remove for 1.1+
 	Ticker.getInterval = createjs.deprecate(Ticker._getInterval, "Ticker.getInterval");
 
@@ -342,6 +352,11 @@ this.createjs = this.createjs||{};
 	Ticker._setFPS = function(value) {
 		Ticker._setInterval(1000/value);
 	};
+
+	/**
+	 * @method setFPS
+	 * @deprecated Use the {{#crossLink "Ticker/framerate:property"}}{{/crossLink}} property instead.
+	 */
 	// Ticker.setFPS is @deprecated. Remove for 1.1+
 	Ticker.setFPS = createjs.deprecate(Ticker._setFPS, "Ticker.setFPS");
 
@@ -355,6 +370,11 @@ this.createjs = this.createjs||{};
 	Ticker._getFPS = function() {
 		return 1000/Ticker._interval;
 	};
+
+	/**
+	 * @method getFPS
+	 * @deprecated Use the {{#crossLink "Ticker/framerate:property"}}{{/crossLink}} property instead.
+	 */
 	// Ticker.getFPS is @deprecated. Remove for 1.1+
 	Ticker.getFPS = createjs.deprecate(Ticker._getFPS, "Ticker.getFPS");
 

src/createjs/utils/Ticker.js

@@ -103,6 +103,11 @@ this.createjs = this.createjs||{};
 	p._getNumChildren = function() {
 		return this.children.length;
 	};
+
+	/**
+	 * @method getNumChildren
+	 * @deprecated Use the {{#crossLink "Container/numChildren:property"}}{{/crossLink}} property instead.
+	 */
 	// Container.getNumChildren is @deprecated. Remove for 1.1+
 	p.getNumChildren = createjs.deprecate(p._getNumChildren, "Container.getNumChildren");
 

src/easeljs/display/Container.js

@@ -39,8 +39,6 @@ this.createjs = this.createjs||{};
 
 // constructor:
 	/**
-	 * <b>This class is still experimental, and more advanced use is likely to be buggy. Please report bugs.</b>
-	 *
 	 * A DOMElement allows you to associate a HTMLElement with the display list. It will be transformed
 	 * within the DOM as though it is child of the {{#crossLink "Container"}}{{/crossLink}} it is added to. However, it is
 	 * not rendered to canvas, and as such will retain whatever z-index it has relative to the canvas (ie. it will be

src/easeljs/display/DOMElement.js

@@ -691,6 +691,11 @@ this.createjs = this.createjs||{};
 		if (o instanceof _Stage) { return o; }
 		return null;
 	};
+
+	/**
+	 * @method getStage
+	 * @deprecated Use the {{#crossLink "DisplayObject/stage:property"}}{{/crossLink}} property instead.
+	 */
 	// DisplayObject.getStage is @deprecated. Remove for 1.1+
 	p.getStage = createjs.deprecate(p._getStage, "DisplayObject.getStage");
 

src/easeljs/display/DisplayObject.js

@@ -386,6 +386,11 @@ this.createjs = this.createjs||{};
 		this._updateInstructions();
 		return this._instructions;
 	};
+
+	/**
+	 * @method getInstructions
+	 * @deprecated Use the {{#crossLink "Graphics/instructions:property"}}{{/crossLink}} property instead.
+	 */
 	// Graphics.getInstructions is @deprecated. Remove for 1.1+
 	p.getInstructions = createjs.deprecate(p._getInstructions, "Graphics.getInstructions");
 

src/easeljs/display/Graphics.js

@@ -337,6 +337,11 @@ this.createjs = this.createjs||{};
 	p._getLabels = function() {
 		return this.timeline.getLabels();
 	};
+
+	/**
+	 * @method getLabels
+	 * @deprecated Use the {{#crossLink "MovieClip/labels:property"}}{{/crossLink}} property instead.
+	 */
 	// MovieClip.getLabels is @deprecated. Remove for 1.1+
 	p.getLabels = createjs.deprecate(p._getLabels, "MovieClip.getLabels");
 
@@ -349,6 +354,11 @@ this.createjs = this.createjs||{};
 	p._getCurrentLabel = function() {
 		return this.timeline.currentLabel;
 	};
+
+	/**
+	 * @method getCurrentLabel
+	 * @deprecated Use the {{#crossLink "MovieClip/currentLabel:property"}}{{/crossLink}} property instead.
+	 */
 	// MovieClip.getCurrentLabel is @deprecated. Remove for 1.1+
 	p.getCurrentLabel = createjs.deprecate(p._getCurrentLabel, "MovieClip.getCurrentLabel");
 
@@ -361,6 +371,11 @@ this.createjs = this.createjs||{};
 	p._getDuration = function() {
 		return this.timeline.duration;
 	};
+
+	/**
+	 * @method getDuration
+	 * @deprecated Use the {{#crossLink "MovieClip/duration:property"}}{{/crossLink}} property instead.
+	 */
 	// MovieClip.getDuration is @deprecated. Remove for 1.1+
 	p.getDuration = createjs.deprecate(p._getDuration, "MovieClip.getDuration");
 

src/easeljs/display/MovieClip.js

@@ -369,6 +369,11 @@ this.createjs = this.createjs||{};
 	p._getAnimations = function() {
 		return this._animations.slice();
 	};
+
+	/**
+	 * @method getAnimations
+	 * @deprecated Use the {{#crossLink "SpriteSheet/animations:property"}}{{/crossLink}} property instead.
+	 */
 	// SpriteSheet.getAnimations is @deprecated. Remove for 1.1+
 	p.getAnimations = createjs.deprecate(p._getAnimations, "SpriteSheet.getAnimations");