fixed paths based on nrgiroux recommendation, now paths are displayin…

…g correctly on firefox, will release new version
MaayanLab · Mar 30, 2018 · 4101c0b · 4101c0b
1 parent 337cbb4
commit 4101c0b
Show file tree

Hide file tree

Showing 12 changed files with 2,303 additions and 2,419 deletions.
diff --git a/clustergrammer.js b/clustergrammer.js
diff --git a/src/dendrogram/build_single_dendro_slider.js b/src/dendrogram/build_single_dendro_slider.js
@@ -60,8 +60,8 @@ module.exports = function build_single_dendro_slider(cgm, inst_rc){
       var final_x = slider_length/10;
       var final_y = 0;
 
-      var output_string = 'M' + start_x + ',' + start_y + ', L' +
-      mid_x + ', ' + mid_y + ', L'
+      var output_string = 'M' + start_x + ',' + start_y + ' L' +
+      mid_x + ', ' + mid_y + ' L'
       + final_x + ','+ final_y +' Z';
 
       return output_string;

diff --git a/src/dendrogram/make_dendro_crop_buttons.js b/src/dendrogram/make_dendro_crop_buttons.js
@@ -119,8 +119,8 @@ module.exports = function make_dendro_crop_buttons(cgm, inst_rc){
         var data_key = '__data__';
         d3.select(this)[0][0][data_key].tri_dim = tri_dim;
 
-        var output_string = 'M' + start_x + ',' + start_y + ', L' +
-        mid_x + ', ' + mid_y + ', L'
+        var output_string = 'M' + start_x + ',' + start_y + ' L' +
+        mid_x + ', ' + mid_y + ' L'
         + final_x + ','+ final_y +' Z';
 
         return output_string;
@@ -184,8 +184,8 @@ module.exports = function make_dendro_crop_buttons(cgm, inst_rc){
         var data_key = '__data__';
         d3.select(this)[0][0][data_key].tri_dim = 10;
 
-        var output_string = 'M' + start_x + ',' + start_y + ', L' +
-        mid_x + ', ' + mid_y + ', L'
+        var output_string = 'M' + start_x + ',' + start_y + ' L' +
+        mid_x + ', ' + mid_y + ' L'
         + final_x + ','+ final_y +' Z';
 
         return output_string;

diff --git a/src/dendrogram/make_dendro_triangles.js b/src/dendrogram/make_dendro_triangles.js
@@ -157,8 +157,8 @@ module.exports = function make_dendro_triangles(cgm, inst_rc, is_change_group =
       }
 
 
-      var output_string = 'M' + start_x + ',' + start_y + ', L' +
-      mid_x + ', ' + mid_y + ', L'
+      var output_string = 'M' + start_x + ',' + start_y + ' L' +
+      mid_x + ', ' + mid_y + ' L'
       + final_x + ','+ final_y +' Z';
       return output_string;
     });

diff --git a/src/enter/draw_dn_tile.js b/src/enter/draw_dn_tile.js
@@ -5,8 +5,8 @@ module.exports = function draw_dn_tile(params){
   var start_y = params.viz.y_scale.rangeBand() - params.viz.border_width.y;
   var final_y = params.viz.y_scale.rangeBand() - params.viz.border_width.y;
 
-  var output_string = 'M' + start_x + ', ' + start_y + ' ,   L' +
-  final_x + ', ' + final_y + ',  L' + final_x + ',0 Z';
+  var output_string = 'M' + start_x + ', ' + start_y + '   L' +
+  final_x + ', ' + final_y + ' L' + final_x + ',0 Z';
 
   return output_string;
 };
diff --git a/src/enter/draw_up_tile.js b/src/enter/draw_up_tile.js
@@ -5,8 +5,8 @@ module.exports = function draw_up_tile(params){
   var start_y = 0;
   var final_y = params.viz.y_scale.rangeBand()- params.viz.border_width.y;
 
-  var output_string = 'M' + start_x + ',' + start_y + ', L' +
-  start_x + ', ' + final_y + ', L' + final_x + ',0 Z';
+  var output_string = 'M' + start_x + ',' + start_y + ' L' +
+  start_x + ', ' + final_y + ' L' + final_x + ',0 Z';
 
   return output_string;
 };
diff --git a/src/labels/col_viz_aid_triangle.js b/src/labels/col_viz_aid_triangle.js
@@ -9,6 +9,6 @@ module.exports = function col_viz_aid_triangle(params){
   params.viz.border_width.x);
   var final_y = -params.viz.border_width.x;
   var output_string = 'M ' + origin_y + ',0 L ' + start_y + ',' +
-    start_x + ', L ' + final_y + ',' + final_x + ' Z';
+    start_x + ' L ' + final_y + ',' + final_x + ' Z';
   return output_string;
 };
