From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 31 Jul 2019 06:39:10 +0000 (+0200)
Subject: luci-base: network.js: extend ifnameOf() and expose as getIfnameOf()
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=227fae8a378826bcacd6fb118385bcff15278173;p=oweals%2Fluci.git

luci-base: network.js: extend ifnameOf() and expose as getIfnameOf()

Extend the ifnameOf() helper function to cover all object types used by
network.js and expose it as public getIfnameOf() api function for use by
other modules.

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

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index ac0ef212c..258387995 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -561,10 +561,14 @@ function initNetworkState() {
 }
 
 function ifnameOf(obj) {
-	if (obj instanceof Interface)
-		return obj.name();
-	else if (obj instanceof Protocol)
-		return obj.ifname();
+	if (obj instanceof Protocol)
+		return obj.getIfname();
+	else if (obj instanceof Device)
+		return obj.getName();
+	else if (obj instanceof WifiDevice)
+		return obj.getName();
+	else if (obj instanceof WifiNetwork)
+		return obj.getIfname();
 	else if (typeof(obj) == 'string')
 		return obj.replace(/:.+$/, '');
 
@@ -1151,6 +1155,10 @@ Network = L.Class.extend({
 
 	instantiateWifiNetwork: function(sid, radioname, radiostate, netid, netstate, iwinfo) {
 		return new WifiNetwork(sid, radioname, radiostate, netid, netstate, iwinfo);
+	},
+
+	getIfnameOf: function(obj) {
+		return ifnameOf(obj);
 	}
 });