Revert four previous commits

This reverts commit 8811849c04b0c13a90f65de812e700970db4fae7.

Author: etpinard

shelly/plotlyjs/static/plotlyjs/compress_attributes.js

@@ -7,11 +7,8 @@
 
 var through = require('through2');
 
-var attributeNamesToRemove = [
-    'description', 'requiredOpts', 'otherOpts', '_hrName', 'role'
-];
-
-var regexStr = '';
+var attributeNamesToRemove = ['description', 'requiredOpts', 'otherOpts', 'hrName', 'role'],
+    regexStr = '';
 
 // ref: http://www.regexr.com/3bj6p
 attributeNamesToRemove.forEach(function(attr, i) {

shelly/plotlyjs/static/plotlyjs/src/contour.js

@@ -23,7 +23,7 @@ Plotly.Plots.register(contour, 'contour',
 
 Plotly.Plots.register(contour, 'histogram2dcontour',
     ['cartesian', '2dMap', 'contour', 'histogram'], {
-    _hrName: 'histogram_2d_contour',
+    hrName: 'histogram_2d_contour',
     description: [
         'The sample data from which statistics are computed is set in `x`',
         'and `y` (where `x` and `y` represent marginal distributions,',

shelly/plotlyjs/static/plotlyjs/src/geo/defaults/scattergeo.js

@@ -6,7 +6,7 @@ var ScatterGeo = module.exports = {};
 
 Plotly.Plots.register(ScatterGeo, 'scattergeo',
     ['geo', 'symbols', 'markerColorscale', 'showLegend'], {
-    _hrName: 'scatter_geo',
+    hrName: 'scatter_geo',
     description: [
         'The data visualized as scatter point or lines on a geographic map',
         'is provided either by longitude/latitude pairs in `lon` and `lat`',

shelly/plotlyjs/static/plotlyjs/src/gl3d/defaults/scatter3d.js

@@ -7,7 +7,7 @@ var Scatter3D = module.exports = {};
 
 Plotly.Plots.register(Scatter3D,
     'scatter3d', ['gl3d', 'symbols', 'markerColorscale', 'showLegend'], {
-    _hrName: 'scatter_3d',
+    hrName: 'scatter_3d',
     description: [
         'The data visualized as scatter point or lines in 3D dimension', 
         'is set in `x`, `y`, `z`.',

shelly/plotlyjs/static/plotlyjs/src/histogram.js

@@ -25,7 +25,7 @@ Plotly.Plots.register(Plotly.Bars, 'histogram',
 
 Plotly.Plots.register(Plotly.Heatmap, 'histogram2d',
     ['cartesian', '2dMap', 'histogram'], {
-    _hrName: 'histogram_2d',
+    hrName: 'histogram_2d',
     description: [
         'The sample data from which statistics are computed is set in `x`',
         'and `y` (where `x` and `y` represent marginal distributions,',
@@ -42,9 +42,6 @@ Plotly.Plots.register(Plotly.Heatmap, 'histogram2d',
 
 function makeBinsAttr(axLetter) {
     return {
-        _hrName: [
-            axLetter, '_bins'
-        ].join(''),
         start: {
             valType: 'number',
             dflt: null,

shelly/plotlyjs/static/plotlyjs/src/plotschema.js

@@ -9,11 +9,10 @@ var extendDeepAll = Plotly.Lib.extendDeepAll;
 var NESTED_MODULE = '_nestedModules',
     COMPOSED_MODULE = '_composedModules',
     IS_SUBPLOT_OBJ = '_isSubplotObj',
-    IS_LINKED_TO_ARRAY = '_isLinkedToArray',
-    HR_NAME = '_hrName';
+    IS_LINKED_TO_ARRAY = '_isLinkedToArray';
 
 // list of underscore attributes to keep in schema as is
-var UNDERSCORE_ATTRS = ['_isSubplotObj', '_deprecated', '_hrName'];
+var UNDERSCORE_ATTRS = ['_isSubplotObj', '_deprecated'];
 
 var plotSchema = {
     traces: {},
@@ -207,11 +206,6 @@ function mergeValTypeAndRole(attrs) {
         else if(Plotly.Lib.isPlainObject(attr)) {
             // all attrs container objects get role 'object'
             attr.role = 'object';
-
-            // add human-readable attrName for axis object
-            if(attrName.indexOf('axis') !== -1) {
-                attr[HR_NAME] = attrName.split('axis')[0] + '_' + 'axis'
-            }
         }
     }
 

shelly/plotlyjs/static/plotlyjs/tests/plotschema_test.js

@@ -157,42 +157,4 @@ describe('plot schema', function() {
             }
         );
     });
-
-    it('axis and bin attributes should have `human-readable name` field', function() {
-        var HR_NAME = '_hrName';
-
-        assertPlotSchema(
-            function(attr, attrName) {
-                if(isValObject(attr) || !isPlainObject(attr)) return;
-
-                if(attrName === 'xbins') {
-                    expect(attr[HR_NAME]).toEqual('x_bins');
-                }
-                else if(attrName === 'ybins') {
-                    expect(attr[HR_NAME]).toEqual('y_bins');
-                }
-                else if(attrName === 'xaxis') {
-                    expect(attr[HR_NAME]).toEqual('x_axis');
-                }
-                else if(attrName === 'yaxis') {
-                    expect(attr[HR_NAME]).toEqual('y_axis');
-                }
-                else if(attrName === 'zaxis') {
-                    expect(attr[HR_NAME]).toEqual('z_axis');
-                }
-                else if(attrName === 'lonaxis') {
-                    expect(attr[HR_NAME]).toEqual('lon_axis');
-                }
-                else if(attrName === 'lataxis') {
-                    expect(attr[HR_NAME]).toEqual('lat_axis');
-                }
-                else if(attrName === 'radialaxis') {
-                    expect(attr[HR_NAME]).toEqual('radial_axis');
-                }
-                else if(attrName === 'angularaxis') {
-                    expect(attr[HR_NAME]).toEqual('angular_axis');
-                }
-            }
-        )
-    });
 });