lint: make html2unicode require statement consistent

etpinard · etpinard · commit 73d46fe5b816 · 2016-08-09T11:39:58.000-04:00
diff --git a/src/plots/gl2d/convert.js b/src/plots/gl2d/convert.js
@@ -11,7 +11,7 @@
 
 var Plotly = require('../../plotly');
 
-var htmlToUnicode = require('../../lib/html2unicode');
+var convertHTMLToUnicode = require('../../lib/html2unicode');
 var str2RGBArray = require('../../lib/str2rgbarray');
 
 function Axes2DOptions(scene) {
@@ -115,7 +115,7 @@ proto.merge = function(options) {
 
         for(j = 0; j <= 2; j += 2) {
             this.labelEnable[i + j] = false;
-            this.labels[i + j] = htmlToUnicode(axTitle);
+            this.labels[i + j] = convertHTMLToUnicode(axTitle);
             this.labelColor[i + j] = str2RGBArray(ax.titlefont.color);
             this.labelFont[i + j] = ax.titlefont.family;
             this.labelSize[i + j] = ax.titlefont.size;
diff --git a/src/plots/gl2d/scene2d.js b/src/plots/gl2d/scene2d.js
@@ -18,7 +18,7 @@ var createSelectBox = require('gl-select-box');
 
 var createOptions = require('./convert');
 var createCamera = require('./camera');
-var htmlToUnicode = require('../../lib/html2unicode');
+var convertHTMLToUnicode = require('../../lib/html2unicode');
 var showNoWebGlMsg = require('../../lib/show_no_webgl_msg');
 
 var AXES = ['xaxis', 'yaxis'];
@@ -231,7 +231,7 @@ proto.computeTickMarks = function() {
         for(var i = 0; i < nextTicks[j].length; ++i) {
             // TODO add support for '\n' in gl-plot2d,
             // For now, replace '\n' with ' '
-            nextTicks[j][i].text = htmlToUnicode(nextTicks[j][i].text + '').replace(/\n/g, ' ');
+            nextTicks[j][i].text = convertHTMLToUnicode(nextTicks[j][i].text + '').replace(/\n/g, ' ');
         }
     }
 
diff --git a/src/plots/gl3d/layout/convert.js b/src/plots/gl3d/layout/convert.js
@@ -10,7 +10,7 @@
 'use strict';
 
 var arrtools = require('arraytools');
-var convertHTML = require('../../../lib/html2unicode');
+var convertHTMLToUnicode = require('../../../lib/html2unicode');
 var str2RgbaArray = require('../../../lib/str2rgbarray');
 
 var arrayCopy1D = arrtools.copy1D;
@@ -77,7 +77,7 @@ proto.merge = function(sceneLayout) {
         var axes = sceneLayout[AXES_NAMES[i]];
 
         /////// Axes labels //
-        opts.labels[i] = convertHTML(axes.title);
+        opts.labels[i] = convertHTMLToUnicode(axes.title);
         if('titlefont' in axes) {
             if(axes.titlefont.color) opts.labelColor[i] = str2RgbaArray(axes.titlefont.color);
             if(axes.titlefont.family) opts.labelFont[i] = axes.titlefont.family;
diff --git a/src/plots/gl3d/layout/tick_marks.js b/src/plots/gl3d/layout/tick_marks.js
@@ -14,7 +14,7 @@
 module.exports = computeTickMarks;
 
 var Plotly = require('../../../plotly');
-var convertHTML = require('../../../lib/html2unicode');
+var convertHTMLToUnicode = require('../../../lib/html2unicode');
 
 var AXES_NAMES = ['xaxis', 'yaxis', 'zaxis'];
 
@@ -70,7 +70,7 @@ function computeTickMarks(scene) {
             var dataTicks = Plotly.Axes.calcTicks(axes);
             for(var j = 0; j < dataTicks.length; ++j) {
                 dataTicks[j].x = dataTicks[j].x * scene.dataScale[i];
-                dataTicks[j].text = convertHTML(dataTicks[j].text);
+                dataTicks[j].text = convertHTMLToUnicode(dataTicks[j].text);
             }
             ticks[i] = dataTicks;
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ var createSelectBox = require('gl-select-box');`
`18`	`18`
`19`	`19`	`var createOptions = require('./convert');`
`20`	`20`	`var createCamera = require('./camera');`
`21`		`-var htmlToUnicode = require('../../lib/html2unicode');`
	`21`	`+var convertHTMLToUnicode = require('../../lib/html2unicode');`
`22`	`22`	`var showNoWebGlMsg = require('../../lib/show_no_webgl_msg');`
`23`	`23`
`24`	`24`	`var AXES = ['xaxis', 'yaxis'];`
`@@ -231,7 +231,7 @@ proto.computeTickMarks = function() {`
`231`	`231`	`for(var i = 0; i < nextTicks[j].length; ++i) {`
`232`	`232`	`// TODO add support for '\n' in gl-plot2d,`
`233`	`233`	`// For now, replace '\n' with ' '`
`234`		`- nextTicks[j][i].text = htmlToUnicode(nextTicks[j][i].text + '').replace(/\n/g, ' ');`
	`234`	`+ nextTicks[j][i].text = convertHTMLToUnicode(nextTicks[j][i].text + '').replace(/\n/g, ' ');`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`