From 5f2a7985d8bf247a1af6ae5d129a894e237a396d Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Sat, 18 Apr 2015 00:38:28 +0200
Subject: [PATCH] Refactor js init sequence.

---
 src/_h5ai/client/js/inc/boot.js               | 30 ++++++++++++++++++
 .../client/js/inc/{main.js => main/index.js}  |  2 +-
 src/_h5ai/client/js/inc/{ => main}/info.js    |  2 +-
 src/_h5ai/client/js/scripts.js                | 31 +------------------
 src/_h5ai/server/php/inc/page.php.jade        |  2 +-
 5 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 src/_h5ai/client/js/inc/boot.js
 rename src/_h5ai/client/js/inc/{main.js => main/index.js} (81%)
 rename src/_h5ai/client/js/inc/{ => main}/info.js (98%)

diff --git a/src/_h5ai/client/js/inc/boot.js b/src/_h5ai/client/js/inc/boot.js
new file mode 100644
index 00000000..af403a43
--- /dev/null
+++ b/src/_h5ai/client/js/inc/boot.js
@@ -0,0 +1,30 @@
+modulejs.define('boot', ['$'], function ($) {
+
+    if ($('html').hasClass('no-browser')) {
+        return;
+    }
+
+    var module = $('script[data-module]').data('module');
+    var data = {action: 'get', setup: true, options: true, types: true, theme: true, langs: true};
+    var url;
+
+    if (module === 'index') {
+        url = '.';
+    } else if (module === 'info') {
+        data.updatecmds = true;
+        url = 'server/php/index.php';
+    } else {
+        return;
+    }
+
+    $.ajax({
+        url: url,
+        data: data,
+        type: 'POST',
+        dataType: 'json'
+    }).done(function (config) {
+
+        modulejs.define('config', config);
+        $(function () { modulejs.require('main/' + module); });
+    });
+});
diff --git a/src/_h5ai/client/js/inc/main.js b/src/_h5ai/client/js/inc/main/index.js
similarity index 81%
rename from src/_h5ai/client/js/inc/main.js
rename to src/_h5ai/client/js/inc/main/index.js
index b439956e..95570dd2 100644
--- a/src/_h5ai/client/js/inc/main.js
+++ b/src/_h5ai/client/js/inc/main/index.js
@@ -1,4 +1,4 @@
-modulejs.define('main', ['_', 'core/event'], function (_, event) {
+modulejs.define('main/index', ['_', 'core/event'], function (_, event) {
 
     modulejs.require('view/ensure');
     modulejs.require('view/items');
diff --git a/src/_h5ai/client/js/inc/info.js b/src/_h5ai/client/js/inc/main/info.js
similarity index 98%
rename from src/_h5ai/client/js/inc/info.js
rename to src/_h5ai/client/js/inc/main/info.js
index a32c7146..9b299e0f 100644
--- a/src/_h5ai/client/js/inc/info.js
+++ b/src/_h5ai/client/js/inc/main/info.js
@@ -1,4 +1,4 @@
-modulejs.define('info', ['$', 'config'], function ($, config) {
+modulejs.define('main/info', ['$', 'config'], function ($, config) {
 
     var testsTemp =
             '<ul id="tests">';
diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js
index 96c051af..f950c63f 100644
--- a/src/_h5ai/client/js/scripts.js
+++ b/src/_h5ai/client/js/scripts.js
@@ -10,7 +10,6 @@
     'use strict';
 
     var win = window;
-
     modulejs.define('$', function () { return win.jQuery; });
     modulejs.define('_', function () { return win._; });
     modulejs.define('marked', function () { return win.marked; });
@@ -19,33 +18,5 @@
 
     // @include "inc/**/*.js"
 
-    var $ = win.jQuery;
-
-    if ($('html').hasClass('no-browser')) {
-        return;
-    }
-
-    var module = $('script[data-module]').data('module');
-    var data = {action: 'get', setup: true, options: true, types: true, theme: true, langs: true};
-    var url;
-
-    if (module === 'main') {
-        url = '.';
-    } else if (module === 'info') {
-        data.updatecmds = true;
-        url = 'server/php/index.php';
-    } else {
-        return;
-    }
-
-    $.ajax({
-        url: url,
-        data: data,
-        type: 'POST',
-        dataType: 'json'
-    }).done(function (config) {
-
-        modulejs.define('config', config);
-        $(function () { modulejs.require(module); });
-    });
+    modulejs.require('boot');
 }());
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index 36ff8b61..30abbfd8 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -16,7 +16,7 @@ head
     link( rel="shortcut icon", href!="#{app_href}client/images/favicon/favicon-16-32.ico" )
     link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/favicon-152.png" )
     link( rel="stylesheet", href!="#{app_href}client/css/styles.css" )
-    script( src!="#{app_href}client/js/scripts.js", data-module="main" )
+    script( src!="#{app_href}client/js/scripts.js", data-module="index" )
 
 body