Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js
===================================================================
diff -u -r8369ef2443c67cab61cd26c9b0b0c067e4ff4f42 -ra48d0ff83afade0039b5fa730d87292104fe7982
--- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js	(.../index.js)	(revision 8369ef2443c67cab61cd26c9b0b0c067e4ff4f42)
+++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js	(.../index.js)	(revision a48d0ff83afade0039b5fa730d87292104fe7982)
@@ -1,102 +1,88 @@
-var $sidedivinner, fadeColor, getAuthorClassName, init, authorNameAndColorFromAuthorId, authorLines, isStyleFuncSupported, out$ = typeof exports != 'undefined' && exports || this;
-function allClasses($node){
-  var ref$;
-  return ((ref$ = $node.attr('class')) != null ? ref$ : '').split(' ');
-}
-out$.postAceInit = postAceInit;
-function postAceInit(hook_name, arg$){
-  var ace;
-  ace = arg$.ace;
-  $sidedivinner = $('iframe[name="ace_outer"]').contents().find('#sidedivinner').addClass('authorColors');
-  return ace.callWithAce(function(ace){
-    var $doc, $body, x$;
-    $doc = $(ace.ace_getDocument());
-    $body = $doc.find('body');
-    x$ = $body.get(0).ownerDocument;
-    x$.addEventListener('focus', function(){
-      $sidedivinner.addClass('authorColors');
-      return $body.addClass('focus');
-    }, true);
-    x$.addEventListener('blur', function(){
-      $sidedivinner.removeClass('authorColors');
-      return $body.removeClass('focus');
-    }, true);
-    return x$;
-  });
-}
-function derivePrimaryAuthor($node){
-  var byAuthor, mPA, authorClass, author, value;
-  byAuthor = {};
-  $node.find('span').each(function(){
-    var $this, i$, ref$, len$, spanclass, results$ = [];
-    $this = $(this);
-    for (i$ = 0, len$ = (ref$ = allClasses($this)).length; i$ < len$; ++i$) {
-      spanclass = ref$[i$];
-      if (/^author/.exec(spanclass)) {
-        byAuthor[spanclass] == null && (byAuthor[spanclass] = 0);
-        results$.push(byAuthor[spanclass] += $this.text().length);
+'use strict';
+
+let $sidedivinner;
+let init;
+
+exports.postAceInit = (hookName, context) => {
+  $sidedivinner = $('iframe[name="ace_outer"]').contents().find('#sidedivinner');
+  if (!$('#editorcontainerbox').hasClass('flex-layout')) {
+    return $.gritter.add({
+      title: 'Error',
+      text: 'ep_author_neat2: Please upgrade to Etherpad 1.8.4 for this plugin to work correctly',
+      sticky: true,
+      class_name: 'error',
+    });
+  }
+};
+
+const derivePrimaryAuthor = ($node) => {
+  let mPA, authorClass;
+  const byAuthor = new Map();
+  $node.find('span').each(function () {
+    const $this = $(this);
+    for (const spanclass of this.classList) {
+      if (spanclass.startsWith('author')) {
+        byAuthor.set(spanclass, (byAuthor.get(spanclass) || 0) + $this.text().length);
       }
     }
-    return results$;
   });
   mPA = 0;
   authorClass = null;
-  for (author in byAuthor) {
-    value = byAuthor[author];
-    if (value > mPA) {
-      mPA = value;
-      authorClass = author;
-    }
+  for (const [author, value] of byAuthor) {
+    if (value <= mPA) continue;
+    mPA = value;
+    authorClass = author;
   }
   return authorClass;
-}
-function toggleAuthor($node, prefix, authorClass){
-  var hasClass, myClass, i$, ref$, len$, c;
-  hasClass = false;
-  myClass = prefix + "-" + authorClass;
-  for (i$ = 0, len$ = (ref$ = allClasses($node)).length; i$ < len$; ++i$) {
-    c = ref$[i$];
-    if (c.indexOf(prefix) === 0) {
-      if (c === myClass) {
-        hasClass = true;
-      } else {
-        $node.removeClass(c);
-      }
+};
+
+const toggleAuthor = ($node, prefix, authorClass) => {
+  if ($node.length === 0) return true;
+  let hasClass = false;
+  const myClass = `${prefix}-${authorClass}`;
+  for (const c of $node[0].classList) {
+    if (c.indexOf(prefix) !== 0) continue;
+    if (c === myClass) {
+      hasClass = true;
+    } else {
+      $node.removeClass(c);
     }
   }
   if (hasClass) {
     return false;
   }
   $node.addClass(myClass);
   return true;
-}
-function updateDomline($node){
-  var lineNumber, authorClass;
-  lineNumber = $node.index() + 1;
+};
+
+const updateDomline = ($node) => {
+  const lineNumber = $node.index() + 1;
   if (!lineNumber) {
     return false;
   }
-  authorClass = $node.text().length > 0 ? derivePrimaryAuthor($node) : "none";
-  toggleAuthor($node, "primary", authorClass);
+  const authorClass = $node.text().length > 0 ? derivePrimaryAuthor($node) : 'none';
+  toggleAuthor($node, 'primary', authorClass);
   return authorViewUpdate($node, lineNumber, null, authorClass);
-}
-function extractAuthor($node){
-  var ref$, a, ref1$;
-  return (ref$ = (function(){
-    var i$, ref$, len$, results$ = [];
-    for (i$ = 0, len$ = (ref$ = allClasses($node)).length; i$ < len$; ++i$) {
-      a = ref$[i$];
-      if (/^primary-/.exec(a)) {
-        results$.push(a);
-      }
+};
+
+const extractAuthor = ($node) => {
+  let ref$, ref1$;
+  return (ref$ = (() => {
+    const results$ = [];
+    for (const a of $node[0].classList) {
+      if (a.startsWith('primary-')) results$.push(a);
     }
     return results$;
-  }())) != null ? (ref1$ = ref$[0]) != null ? ref1$.replace(/^primary-/, '') : void 8 : void 8;
-}
-function authorViewUpdate($node, lineNumber, prevAuthor, authorClass){
-  var $authorContainer, prev, prevId, ref$, authorChanged, next, logicalPrevAuthor;
-  $authorContainer = $sidedivinner.find("div:nth-child(" + lineNumber + ")");
-  authorClass == null && (authorClass = extractAuthor($node));
+  })()) != null ? (ref1$ = ref$[0]) != null ? ref1$.replace(/^primary-/, '') : void 8 : void 8;
+};
+
+const authorViewUpdate = ($node, lineNumber, prevAuthor, authorClass) => {
+  let prev, ref$, authorChanged, logicalPrevAuthor;
+  if (!$sidedivinner) {
+    $sidedivinner = $('iframe[name="ace_outer"]').contents().find('#sidedivinner');
+  }
+  const $authorContainer = $sidedivinner.find(`div:nth-child(${lineNumber})`);
+  if (authorClass == null) authorClass = extractAuthor($node);
   if (!prevAuthor) {
     prev = $authorContainer;
     while ((prev = prev.prev()) && prev.length) {
@@ -106,114 +92,110 @@
       }
     }
   }
-  if (prevAuthor === authorClass) {
-    $authorContainer.addClass('concise');
-  } else {
-    $authorContainer.removeClass('concise');
-  }
-  prevId = (ref$ = $authorContainer.attr('id')) != null ? ref$.replace(/^ref-/, '') : void 8;
+  $authorContainer.toggleClass('concise', prevAuthor === authorClass);
+  const prevId = (ref$ = $authorContainer.attr('id')) != null ? ref$.replace(/^ref-/, '') : void 8;
   if (prevId === $node.attr('id')) {
-    authorChanged = toggleAuthor($authorContainer, "primary", authorClass);
+    authorChanged = toggleAuthor($authorContainer, 'primary', authorClass);
     if (!authorChanged) {
       return;
     }
   } else {
-    $authorContainer.attr('id', 'ref-' + $node.attr('id'));
-    toggleAuthor($authorContainer, "primary", authorClass);
+    $authorContainer.attr('id', `ref-${$node.attr('id')}`);
+    toggleAuthor($authorContainer, 'primary', authorClass);
   }
-  next = $node.next();
+  const next = $node.next();
   if (next.length) {
     logicalPrevAuthor = authorClass === 'none' ? prevAuthor : authorClass;
     return authorViewUpdate(next, lineNumber + 1, logicalPrevAuthor);
   }
-}
-fadeColor = function(colorCSS, fadeFrac){
-  var color;
-  color = colorutils.css2triple(colorCSS);
-  return colorutils.triple2css(colorutils.blend(color, [1, 1, 1], fadeFrac));
 };
-getAuthorClassName = function(author){
-  return 'author-' + author.replace(/[^a-y0-9]/g, function(c){
-    if (c === '.') {
-      return '-';
-    } else {
-      return 'z' + c.charCodeAt(0) + 'z';
-    }
-  });
-};
-function outerInit(outerDynamicCSS){
-  var x$, y$, z$, z1$;
-  x$ = outerDynamicCSS.selectorStyle('#sidedivinner > div.primary-author-none');
-  x$.borderRight = 'solid 0px ';
-  x$.paddingRight = '5px';
-  y$ = outerDynamicCSS.selectorStyle('#sidedivinner > div.concise::before');
+
+const getAuthorClassName = (author) => `author-${author.replace(/[^a-y0-9]/g, (c) => {
+  if (c === '.') {
+    return '-';
+  } else {
+    return `z${c.charCodeAt(0)}z`;
+  }
+})}`;
+
+const outerInit = (outerDynamicCSS) => {
+  const x$ = outerDynamicCSS.selectorStyle('#sidedivinner.authorColors > div');
+  x$.borderRight = 'solid 5px transparent';
+  const y$ = outerDynamicCSS.selectorStyle('#sidedivinner.authorColors > div.concise::before');
   y$.content = "' '";
-  z$ = outerDynamicCSS.selectorStyle('#sidedivinner > div');
-  z$.fontSize = '0px';
-  z$.paddingRight = '10px';
-  z1$ = outerDynamicCSS.selectorStyle('#sidedivinner > div::before');
-  z1$.fontSize = 'initial';
-  z1$.textOverflow = 'ellipsis';
-  z1$.overflow = 'hidden';
+  const z$ = outerDynamicCSS.selectorStyle('#sidedivinner.authorColors > div::before');
+  z$.fontSize = '11px';
+  z$.textTransform = 'capitalize';
+  z$.textOverflow = 'ellipsis';
+  z$.overflow = 'hidden';
   return init = true;
-}
-out$.aceSetAuthorStyle = aceSetAuthorStyle;
-function aceSetAuthorStyle(name, context){
-  var dynamicCSS, outerDynamicCSS, parentDynamicCSS, info, author, authorSelector, color, authorClass, authorName, x$, y$, z$, z1$, z2$;
-  dynamicCSS = context.dynamicCSS, outerDynamicCSS = context.outerDynamicCSS, parentDynamicCSS = context.parentDynamicCSS, info = context.info, author = context.author;
+};
+
+exports.aceSetAuthorStyle = (hookName, context) => {
+  const {author, dynamicCSS, info, outerDynamicCSS, parentDynamicCSS} = context;
   if (!init) {
     outerInit(outerDynamicCSS);
   }
-  authorSelector = ".authorColors span." + authorClass;
+  const authorClass = getAuthorClassName(author);
+  const authorSelector = `.authorColors span.${authorClass}`;
   if (info) {
-    if (!(color = info.bgcolor)) {
+    const color = info.bgcolor;
+    if (!color) {
       return 1;
     }
-    authorClass = getAuthorClassName(author);
-    authorName = authorNameAndColorFromAuthorId(author).name;
-    x$ = dynamicCSS.selectorStyle(".authorColors.focus span." + authorClass);
-    x$.borderBottom = "2px solid " + color;
-    y$ = parentDynamicCSS.selectorStyle(authorSelector);
-    y$.borderBottom = "2px solid " + color;
-    z$ = dynamicCSS.selectorStyle(".authorColors.focus .primary-" + authorClass + " ." + authorClass);
+    const authorName = authorNameAndColorFromAuthorId(author).name;
+    const x$ = dynamicCSS.selectorStyle(`#innerdocbody.authorColors span.${authorClass}`);
+    x$.borderBottom = `2px solid ${color}`;
+    x$.paddingBottom = '1px';
+    const y$ = parentDynamicCSS.selectorStyle(authorSelector);
+    y$.borderBottom = `2px solid ${color}`;
+    y$.paddingBottom = '1px';
+    const z$ = dynamicCSS.selectorStyle(
+        `#innerdocbody.authorColors .primary-${authorClass} span.${authorClass}`);
     z$.borderBottom = '0px';
-    z1$ = outerDynamicCSS.selectorStyle("#sidedivinner.authorColors > div.primary-" + authorClass);
-    z1$.borderRight = "solid 5px " + color;
-    z1$.paddingRight = '5px';
-    z2$ = outerDynamicCSS.selectorStyle("#sidedivinner > div.primary-" + authorClass + "::before");
-    z2$.content = "'" + authorName + "'";
+    const z1$ = outerDynamicCSS.selectorStyle(
+        `#sidedivinner.authorColors > div.primary-${authorClass}`);
+    z1$.borderRight = `solid 5px ${color}`;
+    const z2$ = outerDynamicCSS.selectorStyle(
+        `#sidedivinner.authorColors > div.primary-${authorClass}::before`);
+    z2$.content = `'${authorName}'`;
+    z2$.paddingLeft = '5px';
+    z2$.whiteSpace = 'nowrap';
+    const z3$ = outerDynamicCSS.selectorStyle(
+        `.line-numbers-hidden #sidedivinner.authorColors > div.primary-${authorClass}::before`);
+    z3$.paddingRight = '12px';
   } else {
-    dynamicCSS.removeSelectorStyle(".authorColors.focus span." + authorClass);
+    dynamicCSS.removeSelectorStyle(`#innerdocbody.authorColors span.${authorClass}`);
     parentDynamicCSS.removeSelectorStyle(authorSelector);
   }
   return 1;
-}
-authorNameAndColorFromAuthorId = function(authorId){
-  var myAuthorId, authorObj;
-  myAuthorId = pad.myUserInfo.userId;
+};
+
+const authorNameAndColorFromAuthorId = (authorId) => {
+  let authorObj;
+  const myAuthorId = pad.myUserInfo.userId;
   if (myAuthorId === authorId) {
     return {
       name: 'Me',
-      color: pad.myUserInfo.colorId
+      color: pad.myUserInfo.colorId,
     };
   }
   authorObj = {};
-  $('#otheruserstable > tbody > tr').each(function(){
-    var x$;
+  $('#otheruserstable > tbody > tr').each(function () {
+    let x$;
     if (authorId === $(this).data('authorid')) {
       x$ = $(this);
-      x$.find('.usertdname').each(function(){
+      x$.find('.usertdname').each(function () {
         return authorObj.name = $(this).text() || 'Unknown Author';
       });
-      x$.find('.usertdswatch > div').each(function(){
+      x$.find('.usertdswatch > div').each(function () {
         return authorObj.color = $(this).css('background-color');
       });
       return authorObj;
     }
   });
-  
   if (!authorObj || !authorObj.name) {
-	authorObj = clientVars.collab_client_vars.historicalAuthorData[authorId];
+    authorObj = clientVars.collab_client_vars.historicalAuthorData[authorId];
   }
 
   // Added for LAMS: identify new authors
@@ -228,60 +210,24 @@
 
   return authorObj || {
     name: 'Unknown Author',
-    color: '#fff'
+    color: '#fff',
   };
 };
-authorLines = {};
-out$.acePostWriteDomLineHTML = acePostWriteDomLineHTML;
-function acePostWriteDomLineHTML(hook_name, args, cb){
-  return setTimeout(function(){
-    return updateDomline($(args.node));
-  }, 200);
-}
-out$.aceEditEvent = aceEditEvent;
-function aceEditEvent(hook_name, context, cb){
-  var callstack, x$;
-  callstack = context.callstack;
+
+exports.acePostWriteDomLineHTML =
+    (hookName, {node}) => setTimeout(() => updateDomline($(node)), 200);
+
+exports.aceEditEvent = (hookName, {callstack}) => {
   if (callstack.type !== 'setWraps') {
     return;
   }
-  x$ = $('iframe[name="ace_outer"]').contents();
+  const x$ = $('iframe[name="ace_outer"]').contents();
   x$.find('#sidediv').css({
-    'padding-right': '0px'
+    'padding-right': '0px',
   });
   x$.find('#sidedivinner').css({
     'max-width': '180px',
-    overflow: 'hidden'
+    'overflow': 'hidden',
   });
   return x$;
-}
-isStyleFuncSupported = CSSStyleDeclaration.prototype.getPropertyValue != null;
-if (!isStyleFuncSupported) {
-  CSSStyleDeclaration.prototype.getPropertyValue = function(a){
-    return this.getAttribute(a);
-  };
-  CSSStyleDeclaration.prototype.setProperty = function(styleName, value, priority){
-    var rule;
-    this.setAttribute(styleName, value);
-    priority = typeof priority !== 'undefined' ? priority : '';
-    if (!(priority === '')) {
-      rule = new RegExp(RegExp.escape(styleName) + '\\s*:\\s*' + RegExp.escape(value + '(\\s*;)?', 'gmi'));
-      return this.cssText = this.cssText.replace(rule, styleName + ': ' + value + ' !' + priority + ';');
-    }
-  };
-  CSSStyleDeclaration.prototype.removeProperty = function(a){
-    return this.removeAttribute(a);
-  };
-  CSSStyleDeclaration.prototype.getPropertyPriority = function(styleName){
-    var rule;
-    rule = new RegExp(RegExp.escape(styleName) + '\\s*:\\s*[^\\s]*\\s*!important(\\s*;)?', 'gmi');
-    if (rule.test(this.cssText)) {
-      return 'important';
-    } else {
-      return '';
-    }
-  };
-}
-RegExp.escape = function(text){
-  return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-};
\ No newline at end of file
+};