https urls and profile chart points

src/landing_page.js

@@ -11,7 +11,7 @@ morpheus.LandingPage = function (pageOptions) {
 	html.push('<div name="help" class="pull-right"></div>');
 
 	html
-	.push('<div style="margin-bottom:10px;"><img src="//www.broadinstitute.org/cancer/software/morpheus/images/icon.svg" alt="logo" /> <span style="font-size:16px;font-family:Roboto,sans-serif;">Morpheus</span></div>');
+	.push('<div style="margin-bottom:10px;"><img src="https://www.broadinstitute.org/cancer/software/morpheus/images/icon.svg" alt="logo" /> <span style="font-size:16px;font-family:Roboto,sans-serif;">Morpheus</span></div>');
 
 	html.push('<h4>Open your own file</h4>');
 	html.push('<div name="formRow" class="center-block"></div>');

src/tools/chart_tool2.js

@@ -534,18 +534,20 @@ morpheus.ChartTool2.prototype = {
 				text.push(obj);
 			}
 			var trace = {
-				x: x,
-				y: y,
-				name: colorByVector ? colorByVector.getValue(i) : '',
-				tickmode: 'array',
-				marker: {
-					size: size,
-					symbol: 'circle'
-				},
-				text: text,
-				mode: 'markers+lines',
-				type: 'scatter' // scattergl
-			};
+					x: x,
+					y: y,
+					name: colorByVector ? colorByVector.getValue(i) : '',
+					tickmode: 'array',
+					marker: {
+						size: size,
+						symbol: 'circle'
+					},
+					text: text,
+					mode: 'lines' + (options.showPoints ? '+markers' : ''
+					),
+					type: 'scatter' // scattergl
+				}
+				;
 			traces.push(trace);
 		}
 
@@ -755,7 +757,7 @@ morpheus.ChartTool2.prototype = {
 		var config = plotlyDefaults.config;
 		var chartWidth = 400;
 		var chartHeight = 400;
-		var points = this.formBuilder.getValue('show_points');
+		var showPoints = this.formBuilder.getValue('show_points');
 
 		var groupColumnsBy = this.formBuilder.getValue('group_columns_by');
 		var axisLabel = this.formBuilder.getValue('axis_label');
@@ -774,7 +776,7 @@ morpheus.ChartTool2.prototype = {
 			return;
 		}
 		if ((dataset.getRowCount() * dataset.getColumnCount()) > 100000) {
-			points = false;
+			showPoints = false;
 		}
 
 		var grid = [];
@@ -810,6 +812,7 @@ morpheus.ChartTool2.prototype = {
 			}
 			this
 			._createProfile({
+				showPoints: showPoints,
 				isColumnChart: chartType === 'column profile',
 				axisLabelVector: axisLabelVector,
 				colorByVector: colorByVector,
@@ -877,7 +880,7 @@ morpheus.ChartTool2.prototype = {
 						this
 						._createBoxPlot({
 							array: array,
-							points: points,
+							points: showPoints,
 							colorByVector: colorByVector,
 							colorModel: colorModel,
 							colorByGetter: function (item) {
@@ -1127,7 +1130,7 @@ morpheus.ChartTool2.prototype = {
 									}
 								}),
 								array: array,
-								points: points,
+								points: showPoints,
 								sizeByGetter: sizeByGetter,
 								sizeFunction: sizeByScale,
 								colorModel: colorModel,

src/ui/canvas_util.js

@@ -2,17 +2,6 @@ morpheus.CanvasUtil = function() {
 };
 morpheus.CanvasUtil.dragging = false;
 
-morpheus.CanvasUtil.measureScrollbar = function() {
-	var $c = $(
-			'<div style=\'position:absolute; top:-10000px; left:-10000px; width:100px; height:100px; overflow:scroll;\'></div>')
-			.appendTo('body');
-	var dim = {
-		width : $c.width() - $c[0].clientWidth,
-		height : $c.height() - $c[0].clientHeight
-	};
-	$c.remove();
-	return dim;
-};
 morpheus.CanvasUtil.FONT_NAME = '"Helvetica Neue",Helvetica,Arial,sans-serif';
 morpheus.CanvasUtil.FONT_COLOR = 'rgb(34, 34, 34)';
 morpheus.CanvasUtil.getPreferredSize = function(c) {

src/util/util.js

@@ -52,6 +52,17 @@ morpheus.Util.loadTrackingCode = function () {
 	}
 };
 
+morpheus.Util.measureScrollbar = function () {
+	var $c = $(
+		'<div style=\'position:absolute; top:-10000px; left:-10000px; width:100px; height:100px; overflow:scroll;\'></div>')
+	.appendTo('body');
+	var dim = {
+		width: Math.max(0, $c.width() - $c[0].clientWidth),
+		height: $c.height() - $c[0].clientHeight
+	};
+	$c.remove();
+	return dim;
+};
 morpheus.Util.trackEvent = function (options) {
 	if (typeof window !== 'undefined') {
 		if (!morpheus.Util.TRACKING_CODE_LOADED) {