Skip to content

Commit 5678f99

Browse files
committed
Latest Ticker + Event
1 parent 849fc3e commit 5678f99

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

src/createjs/events/Event.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ this.createjs = this.createjs||{};
5353
* rely on an event object's state outside of the call stack it was received in.
5454
* @class Event
5555
* @param {String} type The event type.
56-
* @param {Boolean} bubbles Indicates whether the event will bubble through the display list.
57-
* @param {Boolean} cancelable Indicates whether the default behaviour of this event can be cancelled.
56+
* @param {Boolean} [bubbles=false] Indicates whether the event will bubble through the display list.
57+
* @param {Boolean} [cancelable=false] Indicates whether the default behaviour of this event can be cancelled.
5858
* @constructor
5959
**/
6060
function Event(type, bubbles, cancelable) {
@@ -173,7 +173,7 @@ this.createjs = this.createjs||{};
173173

174174
// public methods:
175175
/**
176-
* Sets {{#crossLink "Event/defaultPrevented"}}{{/crossLink}} to true if the event is cancelable.
176+
* Sets {{#crossLink "Event/defaultPrevented:property"}}{{/crossLink}} to true if the event is cancelable.
177177
* Mirrors the DOM level 2 event standard. In general, cancelable events that have `preventDefault()` called will
178178
* cancel the default behaviour associated with the event.
179179
* @method preventDefault
@@ -183,7 +183,7 @@ this.createjs = this.createjs||{};
183183
};
184184

185185
/**
186-
* Sets {{#crossLink "Event/propagationStopped"}}{{/crossLink}} to true.
186+
* Sets {{#crossLink "Event/propagationStopped:property"}}{{/crossLink}} to true.
187187
* Mirrors the DOM event standard.
188188
* @method stopPropagation
189189
**/
@@ -192,8 +192,8 @@ this.createjs = this.createjs||{};
192192
};
193193

194194
/**
195-
* Sets {{#crossLink "Event/propagationStopped"}}{{/crossLink}} and
196-
* {{#crossLink "Event/immediatePropagationStopped"}}{{/crossLink}} to true.
195+
* Sets {{#crossLink "Event/propagationStopped:property"}}{{/crossLink}} and
196+
* {{#crossLink "Event/immediatePropagationStopped:property"}}{{/crossLink}} to true.
197197
* Mirrors the DOM event standard.
198198
* @method stopImmediatePropagation
199199
**/

src/createjs/utils/Ticker.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,9 @@ this.createjs = this.createjs||{};
318318
};
319319

320320
/**
321+
* Use the {{#crossLink "Ticker/interval:property"}}{{/crossLink}} property instead.
321322
* @method setInterval
322-
* @deprecated Use the {{#crossLink "Ticker/interval:property"}}{{/crossLink}} property instead.
323+
* @deprecated
323324
*/
324325
// Ticker.setInterval is @deprecated. Remove for 1.1+
325326
Ticker.setInterval = createjs.deprecate(Ticker._setInterval, "Ticker.setInterval");
@@ -336,8 +337,9 @@ this.createjs = this.createjs||{};
336337
};
337338

338339
/**
340+
* Use the {{#crossLink "Ticker/interval:property"}}{{/crossLink}} property instead.
339341
* @method getInterval
340-
* @deprecated Use the {{#crossLink "Ticker/interval:property"}}{{/crossLink}} property instead.
342+
* @deprecated
341343
*/
342344
// Ticker.getInterval is @deprecated. Remove for 1.1+
343345
Ticker.getInterval = createjs.deprecate(Ticker._getInterval, "Ticker.getInterval");
@@ -354,8 +356,9 @@ this.createjs = this.createjs||{};
354356
};
355357

356358
/**
359+
* Use the {{#crossLink "Ticker/framerate:property"}}{{/crossLink}} property instead.
357360
* @method setFPS
358-
* @deprecated Use the {{#crossLink "Ticker/framerate:property"}}{{/crossLink}} property instead.
361+
* @deprecated
359362
*/
360363
// Ticker.setFPS is @deprecated. Remove for 1.1+
361364
Ticker.setFPS = createjs.deprecate(Ticker._setFPS, "Ticker.setFPS");
@@ -372,8 +375,9 @@ this.createjs = this.createjs||{};
372375
};
373376

374377
/**
378+
* Use the {{#crossLink "Ticker/framerate:property"}}{{/crossLink}} property instead.
375379
* @method getFPS
376-
* @deprecated Use the {{#crossLink "Ticker/framerate:property"}}{{/crossLink}} property instead.
380+
* @deprecated
377381
*/
378382
// Ticker.getFPS is @deprecated. Remove for 1.1+
379383
Ticker.getFPS = createjs.deprecate(Ticker._getFPS, "Ticker.getFPS");
@@ -502,7 +506,7 @@ this.createjs = this.createjs||{};
502506
* @method getEventTime
503507
* @static
504508
* @param runTime {Boolean} [runTime=false] If true, the runTime property will be returned instead of time.
505-
* @returns {number} The time or runTime property from the most recent tick event or -1.
509+
* @return {number} The time or runTime property from the most recent tick event or -1.
506510
*/
507511
Ticker.getEventTime = function(runTime) {
508512
return Ticker._startTime ? (Ticker._lastTime || Ticker._startTime) - (runTime ? Ticker._pausedTime : 0) : -1;

0 commit comments

Comments
 (0)