From 8687547e47b7c90099013b903e89113300903d27 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Thu, 29 May 2008 18:27:12 +0000
Subject: * Bugfixes * Moved cbi.js into the right directory * Added more
 debugging to dispatcher * Introduced about page

---
 libs/cbi/root/www/luci-static/resources/cbi.js | 42 ++++++++++++++++++++++++++
 libs/cbi/root/www/resources/cbi.js             | 42 --------------------------
 libs/web/luasrc/dispatcher.lua                 |  9 +++++-
 3 files changed, 50 insertions(+), 43 deletions(-)
 create mode 100644 libs/cbi/root/www/luci-static/resources/cbi.js
 delete mode 100644 libs/cbi/root/www/resources/cbi.js

(limited to 'libs')

diff --git a/libs/cbi/root/www/luci-static/resources/cbi.js b/libs/cbi/root/www/luci-static/resources/cbi.js
new file mode 100644
index 0000000000..a3a47aa45b
--- /dev/null
+++ b/libs/cbi/root/www/luci-static/resources/cbi.js
@@ -0,0 +1,42 @@
+var cbi_d = {};
+
+function cbi_d_add(field, target, value) {
+	if (!cbi_d[target]) {
+		cbi_d[target] = {};
+	}
+	if (!cbi_d[target][value]) {
+		cbi_d[target][value] = [];
+	}
+	cbi_d[target][value].push(field);
+}
+
+function cbi_d_update(target) {
+	if (!cbi_d[target]) {
+		return;
+	}
+	
+	for (var x in cbi_d[target]) {
+		for (var i=0; i<cbi_d[target][x].length; i++) {	
+			var y = document.getElementById(cbi_d[target][x][i])	
+			y.style.display = "none";
+		}
+	}
+	
+	var t = document.getElementById(target);
+	if (t && t.value && cbi_d[target][t.value]) {
+		for (var i=0; i<cbi_d[target][t.value].length; i++) {			
+			var y = document.getElementById(cbi_d[target][t.value][i])
+			if (!y.value) {	
+				y.style.display = "table-row";
+			} else {
+				y.style.display = "block";
+			}
+		}
+	}
+}
+
+function cbi_d_init() {
+	for (var x in cbi_d) {
+		cbi_d_update(x);
+	}
+}
\ No newline at end of file
diff --git a/libs/cbi/root/www/resources/cbi.js b/libs/cbi/root/www/resources/cbi.js
deleted file mode 100644
index a3a47aa45b..0000000000
--- a/libs/cbi/root/www/resources/cbi.js
+++ /dev/null
@@ -1,42 +0,0 @@
-var cbi_d = {};
-
-function cbi_d_add(field, target, value) {
-	if (!cbi_d[target]) {
-		cbi_d[target] = {};
-	}
-	if (!cbi_d[target][value]) {
-		cbi_d[target][value] = [];
-	}
-	cbi_d[target][value].push(field);
-}
-
-function cbi_d_update(target) {
-	if (!cbi_d[target]) {
-		return;
-	}
-	
-	for (var x in cbi_d[target]) {
-		for (var i=0; i<cbi_d[target][x].length; i++) {	
-			var y = document.getElementById(cbi_d[target][x][i])	
-			y.style.display = "none";
-		}
-	}
-	
-	var t = document.getElementById(target);
-	if (t && t.value && cbi_d[target][t.value]) {
-		for (var i=0; i<cbi_d[target][t.value].length; i++) {			
-			var y = document.getElementById(cbi_d[target][t.value][i])
-			if (!y.value) {	
-				y.style.display = "table-row";
-			} else {
-				y.style.display = "block";
-			}
-		}
-	}
-}
-
-function cbi_d_init() {
-	for (var x in cbi_d) {
-		cbi_d_update(x);
-	}
-}
\ No newline at end of file
diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index fc551a4bde..d075975da3 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -220,11 +220,18 @@ function createtree()
 	if not built_index then
 		createindex()
 	end
+	
+	require("luci.i18n")
 
 	for k, v in pairs(index) do
 		luci.util.updfenv(v, _M)
 		luci.util.extfenv(v, "_NAME", k)
-		pcall(v)
+		
+		local stat, err = pcall(v)
+		if not stat then
+			error500(err)	
+			os.exit(1)
+		end
 	end
 	
 	built_tree = true
-- 
cgit v1.2.3