Fix default label value, histogram color picker

galaxyproject · Aug 19, 2016 · e4000b1 · e4000b1
1 parent 015b684
commit e4000b1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/config/plugins/visualizations/charts/static/charts/forms/default.js b/config/plugins/visualizations/charts/static/charts/forms/default.js
@@ -17,7 +17,8 @@ define( [ 'plugin/charts/forms/inputs' ], function( Inputs ) {
             name        : 'key',
             label       : 'Provide a label',
             type        : 'text',
-            placeholder : 'Data label'
+            placeholder : 'Data label',
+            value       : 'Data label'
         }]
     }
 });
diff --git a/config/plugins/visualizations/charts/static/charts/nvd3/common/config.js b/config/plugins/visualizations/charts/static/charts/nvd3/common/config.js
@@ -17,7 +17,8 @@ define( [ 'plugin/charts/forms/default', 'plugin/plugins/nvd3/nv.d3' ], function
             name        : 'key',
             label       : 'Provide a label',
             type        : 'text',
-            placeholder : 'Data label'
+            placeholder : 'Data label',
+            value       : 'Data label'
         },{
             name        : 'color',
             label       : 'Pick a series color',

diff --git a/config/plugins/visualizations/charts/static/charts/nvd3/histogram/config.js b/config/plugins/visualizations/charts/static/charts/nvd3/histogram/config.js
@@ -1,5 +1,5 @@
-define( [ 'plugin/charts/nvd3/common/config' ], function( nvd3_config ) {
-    return $.extend( true, {}, nvd3_config, {
+define( [ 'plugin/charts/forms/default' ], function( default_config ) {
+    return $.extend( true, {}, default_config, {
         library     : 'NVD3',
         tag         : 'svg',
         title       : 'Histogram',
@@ -11,6 +11,17 @@ define( [ 'plugin/charts/nvd3/common/config' ], function( nvd3_config ) {
                 title       : 'Observations',
                 is_numeric  : true
             }
-        }
+        },
+        series      : [{
+            name        : 'key',
+            label       : 'Provide a label',
+            type        : 'text',
+            placeholder : 'Data label',
+            value       : 'Data label'
+        },{
+            name        : 'color',
+            label       : 'Pick a series color',
+            type        : 'color'
+        }]
     });
 });