From a087e96d69ea4bfb9aebb079ce0a77467ad2d998 Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Thu, 11 Oct 2012 14:45:18 +0200
Subject: [PATCH] More changes to init procedure and API.

---
 .../client/js/inc/{h5ai-info.js => info.js}      |  6 +++---
 .../client/js/inc/{h5ai-main.js => main.js}      |  2 +-
 src/_h5ai/client/js/scripts.js                   | 16 ++++++++++------
 src/_h5ai/index.html.jade                        |  2 +-
 src/_h5ai/server/aai/header.html.jade            |  2 +-
 src/_h5ai/server/php/index.php.jade              |  2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)
 rename src/_h5ai/client/js/inc/{h5ai-info.js => info.js} (64%)
 rename src/_h5ai/client/js/inc/{h5ai-main.js => main.js} (80%)

diff --git a/src/_h5ai/client/js/inc/h5ai-info.js b/src/_h5ai/client/js/inc/info.js
similarity index 64%
rename from src/_h5ai/client/js/inc/h5ai-info.js
rename to src/_h5ai/client/js/inc/info.js
index e617d598..e09c9ed9 100644
--- a/src/_h5ai/client/js/inc/h5ai-info.js
+++ b/src/_h5ai/client/js/inc/info.js
@@ -1,5 +1,5 @@
 
-modulejs.define('h5ai-info', ['$', 'core/server'], function ($, server) {
+modulejs.define('info', ['$'], function ($) {
 
 	var setCheckResult = function (id, result) {
 
@@ -14,12 +14,12 @@ modulejs.define('h5ai-info', ['$', 'core/server'], function ($, server) {
 
 		init = function () {
 
-			server.request({action: 'get', checks: true}, function (json) {
+			$.getJSON('server/php/index.php', {action: 'get', checks: true}, function (json) {
 
 				if (json) {
 					$('.test').each(function () {
 
-						setCheckResult(this, json[$(this).data('id')]);
+						setCheckResult(this, json.checks[$(this).data('id')]);
 					});
 				}
 			});
diff --git a/src/_h5ai/client/js/inc/h5ai-main.js b/src/_h5ai/client/js/inc/main.js
similarity index 80%
rename from src/_h5ai/client/js/inc/h5ai-main.js
rename to src/_h5ai/client/js/inc/main.js
index 4c90844d..ed29852e 100644
--- a/src/_h5ai/client/js/inc/h5ai-main.js
+++ b/src/_h5ai/client/js/inc/main.js
@@ -1,5 +1,5 @@
 
-modulejs.define('h5ai-main', ['_', 'core/event'], function (_, event) {
+modulejs.define('main', ['_', 'core/event'], function (_, event) {
 
 	event.pub('beforeView');
 
diff --git a/src/_h5ai/client/js/scripts.js b/src/_h5ai/client/js/scripts.js
index b487c71d..a1cab5ba 100644
--- a/src/_h5ai/client/js/scripts.js
+++ b/src/_h5ai/client/js/scripts.js
@@ -24,8 +24,7 @@
 	var	filename = 'client/js/scripts.js',
 		$scriptTag = $('script[src$="' + filename + '"]'),
 		src = $scriptTag.attr('src'),
-		main = $scriptTag.data('main'),
-		backend = $scriptTag.data('backend'),
+		mode = $scriptTag.data('mode'),
 
 		appHref = src.substr(0, src.length - filename.length),
 
@@ -41,11 +40,16 @@
 			modulejs.define('moment', function () { return moment; });
 			modulejs.define('_', function () { return _; });
 
-			$(function () { modulejs.require(main); });
+			$(function () { modulejs.require('main'); });
 		};
 
 
-	if (backend === 'php') {
+	if (mode === 'info') {
+
+		modulejs.define('$', function () { return jQuery; });
+		$(function () { modulejs.require('info'); });
+
+	} else if (mode === 'php') {
 
 		$.getJSON('.', {
 			action: 'get',
@@ -55,7 +59,7 @@
 			server: true
 		}, run);
 
-	} else if (backend === 'aai') {
+	} else if (mode === 'aai') {
 
 		var loadJson = function (href) {
 
@@ -81,7 +85,7 @@
 				types: types,
 				langs: langs,
 				server: {
-					backend: backend,
+					backend: mode,
 					api: false,
 					name: 'apache',
 					version: null
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index c5bbcfa0..8503be40 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -15,7 +15,7 @@ html.no-js( lang="en" )
 		link( rel="apple-touch-icon", type="image/png", href="client/images/app-48x48.png" )
 		link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" )
 		link( rel="stylesheet", href="client/css/styles.css" )
-		script( src="client/js/scripts.js", data-main="h5ai-info", data-backend="php" )
+		script( src="client/js/scripts.js", data-mode="info" )
 
 	body#h5ai-info
 
diff --git a/src/_h5ai/server/aai/header.html.jade b/src/_h5ai/server/aai/header.html.jade
index 9ab08df1..29106464 100644
--- a/src/_h5ai/server/aai/header.html.jade
+++ b/src/_h5ai/server/aai/header.html.jade
@@ -18,7 +18,7 @@ head
 	link( rel="apple-touch-icon", type="image/png", href="#{href}client/images/app-48x48.png" )
 	link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" )
 	link( rel="stylesheet", href="#{href}client/css/styles.css" )
-	script( src="#{href}client/js/scripts.js", data-main="h5ai-main", data-backend="aai" )
+	script( src="#{href}client/js/scripts.js", data-mode="aai" )
 
 |<body id="h5ai-main">
 
diff --git a/src/_h5ai/server/php/index.php.jade b/src/_h5ai/server/php/index.php.jade
index 1c26775a..ac4ef7d2 100644
--- a/src/_h5ai/server/php/index.php.jade
+++ b/src/_h5ai/server/php/index.php.jade
@@ -21,7 +21,7 @@ html.no-js( lang="en" )
 		link( rel="apple-touch-icon", type="image/png", href!="#{href}client/images/app-48x48.png" )
 		link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" )
 		link( rel="stylesheet", href!="#{href}client/css/styles.css" )
-		script( src!="#{href}client/js/scripts.js", data-main="h5ai-main", data-backend="php" )
+		script( src!="#{href}client/js/scripts.js", data-mode="php" )
 
 	body#h5ai-main