fixed navigateViaHash for dashboards (9dca5aae) · Commits · github_fork / Clip

web/js/fnordmetric.dashboard_view.js

+5 −5

Original line number	Diff line number	Diff line
		@@ -45,10 +45,10 @@ FnordMetric.views.dashboardView = (function(dashboard_name){
		/* argh... */
		if(widget.klass=='TimelineWidget'){ _w = FnordMetric.widgets.timeseriesWidget(); }
		if(widget.klass=='NumbersWidget'){ _w = FnordMetric.widgets.numbersWidget(); }
		if(widget.klass=='RealtimeValueWidget'){ _w = FnordMetric.widgets.realtimeValueWidget(); }

		if(widget.klass=='BarsWidget'){ _w = FnordMetric.widgets.barsWidget(); }
		if(widget.klass=='ToplistWidget'){ _w = FnordMetric.widgets.toplistWidget(); }

		if(widget.klass=='BarsWidget'){ _w = FnordMetric.widgets.barsWidget(); }
		if(widget.klass=='PieWidget'){ _w = FnordMetric.widgets.pieWidget(); }
		if(widget.klass=="HtmlWidget") { _w = FnordMetric.widgets.htmlWidget(); }

+12 −5

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@ var FnordMetric = (function(){
		var gauges = {};
		var socket, conf;

		var navigatedViaHash = false;

		function renderDashboard(_dash){
		loadView(FnordMetric.views.dashboardView(_dash));
		}
		@@ -96,7 +98,7 @@ var FnordMetric = (function(){

		if(!currentView && (window.location.hash.length < 2)){
		sidebarClick.apply($('#sidebar li:first'));
		} else if(!currentView){
		} else if(!navigatedViaHash){
		navigateViaHash();
		}
		}
		@@ -208,10 +210,15 @@ var FnordMetric = (function(){

		function navigateViaHash(){
		if (window.location.hash){
		var elem = null;
		if (!!window.location.hash.match(/^#dashboard\/[a-zA-Z_0-9-]+$/)) {
		$('#sidebar li.dashboard[data-token="'+window.location.hash.slice(11)+'"]').trigger('click');
		elem = $('#sidebar li.gauge[data-token="'+window.location.hash.slice(11)+'"]');
		} else if (!!window.location.hash.match(/^#gauge\/[a-zA-Z_0-9-]+$/)){
		$('#sidebar li.gauge[data-token="'+window.location.hash.slice(7)+'"]').click();
		elem = $('#sidebar li.gauge[data-token="'+window.location.hash.slice(7)+'"]');
		}
		if (elem.length > 0) {
		navigatedViaHash = true;
		elem.click();
		}
		}
		}

+1 −1

File changed.

Contains only whitespace changes.