Turn var into const or let

gofaraway002 · Jan 14, 2017 · bd9db33 · bd9db33
1 parent 9b565a6
commit bd9db33
Show file tree

Hide file tree

Showing 33 changed files with 1,311 additions and 1,321 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -35,6 35,7 @@
  "no-unreachable": 2,
  "no-unused-vars": [2, {"args": "none", "varsIgnorePattern": "^_*$"}],
  "no-useless-call": 2,
  "no-var": 2,
  "no-with": 2,
  "one-var": [2, "never"],
  "prefer-const": 2,
@@ -52,9 53,6 @@
  // We've decided explicitly not to care about this.
  "arrow-parens": 0,
  // ---------------------------------------
- // Stuff that's disabled for now, but maybe shouldn't be.
- // disabled because KaTeX doesn't use ES6
- "no-var": 0,
  // TODO(csilvers): enable these if/when community agrees on it.
  "prefer-arrow-callback": 0,
  "object-curly-spacing": [0, "always"],

diff --git a/cli.js b/cli.js
@@ -3,11 3,11 @@
 // Reads TeX from stdin, outputs HTML to stdout.
 /* eslint no-console:0 */
 
-var katex = require("./");
-var input = "";
 const katex = require("./");
 let input = "";
 
 // Skip the first two args, which are just "node" and "cli.js"
