More Merge Conflicts in all the JS

CodeForKids · Jun 29, 2014 · d27c924 · d27c924
2 parents 02b6093 + dee8242
commit d27c924
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 194 deletions.
diff --git a/app/js/application.js b/app/js/application.js
@@ -1,5 +1,6 @@
 $(document).ready(function(){
 
+  channel = new EventChannel();
   // Editor For Information
   var editor = ace.edit("editor");
   editor.setTheme("ace/theme/twilight");
@@ -42,7 +43,7 @@ $(document).ready(function(){
 
   editor.setValue("Type \"puts 'Hello World'\"");
 
-  var game = new Game();
+  var game = new Game(channel);
 
 });
 

diff --git a/app/js/event.js b/app/js/event.js
@@ -5,7 +5,7 @@ var EventChannel = function(){
         if(e["target"] == name){
           var found = true;
           for(i = 0; i < params.length; i++) {
-            if params[i] != e["params"][i]{
+            if(params[i] != e["params"][i]){
               found = false;
               break;
             }