diff --git a/src/labels/make_row_visual_aid_triangles.js b/src/labels/make_row_visual_aid_triangles.js
@@ -11,7 +11,7 @@ module.exports = function make_row_visual_aid_triangles(params){
       var final_x = params.viz.cat_room.symbol_width - 1;
       var final_y = params.viz.y_scale.rangeBand();
       var output_string = 'M ' + origin_x + ',' + origin_y + ' L ' +
-        mid_x + ',' + mid_y + ', L ' + final_x + ',' + final_y + ' Z';
+        mid_x + ',' + mid_y + ' L ' + final_x + ',' + final_y + ' Z';
       return output_string;
     })
     .attr('fill', '#eee')

diff --git a/src/menus/build_filter_icon.js b/src/menus/build_filter_icon.js
@@ -95,8 +95,8 @@ module.exports = function build_filter_icon(cgm){
       var final_x = filter_width;//left_x + slider_length/5;
       var final_y = 0;
 
-      var output_string = 'M' + start_x + ',' + start_y + ', L' +
-      mid_x + ', ' + mid_y + ', L'
+      var output_string = 'M' + start_x + ',' + start_y + ' L' +
+      mid_x + ', ' + mid_y + ' L'
       + final_x + ','+ final_y +' Z';
 
       return output_string;

diff --git a/src/menus/build_tree_icon.js b/src/menus/build_tree_icon.js
@@ -93,8 +93,8 @@ module.exports = function build_tree_icon(cgm){
       var final_x = tree_width;//left_x + slider_length/5;
       var final_y = slider_length;
 
-      var output_string = 'M' + start_x + ',' + start_y + ', L' +
-      mid_x + ', ' + mid_y + ', L'
+      var output_string = 'M' + start_x + ',' + start_y + ' L' +
+      mid_x + ', ' + mid_y + ' L'
       + final_x + ','+ final_y +' Z';
 
       return output_string;
@@ -119,8 +119,8 @@ module.exports = function build_tree_icon(cgm){
       var final_x = 5.8;//left_x + slider_length/5;
       var final_y = branch_height/1.8;
 
-      var output_string = 'M' + start_x + ',' + start_y + ', L' +
-      mid_x + ', ' + mid_y + ', L'
+      var output_string = 'M' + start_x + ',' + start_y + ' L' +
+      mid_x + ', ' + mid_y + ' L'
       + final_x + ','+ final_y +' Z';
 
       return output_string;
@@ -144,8 +144,8 @@ module.exports = function build_tree_icon(cgm){
       var final_x = 14.2;//left_x + slider_length/5;
       var final_y = branch_height/1.8;
 
-      var output_string = 'M' + start_x + ',' + start_y + ', L' +
-      mid_x + ', ' + mid_y + ', L'
+      var output_string = 'M' + start_x + ',' + start_y + ' L' +
+      mid_x + ', ' + mid_y + ' L'
       + final_x + ','+ final_y +' Z';
 
       return output_string;

diff --git a/src/reset_size/reset_size_after_update.js b/src/reset_size/reset_size_after_update.js
@@ -144,7 +144,7 @@ module.exports = function reset_size_after_update(cgm, duration=0, delays=null)
         var final_x = params.viz.cat_room.symbol_width - 1;
         var final_y = params.viz.y_scale.rangeBand();
         var output_string = 'M ' + origin_x + ',' + origin_y + ' L ' +
-          mid_x + ',' + mid_y + ', L ' + final_x + ',' + final_y + ' Z';
+          mid_x + ',' + mid_y + ' L ' + final_x + ',' + final_y + ' Z';
         return output_string;
       });
 
@@ -182,7 +182,7 @@ module.exports = function reset_size_after_update(cgm, duration=0, delays=null)
         var final_x = params.viz.cat_room.symbol_width - 1;
         var final_y = params.viz.y_scale.rangeBand();
         var output_string = 'M ' + origin_x + ',' + origin_y + ' L ' +
-          mid_x + ',' + mid_y + ', L ' + final_x + ',' + final_y + ' Z';
+          mid_x + ',' + mid_y + ' L ' + final_x + ',' + final_y + ' Z';
         return output_string;
       });
 

diff --git a/src/reset_size/resize_viz.js b/src/reset_size/resize_viz.js
@@ -161,7 +161,7 @@ module.exports = function resize_viz(cgm) {
       var final_x = params.viz.cat_room.symbol_width - 1;
       var final_y = params.viz.rect_height;
       var output_string = 'M ' + origin_x + ',' + origin_y + ' L ' +
-        mid_x + ',' + mid_y + ', L ' + final_x + ',' + final_y + ' Z';
+        mid_x + ',' + mid_y + ' L ' + final_x + ',' + final_y + ' Z';
       return output_string;
     });