Merge branch 'develop' of github.com:ether/etherpad-lite into mochawesome

src/static/js/skin_variants.js

@@ -1,19 +1,14 @@
-// Specific hash to display the skin variants builder popup
+'use strict';
-if (window.location.hash.toLowerCase() == '#skinvariantsbuilder') {
-  $('#skin-variants').addClass('popup-show');
 
-  $('.skin-variant').change(() => {
+// Specific hash to display the skin variants builder popup
-    updateSkinVariantsClasses();
+if (window.location.hash.toLowerCase() === '#skinvariantsbuilder') {
-  });
+  $('#skin-variants').addClass('popup-show');
 
   const containers = ['editor', 'background', 'toolbar'];
   const colors = ['super-light', 'light', 'dark', 'super-dark'];
 
-  updateCheckboxFromSkinClasses();
-  updateSkinVariantsClasses();
-
   // add corresponding classes when config change
-  function updateSkinVariantsClasses() {
+  const updateSkinVariantsClasses = () => {
     const domsToUpdate = [
       $('html'),
       $('iframe[name=ace_outer]').contents().find('html'),
@@ -27,23 +22,21 @@ if (window.location.hash.toLowerCase() == '#skinvariantsbuilder') {
 
     domsToUpdate.forEach((el) => { el.removeClass('full-width-editor'); });
 
-    const new_classes = [];
+    const newClasses = [];
     $('select.skin-variant-color').each(function () {
-      new_classes.push(`${$(this).val()}-${$(this).data('container')}`);
+      newClasses.push(`${$(this).val()}-${$(this).data('container')}`);
     });
-    if ($('#skin-variant-full-width').is(':checked')) new_classes.push('full-width-editor');
+    if ($('#skin-variant-full-width').is(':checked')) newClasses.push('full-width-editor');
 
-    domsToUpdate.forEach((el) => { el.addClass(new_classes.join(' ')); });
+    domsToUpdate.forEach((el) => { el.addClass(newClasses.join(' ')); });
 
-    $('#skin-variants-result').val(`"skinVariants": "${new_classes.join(' ')}",`);
+    $('#skin-variants-result').val(`"skinVariants": "${newClasses.join(' ')}",`);
-  }
+  };
 
   // run on init
-  function updateCheckboxFromSkinClasses() {
+  const updateCheckboxFromSkinClasses = () => {
     $('html').attr('class').split(' ').forEach((classItem) => {
-      var container = classItem.split('-').slice(-1);
+      const container = classItem.substring(classItem.lastIndexOf('-') + 1, classItem.length);
-
-      var container = classItem.substring(classItem.lastIndexOf('-') + 1, classItem.length);
       if (containers.indexOf(container) > -1) {
         const color = classItem.substring(0, classItem.lastIndexOf('-'));
         $(`.skin-variant-color[data-container="${container}"`).val(color);
@@ -51,5 +44,12 @@ if (window.location.hash.toLowerCase() == '#skinvariantsbuilder') {
     });
 
     $('#skin-variant-full-width').prop('checked', $('html').hasClass('full-width-editor'));
-  }
+  };
+
+  $('.skin-variant').change(() => {
+    updateSkinVariantsClasses();
+  });
+
+  updateCheckboxFromSkinClasses();
+  updateSkinVariantsClasses();
 }

src/static/js/skiplist.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * This code is mostly from the old Etherpad. Please help us to comment this code.
  * This helps other people to understand this code better and helps them to improve it.
@@ -28,15 +30,13 @@ const noop = Ace2Common.noop;
 function SkipList() {
   let PROFILER = window.PROFILER;
   if (!PROFILER) {
-    PROFILER = function () {
+    PROFILER = () => ({
-      return {
       start: noop,
       mark: noop,
       literal: noop,
       end: noop,
       cancel: noop,
-      };
+    });
-    };
   }
 
   // if there are N elements in the skiplist, "start" is element -1 and "end" is element N
@@ -68,7 +68,7 @@ function SkipList() {
   // this point.
 
 
-  function _getPoint(targetLoc) {
+  const _getPoint = (targetLoc) => {
     const numLevels = start.levels;
     let lvl = numLevels - 1;
     let i = -1;
@@ -99,13 +99,11 @@ function SkipList() {
       idxs,
       loc: targetLoc,
       widthSkips,
-      toString() {
+      toString: () => `getPoint(${targetLoc})`,
-        return `getPoint(${targetLoc})`;
+    };
-      },
   };
-  }
 
-  function _getNodeAtOffset(targetOffset) {
+  const _getNodeAtOffset = (targetOffset) => {
     let i = 0;
     let n = start;
     let lvl = start.levels - 1;
@@ -117,16 +115,14 @@ function SkipList() {
       lvl--;
     }
     if (n === start) return (start.downPtrs[0] || null);
-    else if (n === end) return (targetOffset == totalWidth ? (end.upPtrs[0] || null) : null);
+    else if (n === end) return (targetOffset === totalWidth ? (end.upPtrs[0] || null) : null);
     return n;
-  }
+  };
 
-  function _entryWidth(e) {
+  const _entryWidth = (e) => (e && e.width) || 0;
-    return (e && e.width) || 0;
-  }
 
-  function _insertKeyAtPoint(point, newKey, entry) {
+  const _insertKeyAtPoint = (point, newKey, entry) => {
-    const p = PROFILER('insertKey', false);
+    const p = PROFILER('insertKey', false); // eslint-disable-line new-cap
     const newNode = {
       key: newKey,
       levels: 0,
@@ -145,10 +141,10 @@ function SkipList() {
 
     // The new node will have at least level 1
     // With a proability of 0.01^(n-1) the nodes level will be >= n
-    while (newNode.levels == 0 || Math.random() < 0.01) {
+    while (newNode.levels === 0 || Math.random() < 0.01) {
-      var lvl = newNode.levels;
+      const lvl = newNode.levels;
       newNode.levels++;
-      if (lvl == pNodes.length) {
+      if (lvl === pNodes.length) {
         // assume we have just passed the end of point.nodes, and reached one level greater
         // than the skiplist currently supports
         pNodes[lvl] = start;
@@ -162,7 +158,7 @@ function SkipList() {
         point.widthSkips[lvl] = 0;
       }
       const me = newNode;
-      var up = pNodes[lvl];
+      const up = pNodes[lvl];
       const down = up.downPtrs[lvl];
       const skip1 = pLoc - pIdxs[lvl];
       const skip2 = up.downSkips[lvl] + 1 - skip1;
@@ -179,8 +175,8 @@ function SkipList() {
     }
     p.mark('loop2');
     p.literal(pNodes.length, 'PNL');
-    for (var lvl = newNode.levels; lvl < pNodes.length; lvl++) {
+    for (let lvl = newNode.levels; lvl < pNodes.length; lvl++) {
-      var up = pNodes[lvl];
+      const up = pNodes[lvl];
       up.downSkips[lvl]++;
       up.downSkipWidths[lvl] += newWidth;
     }
@@ -189,30 +185,17 @@ function SkipList() {
     numNodes++;
     totalWidth += newWidth;
     p.end();
-  }
+  };
 
-  function _getNodeAtPoint(point) {
+  const _getNodeAtPoint = (point) => point.nodes[0].downPtrs[0];
-    return point.nodes[0].downPtrs[0];
-  }
 
-  function _incrementPoint(point) {
+  const _deleteKeyAtPoint = (point) => {
-    point.loc++;
-    for (let i = 0; i < point.nodes.length; i++) {
-      if (point.idxs[i] + point.nodes[i].downSkips[i] < point.loc) {
-        point.idxs[i] += point.nodes[i].downSkips[i];
-        point.widthSkips[i] += point.nodes[i].downSkipWidths[i];
-        point.nodes[i] = point.nodes[i].downPtrs[i];
-      }
-    }
-  }
-
-  function _deleteKeyAtPoint(point) {
     const elem = point.nodes[0].downPtrs[0];
     const elemWidth = _entryWidth(elem.entry);
     for (let i = 0; i < point.nodes.length; i++) {
       if (i < elem.levels) {
-        var up = elem.upPtrs[i];
+        const up = elem.upPtrs[i];
-        var down = elem.downPtrs[i];
+        const down = elem.downPtrs[i];
         const totalSkip = up.downSkips[i] + elem.downSkips[i] - 1;
         up.downPtrs[i] = down;
         down.upPtrs[i] = up;
@@ -220,8 +203,7 @@ function SkipList() {
         const totalWidthSkip = up.downSkipWidths[i] + elem.downSkipWidths[i] - elemWidth;
         up.downSkipWidths[i] = totalWidthSkip;
       } else {
-        var up = point.nodes[i];
+        const up = point.nodes[i];
-        var down = up.downPtrs[i];
         up.downSkips[i]--;
         up.downSkipWidths[i] -= elemWidth;
       }
@@ -229,9 +211,9 @@ function SkipList() {
     delete keyToNodeMap[`$KEY$${elem.key}`];
     numNodes--;
     totalWidth -= elemWidth;
-  }
+  };
 
-  function _propagateWidthChange(node) {
+  const _propagateWidthChange = (node) => {
     const oldWidth = node.downSkipWidths[0];
     const newWidth = _entryWidth(node.entry);
     const widthChange = newWidth - oldWidth;
@@ -245,9 +227,9 @@ function SkipList() {
       }
     }
     totalWidth += widthChange;
-  }
+  };
 
-  function _getNodeIndex(node, byWidth) {
+  const _getNodeIndex = (node, byWidth) => {
     let dist = (byWidth ? 0 : -1);
     let n = node;
     while (n !== start) {
@@ -257,27 +239,26 @@ function SkipList() {
       else dist += n.downSkips[lvl];
     }
     return dist;
-  }
+  };
 
-  function _getNodeByKey(key) {
+  const _getNodeByKey = (key) => keyToNodeMap[`$KEY$${key}`];
-    return keyToNodeMap[`$KEY$${key}`];
-  }
 
   // Returns index of first entry such that entryFunc(entry) is truthy,
   // or length() if no such entry.  Assumes all falsy entries come before
   // all truthy entries.
 
 
-  function _search(entryFunc) {
+  const _search = (entryFunc) => {
     let low = start;
     let lvl = start.levels - 1;
     let lowIndex = -1;
 
-    function f(node) {
+    const f = (node) => {
       if (node === start) return false;
       else if (node === end) return true;
       else return entryFunc(node.entry);
-    }
+    };
+
     while (lvl >= 0) {
       let nextLow = low.downPtrs[lvl];
       while (!f(nextLow)) {
@@ -288,7 +269,7 @@ function SkipList() {
       lvl--;
     }
     return lowIndex + 1;
-  }
+  };
 
   /*
 The skip-list contains "entries", JavaScript objects that each must have a unique "key" property
@@ -296,16 +277,14 @@ that is a string.
   */
   const self = this;
   _.extend(this, {
-    length() {
+    length: () => numNodes,
-      return numNodes;
+    atIndex: (i) => {
-    },
-    atIndex(i) {
       if (i < 0) console.warn(`atIndex(${i})`);
       if (i >= numNodes) console.warn(`atIndex(${i}>=${numNodes})`);
       return _getNodeAtPoint(_getPoint(i)).entry;
     },
     // differs from Array.splice() in that new elements are in an array, not varargs
-    splice(start, deleteCount, newEntryArray) {
+    splice: (start, deleteCount, newEntryArray) => {
       if (start < 0) console.warn(`splice(${start}, ...)`);
       if (start + deleteCount > numNodes) {
         console.warn(`splice(${start}, ${deleteCount}, ...), N=${numNodes}`);
@@ -315,26 +294,22 @@ that is a string.
 
       if (!newEntryArray) newEntryArray = [];
       const pt = _getPoint(start);
-      for (var i = 0; i < deleteCount; i++) {
+      for (let i = 0; i < deleteCount; i++) {
         _deleteKeyAtPoint(pt);
       }
-      for (var i = (newEntryArray.length - 1); i >= 0; i--) {
+      for (let i = (newEntryArray.length - 1); i >= 0; i--) {
         const entry = newEntryArray[i];
         _insertKeyAtPoint(pt, entry.key, entry);
         const node = _getNodeByKey(entry.key);
         node.entry = entry;
       }
     },
-    next(entry) {
+    next: (entry) => _getNodeByKey(entry.key).downPtrs[0].entry || null,
-      return _getNodeByKey(entry.key).downPtrs[0].entry || null;
+    prev: (entry) => _getNodeByKey(entry.key).upPtrs[0].entry || null,
-    },
+    push: (entry) => {
-    prev(entry) {
-      return _getNodeByKey(entry.key).upPtrs[0].entry || null;
-    },
-    push(entry) {
       self.splice(numNodes, 0, [entry]);
     },
-    slice(start, end) {
+    slice: (start, end) => {
       // act like Array.slice()
       if (start === undefined) start = 0;
       else if (start < 0) start += numNodes;
@@ -346,7 +321,7 @@ that is a string.
       if (end < 0) end = 0;
       if (end > numNodes) end = numNodes;
 
-      dmesg(String([start, end, numNodes]));
+      window.dmesg(String([start, end, numNodes]));
       if (end <= start) return [];
       let n = self.atIndex(start);
       const array = [n];
@@ -356,56 +331,34 @@ that is a string.
       }
       return array;
     },
-    atKey(key) {
+    atKey: (key) => _getNodeByKey(key).entry,
-      return _getNodeByKey(key).entry;
+    indexOfKey: (key) => _getNodeIndex(_getNodeByKey(key)),
-    },
+    indexOfEntry: (entry) => self.indexOfKey(entry.key),
-    indexOfKey(key) {
+    containsKey: (key) => !!(_getNodeByKey(key)),
-      return _getNodeIndex(_getNodeByKey(key));
-    },
-    indexOfEntry(entry) {
-      return self.indexOfKey(entry.key);
-    },
-    containsKey(key) {
-      return !!(_getNodeByKey(key));
-    },
     // gets the last entry starting at or before the offset
-    atOffset(offset) {
+    atOffset: (offset) => _getNodeAtOffset(offset).entry,
-      return _getNodeAtOffset(offset).entry;
+    keyAtOffset: (offset) => self.atOffset(offset).key,
-    },
+    offsetOfKey: (key) => _getNodeIndex(_getNodeByKey(key), true),
-    keyAtOffset(offset) {
+    offsetOfEntry: (entry) => self.offsetOfKey(entry.key),
-      return self.atOffset(offset).key;
+    setEntryWidth: (entry, width) => {
-    },
-    offsetOfKey(key) {
-      return _getNodeIndex(_getNodeByKey(key), true);
-    },
-    offsetOfEntry(entry) {
-      return self.offsetOfKey(entry.key);
-    },
-    setEntryWidth(entry, width) {
       entry.width = width;
       _propagateWidthChange(_getNodeByKey(entry.key));
     },
-    totalWidth() {
+    totalWidth: () => totalWidth,
-      return totalWidth;
+    offsetOfIndex: (i) => {
-    },
-    offsetOfIndex(i) {
       if (i < 0) return 0;
       if (i >= numNodes) return totalWidth;
       return self.offsetOfEntry(self.atIndex(i));
     },
-    indexOfOffset(offset) {
+    indexOfOffset: (offset) => {
       if (offset <= 0) return 0;
       if (offset >= totalWidth) return numNodes;
       return self.indexOfEntry(self.atOffset(offset));
     },
-    search(entryFunc) {
+    search: (entryFunc) => _search(entryFunc),
-      return _search(entryFunc);
-    },
     // debugToString: _debugToString,
     debugGetPoint: _getPoint,
-    debugDepth() {
+    debugDepth: () => start.levels,
-      return start.levels;
-    },
   });
 }
 

src/static/js/undomodule.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * This code is mostly from the old Etherpad. Please help us to comment this code.
  * This helps other people to understand this code better and helps them to improve it.
@@ -23,8 +25,8 @@
 const Changeset = require('./Changeset');
 const _ = require('./underscore');
 
-var undoModule = (function () {
+const undoModule = (() => {
-  const stack = (function () {
+  const stack = (() => {
     const stackElements = [];
     // two types of stackElements:
     // 1) { elementType: UNDOABLE_EVENT, eventType: "anything", [backset: <changeset>,]
@@ -36,7 +38,7 @@ var undoModule = (function () {
     const UNDOABLE_EVENT = 'undoableEvent';
     const EXTERNAL_CHANGE = 'externalChange';
 
-    function clearStack() {
+    const clearStack = () => {
       stackElements.length = 0;
       stackElements.push(
           {
@@ -44,22 +46,23 @@ var undoModule = (function () {
             eventType: 'bottom',
           });
       numUndoableEvents = 1;
-    }
+    };
     clearStack();
 
-    function pushEvent(event) {
+    const pushEvent = (event) => {
       const e = _.extend(
           {}, event);
       e.elementType = UNDOABLE_EVENT;
       stackElements.push(e);
       numUndoableEvents++;
       // dmesg("pushEvent backset: "+event.backset);
-    }
+    };
 
-    function pushExternalChange(cs) {
+    const pushExternalChange = (cs) => {
       const idx = stackElements.length - 1;
-      if (stackElements[idx].elementType == EXTERNAL_CHANGE) {
+      if (stackElements[idx].elementType === EXTERNAL_CHANGE) {
-        stackElements[idx].changeset = Changeset.compose(stackElements[idx].changeset, cs, getAPool());
+        stackElements[idx].changeset =
+            Changeset.compose(stackElements[idx].changeset, cs, getAPool());
       } else {
         stackElements.push(
             {
@@ -67,14 +70,14 @@ var undoModule = (function () {
               changeset: cs,
             });
       }
-    }
+    };
 
-    function _exposeEvent(nthFromTop) {
+    const _exposeEvent = (nthFromTop) => {
       // precond: 0 <= nthFromTop < numUndoableEvents
       const targetIndex = stackElements.length - 1 - nthFromTop;
       let idx = stackElements.length - 1;
-      while (idx > targetIndex || stackElements[idx].elementType == EXTERNAL_CHANGE) {
+      while (idx > targetIndex || stackElements[idx].elementType === EXTERNAL_CHANGE) {
-        if (stackElements[idx].elementType == EXTERNAL_CHANGE) {
+        if (stackElements[idx].elementType === EXTERNAL_CHANGE) {
           const ex = stackElements[idx];
           const un = stackElements[idx - 1];
           if (un.backset) {
@@ -86,15 +89,16 @@ var undoModule = (function () {
               const newSel = Changeset.characterRangeFollow(excs, un.selStart, un.selEnd);
               un.selStart = newSel[0];
               un.selEnd = newSel[1];
-              if (un.selStart == un.selEnd) {
+              if (un.selStart === un.selEnd) {
                 un.selFocusAtStart = false;
               }
             }
           }
           stackElements[idx - 1] = ex;
           stackElements[idx] = un;
-          if (idx >= 2 && stackElements[idx - 2].elementType == EXTERNAL_CHANGE) {
+          if (idx >= 2 && stackElements[idx - 2].elementType === EXTERNAL_CHANGE) {
-            ex.changeset = Changeset.compose(stackElements[idx - 2].changeset, ex.changeset, getAPool());
+            ex.changeset =
+                Changeset.compose(stackElements[idx - 2].changeset, ex.changeset, getAPool());
             stackElements.splice(idx - 2, 1);
             idx--;
           }
@@ -102,24 +106,22 @@ var undoModule = (function () {
           idx--;
         }
       }
-    }
+    };
 
-    function getNthFromTop(n) {
+    const getNthFromTop = (n) => {
       // precond: 0 <= n < numEvents()
       _exposeEvent(n);
       return stackElements[stackElements.length - 1 - n];
-    }
+    };
 
-    function numEvents() {
+    const numEvents = () => numUndoableEvents;
-      return numUndoableEvents;
-    }
 
-    function popEvent() {
+    const popEvent = () => {
       // precond: numEvents() > 0
       _exposeEvent(0);
       numUndoableEvents--;
       return stackElements.pop();
-    }
+    };
 
     return {
       numEvents,
@@ -134,12 +136,12 @@ var undoModule = (function () {
   // invariant: stack always has at least one undoable event
   let undoPtr = 0; // zero-index from top of stack, 0 == top
 
-  function clearHistory() {
+  const clearHistory = () => {
     stack.clearStack();
     undoPtr = 0;
-  }
+  };
 
-  function _charOccurrences(str, c) {
+  const _charOccurrences = (str, c) => {
     let i = 0;
     let count = 0;
     while (i >= 0 && i < str.length) {
@@ -150,13 +152,11 @@ var undoModule = (function () {
       }
     }
     return count;
-  }
+  };
 
-  function _opcodeOccurrences(cs, opcode) {
+  const _opcodeOccurrences = (cs, opcode) => _charOccurrences(Changeset.unpack(cs).ops, opcode);
-    return _charOccurrences(Changeset.unpack(cs).ops, opcode);
-  }
 
-  function _mergeChangesets(cs1, cs2) {
+  const _mergeChangesets = (cs1, cs2) => {
     if (!cs1) return cs2;
     if (!cs2) return cs1;
 
@@ -170,40 +170,40 @@ var undoModule = (function () {
     const plusCount2 = _opcodeOccurrences(cs2, '+');
     const minusCount1 = _opcodeOccurrences(cs1, '-');
     const minusCount2 = _opcodeOccurrences(cs2, '-');
-    if (plusCount1 == 1 && plusCount2 == 1 && minusCount1 == 0 && minusCount2 == 0) {
+    if (plusCount1 === 1 && plusCount2 === 1 && minusCount1 === 0 && minusCount2 === 0) {
-      var merge = Changeset.compose(cs1, cs2, getAPool());
+      const merge = Changeset.compose(cs1, cs2, getAPool());
-      var plusCount3 = _opcodeOccurrences(merge, '+');
+      const plusCount3 = _opcodeOccurrences(merge, '+');
-      var minusCount3 = _opcodeOccurrences(merge, '-');
+      const minusCount3 = _opcodeOccurrences(merge, '-');
-      if (plusCount3 == 1 && minusCount3 == 0) {
+      if (plusCount3 === 1 && minusCount3 === 0) {
         return merge;
       }
-    } else if (plusCount1 == 0 && plusCount2 == 0 && minusCount1 == 1 && minusCount2 == 1) {
+    } else if (plusCount1 === 0 && plusCount2 === 0 && minusCount1 === 1 && minusCount2 === 1) {
-      var merge = Changeset.compose(cs1, cs2, getAPool());
+      const merge = Changeset.compose(cs1, cs2, getAPool());
-      var plusCount3 = _opcodeOccurrences(merge, '+');
+      const plusCount3 = _opcodeOccurrences(merge, '+');
-      var minusCount3 = _opcodeOccurrences(merge, '-');
+      const minusCount3 = _opcodeOccurrences(merge, '-');
-      if (plusCount3 == 0 && minusCount3 == 1) {
+      if (plusCount3 === 0 && minusCount3 === 1) {
         return merge;
       }
     }
     return null;
-  }
+  };
 
-  function reportEvent(event) {
+  const reportEvent = (event) => {
     const topEvent = stack.getNthFromTop(0);
 
-    function applySelectionToTop() {
+    const applySelectionToTop = () => {
       if ((typeof event.selStart) === 'number') {
         topEvent.selStart = event.selStart;
         topEvent.selEnd = event.selEnd;
         topEvent.selFocusAtStart = event.selFocusAtStart;
       }
-    }
+    };
 
     if ((!event.backset) || Changeset.isIdentity(event.backset)) {
       applySelectionToTop();
     } else {
       let merged = false;
-      if (topEvent.eventType == event.eventType) {
+      if (topEvent.eventType === event.eventType) {
         const merge = _mergeChangesets(event.backset, topEvent.backset);
         if (merge) {
           topEvent.backset = merge;
@@ -225,15 +225,15 @@ var undoModule = (function () {
       }
       undoPtr = 0;
     }
-  }
+  };
 
-  function reportExternalChange(changeset) {
+  const reportExternalChange = (changeset) => {
     if (changeset && !Changeset.isIdentity(changeset)) {
       stack.pushExternalChange(changeset);
     }
-  }
+  };
 
-  function _getSelectionInfo(event) {
+  const _getSelectionInfo = (event) => {
     if ((typeof event.selStart) !== 'number') {
       return null;
     } else {
@@ -243,7 +243,7 @@ var undoModule = (function () {
         selFocusAtStart: event.selFocusAtStart,
       };
     }
-  }
+  };
 
   // For "undo" and "redo", the change event must be returned
   // by eventFunc and NOT reported through the normal mechanism.
@@ -251,7 +251,7 @@ var undoModule = (function () {
   // or can be called with no arguments to mean that no undo is possible.
   // "eventFunc" will be called exactly once.
 
-  function performUndo(eventFunc) {
+  const performUndo = (eventFunc) => {
     if (undoPtr < stack.numEvents() - 1) {
       const backsetEvent = stack.getNthFromTop(undoPtr);
       const selectionEvent = stack.getNthFromTop(undoPtr + 1);
@@ -259,9 +259,9 @@ var undoModule = (function () {
       stack.pushEvent(undoEvent);
       undoPtr += 2;
     } else { eventFunc(); }
-  }
+  };
 
-  function performRedo(eventFunc) {
+  const performRedo = (eventFunc) => {
     if (undoPtr >= 2) {
       const backsetEvent = stack.getNthFromTop(0);
       const selectionEvent = stack.getNthFromTop(1);
@@ -269,11 +269,9 @@ var undoModule = (function () {
       stack.popEvent();
       undoPtr -= 2;
     } else { eventFunc(); }
-  }
+  };
 
-  function getAPool() {
+  const getAPool = () => undoModule.apool;
-    return undoModule.apool;
-  }
 
   return {
     clearHistory,