website/tutorial: move socket down to demo controller to prevent init

website/source/assets/javascripts/demo/controllers/application.js

@@ -1,31 +1,2 @@
 Demo.ApplicationController = Ember.ObjectController.extend({
-  needs: ['demo'],
-
-  init: function() {
-    this._super.apply(this, arguments);
-
-    // connect to the websocket once we enter the application route
-    // var socket = window.io.connect('http://localhost:8080');
-    var socket = new WebSocket("ws://vault-demo-server.herokuapp.com/socket");
-
-    this.set('socket', socket);
-
-    socket.onmessage = function(message) {
-      var data = JSON.parse(message.data),
-          controller = this.get('controllers.demo');
-
-      // Add the item
-      if (data.stdout !== "") {
-        console.log("stdout:", data.stout);
-        controller.appendLog(data.stdout, false);
-      }
-
-      if (data.stderr !== "") {
-        console.log("stderr:", data.stderr);
-        controller.appendLog(data.stderr, false);
-      }
-
-      controller.set('isLoading', false);
-    }.bind(this);
-  }
 });

website/source/assets/javascripts/demo/controllers/demo.js

@@ -2,6 +2,35 @@ Demo.DemoController = Ember.ObjectController.extend({
   isLoading: false,
   logs: "",
 
+  init: function() {
+    this._super.apply(this, arguments);
+
+    // connect to the websocket once we enter the application route
+    // var socket = window.io.connect('http://localhost:8080');
+    var socket = new WebSocket("ws://vault-demo-server.herokuapp.com/socket");
+
+    // Set socket on application controller
+    this.set('socket', socket);
+
+    socket.onmessage = function(message) {
+      var data = JSON.parse(message.data),
+          controller = this;
+
+      // Add the item
+      if (data.stdout !== "") {
+        console.log("stdout:", data.stout);
+        controller.appendLog(data.stdout, false);
+      }
+
+      if (data.stderr !== "") {
+        console.log("stderr:", data.stderr);
+        controller.appendLog(data.stderr, false);
+      }
+
+      controller.set('isLoading', false);
+    }.bind(this);
+  },
+
   appendLog: function(data, prefix) {
     var newline;
 

website/source/assets/javascripts/demo/controllers/step.js

@@ -1,6 +1,6 @@
 Demo.DemoStepController = Ember.ObjectController.extend({
-  needs: ['application', 'demo'],
-  socket: Ember.computed.alias('controllers.application.socket'),
+  needs: ['demo'],
+  socket: Ember.computed.alias('controllers.demo.socket'),
   logs: Ember.computed.alias('controllers.demo.logs'),
   isLoading: Ember.computed.alias('controllers.demo.isLoading'),