Renamed analytics to av as analytics creates issues with ad blockers and similar web plugins

Author: santilland

app/index.html

@@ -15,12 +15,12 @@
             <link rel="stylesheet" href="styles/main.css" />
         <!-- endbuild -->
 
-        <!-- build:css(.tmp) styles/analytics.min.css -->
+        <!-- build:css(.tmp) styles/av.min.css -->
             <link rel="stylesheet" href="styles/analytics.css" />
             <link rel="stylesheet" href="styles/sumoselect.css" />
         <!-- endbuild -->
 
-        <!-- build:css(.tmp) styles/analytics_plugins.css -->
+        <!-- build:css(.tmp) styles/av_plugins.css -->
             <link href="bower_components/nvd3/nv.d3.min.css" rel="stylesheet" type="text/css">
         <!-- endbuild -->
 
@@ -57,14 +57,14 @@
 
 
 
-		<!-- build:js scripts/analytics.min.js -->
+		<!-- build:js scripts/av.min.js -->
         <script src="scripts/vendor/jquery.sumoselect.js"></script>
         <script src="scripts/vendor/rgbcolor.js"></script>
         <script src="scripts/vendor/canvg.js"></script>
         <script src="scripts/scatter.js"></script>
         <!-- endbuild -->
 
-        <!-- build:js scripts/main_analytics.js -->
+        <!-- build:js scripts/main_av.js -->
         <script src="scripts/main.js"></script>
         <!-- endbuild -->
 

app/scripts/scatter.js

@@ -1155,6 +1155,34 @@ scatterPlot.prototype.parallelsPlot = function parallelsPlot(){
 			self.render();
 		});
 
+		// Handles a brush event, toggling the display of foreground lines.
+		function brushend(parameter) {
+			
+			self.active_brushes = self.parameters.filter(function(p) { return !self.y[p].brush.empty(); });
+			self.brush_extents = {};
+			self.active_brushes.map(function(p) { self.brush_extents[p] = self.y[p].brush.extent(); });
+			var filter = {};
+
+			var active;
+			
+			_.each(self.data, function(row){
+				active = true;
+				self.active_brushes.forEach (function(p) {
+					filter[p] = self.brush_extents[p];
+			    	if (!(self.brush_extents[p][0] <= row[p] && row[p] <= self.brush_extents[p][1])){
+			    		active = false;
+			    	}
+		    	});
+				row["active"] = active ? 1 : 0;
+			}); 
+
+			self.filterset(filter);
+			
+
+			self.render();
+			self.parallelsPlot();
+
+		}
 
 
 	    var self = this;
@@ -1359,34 +1387,6 @@ scatterPlot.prototype.parallelsPlot = function parallelsPlot(){
 			}));
 		}
 
-		// Handles a brush event, toggling the display of foreground lines.
-		function brushend(parameter) {
-			
-			self.active_brushes = self.parameters.filter(function(p) { return !self.y[p].brush.empty(); });
-			self.brush_extents = {};
-			self.active_brushes.map(function(p) { self.brush_extents[p] = self.y[p].brush.extent(); });
-			var filter = {};
-
-			var active;
-			
-			_.each(self.data, function(row){
-				active = true;
-				self.active_brushes.forEach (function(p) {
-					filter[p] = self.brush_extents[p];
-			    	if (!(self.brush_extents[p][0] <= row[p] && row[p] <= self.brush_extents[p][1])){
-			    		active = false;
-			    	}
-		    	});
-				row["active"] = active ? 1 : 0;
-			}); 
-
-			self.filterset(filter);
-			
-
-			self.render();
-			self.parallelsPlot();
-
-		}
 
 		// Resize method, recalculates position of all elements in svg
 		function resize_parallels() {

lib/index.html

@@ -15,12 +15,12 @@
             <link rel="stylesheet" href="styles/main.css">
         <!-- endbuild -->
 
-        <!-- build:css(.tmp) styles/analytics.min.css -->
+        <!-- build:css(.tmp) styles/av.min.css -->
             <link rel="stylesheet" href="styles/analytics.css">
             <link rel="stylesheet" href="styles/sumoselect.css">
         <!-- endbuild -->
 
-        <!-- build:css(.tmp) styles/analytics_plugins.css -->
+        <!-- build:css(.tmp) styles/av_plugins.css -->
             <link href="bower_components/nvd3/nv.d3.min.css" rel="stylesheet" type="text/css">
         <!-- endbuild -->
 
@@ -57,14 +57,14 @@
 
 
 
-		<!-- build:js scripts/analytics.min.js -->
+		<!-- build:js scripts/av.min.js -->
         <script src="scripts/vendor/jquery.sumoselect.js"></script>
         <script src="scripts/vendor/rgbcolor.js"></script>
         <script src="scripts/vendor/canvg.js"></script>
         <script src="scripts/scatter.js"></script>
         <!-- endbuild -->
 
-        <!-- build:js scripts/main_analytics.js -->
+        <!-- build:js scripts/main_av.js -->
         <script src="scripts/main.js"></script>
         <!-- endbuild -->