repo: janusweb
action: commit
revision: 
path_from: 
revision_from: f2148f2fcf2528604627eabb0cf0d13fc1408314:
path_to: 
revision_to: 

commit f2148f2fcf2528604627eabb0cf0d13fc1408314
Author: James Baicoianu 
Date:   Tue Jan 23 19:40:40 2018 -0800

    Check both this and other for collision_trigger

diff --git a/scripts/janusbase.js b/scripts/janusbase.js

--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -557,7 +557,7 @@ elation.require(['engine.things.generic', 'utils.template'], function() {
           //console.log('I collided', proxy, this);
           elation.events.fire({type: 'collision', element: this, data: proxy});

-          if (proxy.collision_trigger) {
+          if (this.collision_trigger || proxy.collision_trigger) {
             ev.preventDefault();
             ev.stopPropagation();
           }

-----END OF PAGE-----