Merge branch 'feat/0.33.0' of github.com:GrimoireGL/grimoirejs-fundam…

…ental into feat/0.33.0
GrimoireGL · Jan 4, 2018 · b01ab62 · b01ab62
2 parents 99b9549 + fb31395
commit b01ab62
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -32,9 +32,9 @@
     "condition-circle": "^1.6.0",
     "cpx": "^1.5.0",
     "deflate-js": "^0.2.3",
-    "grimoirejs": "^1.0.0",
-    "grimoirejs-cauldron": "^4.0.0",
-    "grimoirejs-math": "^2.0.0",
+    "grimoirejs": "beta",
+    "grimoirejs-cauldron": "beta",
+    "grimoirejs-math": "beta",
     "http-server": "^0.10.0",
     "jsdom": "^11.5.1",
     "raw-loader": "^0.5.1",
@@ -86,4 +86,4 @@
     ],
     "babel": "inherit"
   }
-}
+}
diff --git a/src/Components/AssetLoadingManagerComponent.ts b/src/Components/AssetLoadingManagerComponent.ts
@@ -66,7 +66,7 @@ export default class AssetLoadingManagerComponent extends Component {
     if (this._loaderElement) {
       this._loaderElement.remove();
     }
-    this.node.emit("asset-load-completed");
+    this.node.emit("asset-load-completed", null);
     this.tree("goml").setAttribute("loopEnabled", true);
     const canvas = this.companion.get("canvasElement") as HTMLCanvasElement;
     canvas.classList.add("gr-resource-loaded-canvas");

diff --git a/src/Components/RendererComponent.ts b/src/Components/RendererComponent.ts
@@ -192,7 +192,7 @@ export default class RendererComponent extends Component {
     if (!this.isActive) {
       return;
     }
-    this.node.emit(eventName);
+    this.node.emit(eventName, e);
     this.node.broadcastMessage(eventName, this._toViewportMouseArgs(e));
   }