foster/liabru-matter-js
0
0
Fork 0
mirror of https://github.com/liabru/matter-js.git synced 2024-12-26 13:49:01 -05:00
Code Issues Wiki Activity

fix Matter.Demo for node

Browse source
This commit is contained in:
liabru 2015-08-17 00:48:52 +01:00
parent 75af920f1d
commit 06eea3ec3a
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
demo/js/Demo.js
View file

@ -8,6 +8,7 @@
if (!_isBrowser) {
module.exports = Demo;
window = {};
}
// Matter aliases
@ -29,7 +30,7 @@
Svg = Matter.Svg;
// MatterTools aliases
if (_isBrowser && window.MatterTools) {
if (window.MatterTools) {
var Gui = MatterTools.Gui,
Inspector = MatterTools.Inspector;
}
@ -43,7 +44,7 @@
_sceneEvents = [],
_useInspector = _isBrowser && window.location.hash.indexOf('-inspect') !== -1,
_isMobile = _isBrowser && /(ipad|iphone|ipod|android)/gi.test(navigator.userAgent),
_isAutomatedTest = _isBrowser ? false : true;
_isAutomatedTest = !_isBrowser || window._phantom;
// initialise the demo
@ -96,12 +97,10 @@
// call init when the page has loaded fully
if (_isBrowser) {
if (window.addEventListener) {
window.addEventListener('load', Demo.init);
} else if (window.attachEvent) {
window.attachEvent('load', Demo.init);
}
if (window.addEventListener) {
window.addEventListener('load', Demo.init);
} else if (window.attachEvent) {
window.attachEvent('load', Demo.init);
}
// each demo scene is set up in its own function, see below
@ -690,9 +689,6 @@
var renderOptions = _engine.render.options;
renderOptions.wireframes = false;
renderOptions.showAngleIndicator = false;
if (window.chrome)
renderOptions.showShadows = true;
};
Demo.chains = function() {
@ -1728,7 +1724,8 @@
};
Demo.reset = function() {
var _world = _engine.world;
var _world = _engine.world,
i;
World.clear(_world);
Engine.clear(_engine);
@ -1741,8 +1738,10 @@
}
// clear all scene events
for (var i = 0; i < _sceneEvents.length; i++)
Events.off(_engine, _sceneEvents[i]);
if (_engine.events) {
for (i = 0; i < _sceneEvents.length; i++)
Events.off(_engine, _sceneEvents[i]);
}
if (_mouseConstraint && _mouseConstraint.events) {
for (i = 0; i < _sceneEvents.length; i++)
@ -1814,10 +1813,11 @@
renderOptions.showInternalEdges = false;
renderOptions.showSeparations = false;
renderOptions.background = '#fff';
}
if (_isMobile)
renderOptions.showDebug = true;
if (_isMobile) {
renderOptions.showDebug = true;
}
}
};
})();

2
src/core/Events.js
View file

@ -55,7 +55,7 @@ var Events = {};
var callbacks = object.events[names[i]],
newCallbacks = [];
if (callback) {
if (callback && callbacks) {
for (var j = 0; j < callbacks.length; j++) {
if (callbacks[j] !== callback)
newCallbacks.push(callbacks[j]);