From fc06148e99b34d976827d68c4d11f91bbacfb0f0 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Wed, 15 Jan 2020 01:05:23 +0800
Subject: [PATCH] luci-app-onliner: merge upstream source

---
 package/ctcgfw/luci-app-onliner/Makefile                      | 2 +-
 .../ctcgfw/luci-app-onliner/luasrc/view/onliner/display.htm   | 4 ++--
 .../ctcgfw/luci-app-onliner/root/usr/share/onliner/setnlbw.sh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/ctcgfw/luci-app-onliner/Makefile b/package/ctcgfw/luci-app-onliner/Makefile
index 2018525c29..11a9647e04 100644
--- a/package/ctcgfw/luci-app-onliner/Makefile
+++ b/package/ctcgfw/luci-app-onliner/Makefile
@@ -10,7 +10,7 @@ LUCI_DEPENDS:=+luci-app-wrtbwmon
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-onliner
 PKG_VERSION:=1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 define Package/luci-app-onliner/install
     $(INSTALL_DIR) $(1)/usr/lib/lua/luci
diff --git a/package/ctcgfw/luci-app-onliner/luasrc/view/onliner/display.htm b/package/ctcgfw/luci-app-onliner/luasrc/view/onliner/display.htm
index 29b738e845..f24e369a4f 100644
--- a/package/ctcgfw/luci-app-onliner/luasrc/view/onliner/display.htm
+++ b/package/ctcgfw/luci-app-onliner/luasrc/view/onliner/display.htm
@@ -357,11 +357,11 @@ function fetchData(period)
 		if (res !== null && typeof(res) === 'object' && typeof(res.columns) === 'object' && typeof(res.data) === 'object')
 			trafficData = res;
 		trafficData["data"].sort();
-		bakdatanew = $.extend(true, {}, trafficData["data"]);
+		bakdatanew = JSON.parse(JSON.stringify(trafficData["data"]);
 		if (bakdataold){
 			var j=0;
 			var k=j;
-			var ll=Object.getOwnPropertyNames(bakdataold).length;
+			var ll=bakdataold.length;
 			for (i=0,l=trafficData["data"].length; i<l ; i++){
 				one=trafficData["data"][i];
 				for (j=k;j<ll;j++){
diff --git a/package/ctcgfw/luci-app-onliner/root/usr/share/onliner/setnlbw.sh b/package/ctcgfw/luci-app-onliner/root/usr/share/onliner/setnlbw.sh
index 8c10303593..cd49e40b48 100755
--- a/package/ctcgfw/luci-app-onliner/root/usr/share/onliner/setnlbw.sh
+++ b/package/ctcgfw/luci-app-onliner/root/usr/share/onliner/setnlbw.sh
@@ -2,7 +2,7 @@
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 echo "1">/var/run/onsetnlbw
 interval=$(uci get nlbwmon.@nlbwmon[0].refresh_interval)
-uci set nlbwmon.@nlbwmon[0].refresh_interval=2
+uci set nlbwmon.@nlbwmon[0].refresh_interval="2s"
 /etc/init.d/nlbwmon reload
 while true
 do
@@ -17,4 +17,4 @@ do
 	else
 		echo "0">/var/run/onsetnlbw
 	fi
-done
\ No newline at end of file
+done