fix affinity slider updates - issue #1714

2 files changed, 35 insertions, 35 deletions

diff --git a/view/js/main.js b/view/js/main.js
index c409eed35..fdebb5faa 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -646,7 +646,6 @@ function updatePageItems(mode, data) {
 
 
 function updateConvItems(mode,data) {
-
 	var scroll_position = $(window).scrollTop();
 
 	if(mode !== 'update')
@@ -659,10 +658,6 @@ function updateConvItems(mode,data) {
 		next = 'threads-end';
 	}
 
-	if(mode === 'replace') {
-		$('.thread-parent').remove(); // clear existing content
-	}
-
 	$('.thread-wrapper', data).each(function() {
 		if(this.classList.contains('toplevel_item')) {
 			var ident = this.id;
@@ -955,9 +950,13 @@ function liveUpdate(notify_id) {
 	console.log('displaying: ' + update_url);
 
 	if(page_load) {
+
 		$("#page-spinner").show();
-		if(bParam_page == 1)
+
+		if(bParam_page == 1) {
 			update_mode = 'replace';
+			$('.thread-wrapper').remove();
+		}
 		else
 			update_mode = 'append';
 	}
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index f5c573970..a47bb8eae 100644
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,43 +1,44 @@
 <div id="main-slider" class="slider" >
 	<input id="main-range" type="text" name="cminmax" value="{{$val}}" />
-	<div id="profile-jot-text-loading" class="spinner-wrapper">
-		<div class="spinner m"></div>
-	</div>
 </div>
 <script>
 $(document).ready(function() {
-	var old_cmin = 0;
-	var old_cmax = 99;
+	let old_cmin = 0;
+	let old_cmax = 99;
 
-	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false,  onstatechange: function(v) { 
-		var carr = v.split(",");
-		if(carr[0] != bParam_cmin) {
-			old_cmin = bParam_cmin;
-	 		bParam_cmin = carr[0];
-		}
-		if(carr[1] != bParam_cmax) {
-			old_cmax = bParam_cmax; 
-			bParam_cmax = carr[1];
-		}
-		networkRefresh();
- 	} });
-
-	var slideTimer = null;
-	function networkRefresh() {
+	$("#main-range").jRange({
+		isRange: true,
+		from: 0,
+		to: 99,
+		step: 1,
+		scale: [{{$labels}}],
+		width:'100%',
+		showLabels: false,
+		onstatechange: function(v) {
+			let carr = v.split(",");
 
-		$("#profile-jot-text-loading").show();
+			if(carr[0] != bParam_cmin) {
+				old_cmin = bParam_cmin;
+				bParam_cmin = carr[0];
+			}
 
-		if((document.readyState !== "complete") || (slideTimer !== null))
-			return;
-		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
-			return;
+			if(carr[1] != bParam_cmax) {
+				old_cmax = bParam_cmax;
+				bParam_cmax = carr[1];
+			}
 
-		slideTimer = setTimeout(networkTimerRefresh,2000);
-	}
+		},
+		onbarclicked: function() {
+			affinity_network_refresh();
+		},
+		ondragend: function() {
+			affinity_network_refresh();
+		}
+	});
 
-	function networkTimerRefresh() {
-		slideTimer = null;
+	function affinity_network_refresh() {
 		page_load = true;
+		next_page = 1;
 		liveUpdate();
 	}
 });