X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fluci2.js;h=55de4c97e2abc181ee37b05bdb26b8f972d40b3c;hp=d2ad812b5549b2be20f9508c8a844b4ea9c00e8c;hb=900b9b762a75d9ffb393ca7ba5feed7b289d0929;hpb=dce206d8191a33863ec36553f761e611d42b8762

diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js
index d2ad812..55de4c9 100644
--- a/luci2/htdocs/luci2/luci2.js
+++ b/luci2/htdocs/luci2/luci2.js
@@ -1188,6 +1188,57 @@ function LuCI2()
 		}
 	};
 
+	this.firewall = {
+		getZoneColor: function(zone)
+		{
+			if ($.isPlainObject(zone))
+				zone = zone.name;
+
+			if (zone == 'lan')
+				return '#90f090';
+			else if (zone == 'wan')
+				return '#f09090';
+
+			for (var i = 0, hash = 0;
+				 i < zone.length;
+				 hash = zone.charCodeAt(i++) + ((hash << 5) - hash));
+
+			for (var i = 0, color = '#';
+				 i < 3;
+				 color += ('00' + ((hash >> i++ * 8) & 0xFF).tozoneing(16)).slice(-2));
+
+			return color;
+		},
+
+		findZoneByNetwork: function(network)
+		{
+			var self = this;
+			var zone = undefined;
+
+			return _luci2.uci.foreach('firewall', 'zone', function(z) {
+				if (!z.name || !z.network)
+					return;
+
+				if (!$.isArray(z.network))
+					z.network = z.network.split(/\s+/);
+
+				for (var i = 0; i < z.network.length; i++)
+				{
+					if (z.network[i] == network)
+					{
+						zone = z;
+						break;
+					}
+				}
+			}).then(function() {
+				if (zone)
+					zone.color = self.getZoneColor(zone);
+
+				return zone;
+			});
+		}
+	};
+
 	this.system = {
 		getSystemInfo: _luci2.rpc.declare({
 			object: 'system',
@@ -2115,9 +2166,14 @@ function LuCI2()
 				.append(_luci2.globals.mainMenu.render(2, 900));
 		},
 
-		renderView: function(node)
+		renderView: function()
 		{
+			var node = arguments[0];
 			var name = node.view.split(/\//).join('.');
+			var args = [ ];
+
+			for (var i = 1; i < arguments.length; i++)
+				args.push(arguments[i]);
 
 			if (_luci2.globals.currentView)
 				_luci2.globals.currentView.finish();
@@ -2132,7 +2188,7 @@ function LuCI2()
 			if (_luci2._views[name] instanceof _luci2.ui.view)
 			{
 				_luci2.globals.currentView = _luci2._views[name];
-				return _luci2._views[name].render();
+				return _luci2._views[name].render.apply(_luci2._views[name], args);
 			}
 
 			var url = _luci2.globals.resource + '/view/' + name + '.js';
@@ -2158,7 +2214,7 @@ function LuCI2()
 					});
 
 					_luci2.globals.currentView = _luci2._views[name];
-					return _luci2._views[name].render();
+					return _luci2._views[name].render.apply(_luci2._views[name], args);
 				}
 				catch(e) {
 					alert('Unable to instantiate view "%s": %s'.format(url, e));
@@ -2283,6 +2339,10 @@ function LuCI2()
 
 		insertInto: function(id) {
 			return $(id).empty().append(this.render());
+		},
+
+		appendTo: function(id) {
+			return $(id).append(this.render());
 		}
 	});
 
@@ -2335,8 +2395,13 @@ function LuCI2()
 				container.append($('<div />').addClass('cbi-map-descr').append(this.description));
 
 			var self = this;
+			var args = [ ];
+
+			for (var i = 0; i < arguments.length; i++)
+				args.push(arguments[i]);
+
 			return this._fetch_template().then(function() {
-				return _luci2.deferrable(self.execute());
+				return _luci2.deferrable(self.execute.apply(self, args));
 			});
 		},
 
@@ -2355,11 +2420,12 @@ function LuCI2()
 			var setTimer, runTimer;
 
 			setTimer = function() {
-				self._timeouts[index] = window.setTimeout(runTimer, interval);
+				if (self._timeouts)
+					self._timeouts[index] = window.setTimeout(runTimer, interval);
 			};
 
 			runTimer = function() {
-				_luci2.deferrable(func.call(self)).then(setTimer);
+				_luci2.deferrable(func.call(self)).then(setTimer, setTimer);
 			};
 
 			runTimer();