Make sure the code will be executed only when the DOM is fully loaded

Author: cheton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cncjs-pendant-tinyweb",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A tiny web console for small 320x240 LCD display",
   "homepage": "https://github.com/cncjs/cncjs-pendant-tinyweb",
   "author": "Cheton Wu <cheton@gmail.com>",

src/app.js

@@ -1,5 +1,6 @@
-(function(root) {
+$(function() {
 
+var root = window;
 var cnc = root.cnc || {};
 var controller = cnc.controller;
 
@@ -253,4 +254,4 @@ $('[data-route="axes"] [data-name="btn-dropdown"]').dropdown();
 $('[data-route="axes"] [data-name="active-state"]').text('Not connected');
 $('[data-route="axes"] select[data-name="select-distance"]').val('1');
 
-})(this);
+});

src/controller.js

@@ -1,6 +1,6 @@
-(function(root) {
+$(function() {
 
-// token
+var root = window;
 var token = '';
 
 try {
@@ -235,4 +235,4 @@ CNCController.prototype.writeln = function(data, context) {
 
 root.cnc.controller = new CNCController();
 
-})(this);
+});

src/index.html

@@ -363,21 +363,17 @@
 <script src="vendor/js-cookie/js.cookie.js"></script>
 <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
 <script>
-var root = window;
-root.cnc = {
-    router: null,
-    controller: null,
-    controllerType: Cookies.get('cnc.controllerType'),
-    port: Cookies.get('cnc.port'),
-    baudrate: Cookies.get('cnc.baudrate'),
-    connected: false
-};
-</script>
-<script src="controller.js"></script>
-<script>
 $('document').ready(function() {
     var root = window;
-    var routes = {
+    root.cnc = {
+        router: null,
+        controller: null,
+        controllerType: Cookies.get('cnc.controllerType'),
+        port: Cookies.get('cnc.port'),
+        baudrate: Cookies.get('cnc.baudrate'),
+        connected: false
+    };
+    root.cnc.router = window.Router({
         '/': function() {
             if (root.cnc.connected) {
                 window.location = '#/workspace';
@@ -391,8 +387,7 @@
         },
         '/axes': function() {
         }
-    };
-    root.cnc.router = window.Router(routes);
+    });
     root.cnc.router.configure({
         on: function() {
             var route = window.location.hash.slice(2);
@@ -407,6 +402,7 @@
     });
 });
 </script>
+<script src="controller.js"></script>
 <script src="app.js"></script>
 </body>
 </html>