Skip to content

Commit 81c1ced

Browse files
photonstormphotonstorm
committed
Event Managers now have clearer handlers that check enabled directly
1 parent 22d6ec1 commit 81c1ced

2 files changed

Lines changed: 58 additions & 115 deletions

File tree

‎src/input/mouse/MouseManager.js‎

Lines changed: 26 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,14 @@ var MouseManager = new Class({
288288

289289
this.onMouseMove = function (event)
290290
{
291-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
291+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
292292
{
293-
// Do nothing if event already handled
294-
return;
295-
}
296-
297-
_this.manager.queueMouseMove(event);
293+
_this.manager.onMouseMove(event);
298294

299-
if (_this.capture)
300-
{
301-
event.preventDefault();
295+
if (_this.capture)
296+
{
297+
event.preventDefault();
298+
}
302299
}
303300
};
304301

@@ -309,86 +306,62 @@ var MouseManager = new Class({
309306
window.focus();
310307
}
311308

312-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
309+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
313310
{
314-
// Do nothing if event already handled
315-
return;
316-
}
317-
318-
_this.manager.queueMouseDown(event);
311+
_this.manager.onMouseDown(event);
319312

320-
if (_this.capture && event.target === canvas)
321-
{
322-
event.preventDefault();
313+
if (_this.capture && event.target === canvas)
314+
{
315+
event.preventDefault();
316+
}
323317
}
324318
};
325319

326320
this.onMouseDownWindow = function (event)
327321
{
328-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
329-
{
330-
// Do nothing if event already handled
331-
return;
332-
}
333-
334-
if (event.target !== canvas)
322+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled && event.target !== canvas)
335323
{
336324
// Only process the event if the target isn't the canvas
337-
_this.manager.queueMouseDown(event);
325+
_this.manager.onMouseDown(event);
338326
}
339327
};
340328

341329
this.onMouseUp = function (event)
342330
{
343-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
331+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
344332
{
345-
// Do nothing if event already handled
346-
return;
347-
}
348-
349-
_this.manager.queueMouseUp(event);
333+
_this.manager.onMouseUp(event);
350334

351-
if (_this.capture && event.target === canvas)
352-
{
353-
event.preventDefault();
335+
if (_this.capture && event.target === canvas)
336+
{
337+
event.preventDefault();
338+
}
354339
}
355340
};
356341

357342
this.onMouseUpWindow = function (event)
358343
{
359-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
360-
{
361-
// Do nothing if event already handled
362-
return;
363-
}
364-
365-
if (event.target !== canvas)
344+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled && event.target !== canvas)
366345
{
367346
// Only process the event if the target isn't the canvas
368-
_this.manager.queueMouseUp(event);
347+
_this.manager.onMouseUp(event);
369348
}
370349
};
371350

372351
this.onMouseOver = function (event)
373352
{
374-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
353+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
375354
{
376-
// Do nothing if event already handled
377-
return;
355+
_this.manager.setCanvasOver(event);
378356
}
379-
380-
_this.manager.setCanvasOver(event);
381357
};
382358

383359
this.onMouseOut = function (event)
384360
{
385-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
361+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
386362
{
387-
// Do nothing if event already handled
388-
return;
363+
_this.manager.setCanvasOut(event);
389364
}
390-
391-
_this.manager.setCanvasOut(event);
392365
};
393366

394367
var target = this.target;

‎src/input/touch/TouchManager.js‎

Lines changed: 32 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -205,118 +205,88 @@ var TouchManager = new Class({
205205
window.focus();
206206
}
207207

208-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
208+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
209209
{
210-
// Do nothing if event already handled
211-
return;
212-
}
213-
214-
_this.manager.queueTouchStart(event);
210+
_this.manager.onTouchStart(event);
215211

216-
if (_this.capture && event.target === canvas)
217-
{
218-
event.preventDefault();
212+
if (_this.capture && event.target === canvas)
213+
{
214+
event.preventDefault();
215+
}
219216
}
220217
};
221218

222219
this.onTouchStartWindow = function (event)
223220
{
224-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
225-
{
226-
// Do nothing if event already handled
227-
return;
228-
}
229-
230-
if (event.target !== canvas)
221+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled && event.target !== canvas)
231222
{
232223
// Only process the event if the target isn't the canvas
233-
_this.manager.queueTouchStart(event);
224+
_this.manager.onTouchStart(event);
234225
}
235226
};
236227

237228
this.onTouchMove = function (event)
238229
{
239-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
230+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
240231
{
241-
// Do nothing if event already handled
242-
return;
243-
}
244-
245-
_this.manager.queueTouchMove(event);
232+
_this.manager.onTouchMove(event);
246233

247-
if (_this.capture)
248-
{
249-
event.preventDefault();
234+
if (_this.capture)
235+
{
236+
event.preventDefault();
237+
}
250238
}
251239
};
252240

253241
this.onTouchEnd = function (event)
254242
{
255-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
243+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
256244
{
257-
// Do nothing if event already handled
258-
return;
259-
}
245+
_this.manager.onTouchEnd(event);
260246

261-
_this.manager.queueTouchEnd(event);
262-
263-
if (_this.capture && event.target === canvas)
264-
{
265-
event.preventDefault();
247+
if (_this.capture && event.target === canvas)
248+
{
249+
event.preventDefault();
250+
}
266251
}
267252
};
268253

269254
this.onTouchEndWindow = function (event)
270255
{
271-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
272-
{
273-
// Do nothing if event already handled
274-
return;
275-
}
276-
277-
if (event.target !== canvas)
256+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled && event.target !== canvas)
278257
{
279258
// Only process the event if the target isn't the canvas
280-
_this.manager.queueTouchEnd(event);
259+
_this.manager.onTouchEnd(event);
281260
}
282261
};
283262

284263
this.onTouchCancel = function (event)
285264
{
286-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
265+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
287266
{
288-
// Do nothing if event already handled
289-
return;
290-
}
291-
292-
_this.manager.queueTouchCancel(event);
267+
_this.manager.onTouchCancel(event);
293268

294-
if (_this.capture)
295-
{
296-
event.preventDefault();
269+
if (_this.capture)
270+
{
271+
event.preventDefault();
272+
}
297273
}
298274
};
299275

300276
this.onTouchOver = function (event)
301277
{
302-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
278+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
303279
{
304-
// Do nothing if event already handled
305-
return;
280+
_this.manager.setCanvasOver(event);
306281
}
307-
308-
_this.manager.setCanvasOver(event);
309282
};
310283

311284
this.onTouchOut = function (event)
312285
{
313-
if (event.defaultPrevented || !_this.enabled || !_this.manager)
286+
if (!event.defaultPrevented && _this.enabled && _this.manager && _this.manager.enabled)
314287
{
315-
// Do nothing if event already handled
316-
return;
288+
_this.manager.setCanvasOut(event);
317289
}
318-
319-
_this.manager.setCanvasOut(event);
320290
};
321291

322292
var target = this.target;

0 commit comments

Comments
 (0)