From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 8 Jul 2019 15:39:24 +0000 (+0200)
Subject: luci-base: use native ubus HTTP gateway if available
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=006f7c7932a29cf0473f0b3c256eb3504001dd01;p=oweals%2Fluci.git

luci-base: use native ubus HTTP gateway if available

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index 93ecbac15..1bb4673b0 100644
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -579,7 +579,9 @@
 			Promise.all([
 				domReady,
 				this.require('ui'),
-				this.require('form')
+				this.require('rpc'),
+				this.require('form'),
+				Request.get('/ubus/').catch(function() { return { status: 0 } })
 			]).then(this.setupDOM.bind(this)).catch(this.error);
 
 			originalCBIInit = window.cbi_init;
@@ -752,7 +754,16 @@
 		},
 
 		/* DOM setup */
-		setupDOM: function(ev) {
+		setupDOM: function(res) {
+			var domEv = res[0],
+			    uiClass = res[1],
+			    rpcClass = res[2],
+			    formClass = res[3],
+			    ubusReply = res[4];
+
+			if (ubusReply.status == 400)
+				rpcClass.setBaseURL('/ubus/');
+
 			Request.addInterceptor(function(res) {
 				if (res.status != 403 || res.headers.get('X-LuCI-Login-Required') != 'yes')
 					return;