-var args = process.argv.slice(2);
 const args = process.argv.slice(2);
 
 if (args.indexOf("--help") !== -1) {
  console.log(process.argv[0]   " "   process.argv[1]  
@@ -26,7 26,7 @@ process.stdin.on("data", function(chunk) {
 });
 
 process.stdin.on("end", function() {
- var options = { displayMode: args.indexOf("--display-mode") !== -1 };
- var output = katex.renderToString(input, options);
  const options = { displayMode: args.indexOf("--display-mode") !== -1 };
  const output = katex.renderToString(input, options);
  console.log(output);
 });
diff --git a/contrib/auto-render/auto-render-spec.js b/contrib/auto-render/auto-render-spec.js
@@ -4,21 4,21 @@
 /* global it: false */
 /* global describe: false */
 
-var splitAtDelimiters = require("./splitAtDelimiters");
 const splitAtDelimiters = require("./splitAtDelimiters");
 
 beforeEach(function() {
  jasmine.addMatchers({
  toSplitInto: function() {
  return {
  compare: function(actual, left, right, result) {
- var message = {
  const message = {
  pass: true,
  message: "'"   actual   "' split correctly",
  };
 
- var startData = [{type: "text", data: actual}];
  const startData = [{type: "text", data: actual}];
 
- var split =
  const split =
  splitAtDelimiters(startData, left, right, false);
 
  if (split.length !== result.length) {
@@ -30,12 30,12 @@ beforeEach(function() {
  return message;
  }
 
- for (var i = 0; i < split.length; i ) {
- var real = split[i];
- var correct = result[i];
  for (let i = 0; i < split.length; i ) {
  const real = split[i];
  const correct = result[i];
 
- var good = true;
- var diff;
  let good = true;
  let diff;
 
  if (real.type !== correct.type) {
  good = false;
@@ -189,7 189,7 @@ describe("A delimiter splitter", function() {
  });
 
  it("remembers which delimiters are display-mode", function() {
- var startData = [{type: "text", data: "hello ( world ) boo"}];
  const startData = [{type: "text", data: "hello ( world ) boo"}];
 
  expect(splitAtDelimiters(startData, "(", ")", true)).toEqual(
  [
@@ -201,7 201,7 @@ describe("A delimiter splitter", function() {
  });
 
  it("works with more than one start datum", function() {
- var startData = [
  const startData = [
  {type: "text", data: "hello ( world ) boo"},
  {type: "math", data: "math", rawData: "(math)", display: true},
  {type: "text", data: "hello ( world ) boo"},
@@ -222,7 222,7 @@ describe("A delimiter splitter", function() {
  });
 
  it("doesn't do splitting inside of math nodes", function() {
- var startData = [
  const startData = [
  {type: "text", data: "hello ( world ) boo"},
  {type: "math", data: "hello ( world ) boo",
  rawData: "(hello ( world ) boo)", display: true},

diff --git a/contrib/auto-render/auto-render.js b/contrib/auto-render/auto-render.js
@@ -1,30 1,30 @@
 /* eslint no-console:0 */
 /* global katex */
 
-var splitAtDelimiters = require("./splitAtDelimiters");
 const splitAtDelimiters = require("./splitAtDelimiters");
 
-var splitWithDelimiters = function(text, delimiters) {
- var data = [{type: "text", data: text}];
- for (var i = 0; i < delimiters.length; i ) {
- var delimiter = delimiters[i];
 const splitWithDelimiters = function(text, delimiters) {
  let data = [{type: "text", data: text}];
  for (let i = 0; i < delimiters.length; i ) {
  const delimiter = delimiters[i];
  data = splitAtDelimiters(
  data, delimiter.left, delimiter.right,
  delimiter.display || false);
  }
  return data;
 };
 
-var renderMathInText = function(text, delimiters) {
- var data = splitWithDelimiters(text, delimiters);
 const renderMathInText = function(text, delimiters) {
  const data = splitWithDelimiters(text, delimiters);
 
- var fragment = document.createDocumentFragment();
  const fragment = document.createDocumentFragment();
 
- for (var i = 0; i < data.length; i ) {
  for (let i = 0; i < data.length; i ) {
  if (data[i].type === "text") {
  fragment.appendChild(document.createTextNode(data[i].data));
  } else {
- var span = document.createElement("span");
- var math = data[i].data;
  const span = document.createElement("span");
  const math = data[i].data;
  try {
  katex.render(math, span, {
  displayMode: data[i].display,
@@ -48,17 48,17 @@ var renderMathInText = function(text, delimiters) {
  return fragment;
 };
 
-var renderElem = function(elem, delimiters, ignoredTags) {
- for (var i = 0; i < elem.childNodes.length; i ) {
- var childNode = elem.childNodes[i];
 const renderElem = function(elem, delimiters, ignoredTags) {
  for (let i = 0; i < elem.childNodes.length; i ) {
  const childNode = elem.childNodes[i];
  if (childNode.nodeType === 3) {
  // Text node
- var frag = renderMathInText(childNode.textContent, delimiters);
  const frag = renderMathInText(childNode.textContent, delimiters);
  i  = frag.childNodes.length - 1;
  elem.replaceChild(frag, childNode);
  } else if (childNode.nodeType === 1) {
  // Element node
- var shouldRender = ignoredTags.indexOf(
  const shouldRender = ignoredTags.indexOf(
  childNode.nodeName.toLowerCase()) === -1;
 
  if (shouldRender) {
@@ -69,7 69,7 @@ var renderElem = function(elem, delimiters, ignoredTags) {
  }
 };
 
-var defaultOptions = {
 const defaultOptions = {
  delimiters: [
  {left: "$$", right: "$$", display: true},
  {left: "\\[", right: "\\]", display: true},
@@ -83,11 83,12 @@ var defaultOptions = {
  ],
 };
 
-var extend = function(obj) {
 const extend = function(obj) {
  // Adapted from underscore.js' `_.extend`. See LICENSE.txt for license.
- var source;
- var prop;
- for (var i = 1, length = arguments.length; i < length; i ) {
  let source;
  let prop;
  const length = arguments.length;
  for (let i = 1; i < length; i ) {
  source = arguments[i];
  for (prop in source) {
  if (Object.prototype.hasOwnProperty.call(source, prop)) {
@@ -98,7 99,7 @@ var extend = function(obj) {
  return obj;
 };
 
-var renderMathInElement = function(elem, options) {
 const renderMathInElement = function(elem, options) {
  if (!elem) {
  throw new Error("No element provided to render");
  }

diff --git a/contrib/auto-render/splitAtDelimiters.js b/contrib/auto-render/splitAtDelimiters.js
@@ -1,14 1,14 @@
 /* eslint no-constant-condition:0 */
-var findEndOfMath = function(delimiter, text, startIndex) {
 const findEndOfMath = function(delimiter, text, startIndex) {
  // Adapted from
  // https://github.com/Khan/perseus/blob/master/src/perseus-markdown.jsx
- var index = startIndex;
- var braceLevel = 0;
  let index = startIndex;
  let braceLevel = 0;
 
- var delimLength = delimiter.length;
  const delimLength = delimiter.length;
 
  while (index < text.length) {
- var character = text[index];
  const character = text[index];
 
  if (braceLevel <= 0 &&
  text.slice(index, index   delimLength) === delimiter) {
@@ -27,16 27,16 @@ var findEndOfMath = function(delimiter, text, startIndex) {
  return -1;
 };
 
-var splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
- var finalData = [];
 const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
  const finalData = [];
 
- for (var i = 0; i < startData.length; i ) {
  for (let i = 0; i < startData.length; i ) {
  if (startData[i].type === "text") {
- var text = startData[i].data;
  const text = startData[i].data;
 
- var lookingForLeft = true;
- var currIndex = 0;
- var nextIndex;
  let lookingForLeft = true;
  let currIndex = 0;
  let nextIndex;
 
  nextIndex = text.indexOf(leftDelim);
  if (nextIndex !== -1) {