@lingk/sync 1.1.40 → 1.1.41

package/build/credentialSections.js

@@ -68,7 +68,7 @@ module.exports =
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = __webpack_require__(71);
+	module.exports = __webpack_require__(54);
 
 
 /***/ },
@@ -79,43 +79,31 @@ module.exports =
 
 /***/ },
 /* 2 */,
-/* 3 */,
-/* 4 */
+/* 3 */
 /***/ function(module, exports) {
 
 	module.exports = require("react-bootstrap");
 
 /***/ },
+/* 4 */,
 /* 5 */,
 /* 6 */,
 /* 7 */,
 /* 8 */,
 /* 9 */,
 /* 10 */,
-/* 11 */,
-/* 12 */,
-/* 13 */,
-/* 14 */,
-/* 15 */,
-/* 16 */,
-/* 17 */,
-/* 18 */,
-/* 19 */,
-/* 20 */,
-/* 21 */,
-/* 22 */,
-/* 23 */,
-/* 24 */,
-/* 25 */,
-/* 26 */
+/* 11 */
 /***/ function(module, exports) {
 
 	module.exports = require("moment");
 
 /***/ },
-/* 27 */,
-/* 28 */,
-/* 29 */
+/* 12 */,
+/* 13 */,
+/* 14 */,
+/* 15 */,
+/* 16 */,
+/* 17 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(global) {/*!
@@ -128,9 +116,9 @@ module.exports =
 	
 	'use strict'
 	
-	var base64 = __webpack_require__(77)
-	var ieee754 = __webpack_require__(97)
-	var isArray = __webpack_require__(98)
+	var base64 = __webpack_require__(68)
+	var ieee754 = __webpack_require__(70)
+	var isArray = __webpack_require__(71)
 	
 	exports.Buffer = Buffer
 	exports.SlowBuffer = SlowBuffer
@@ -1911,19 +1899,16 @@ module.exports =
 	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
 
 /***/ },
-/* 30 */,
-/* 31 */,
-/* 32 */,
-/* 33 */,
-/* 34 */,
-/* 35 */,
-/* 36 */,
-/* 37 */,
-/* 38 */,
-/* 39 */,
-/* 40 */,
-/* 41 */,
-/* 42 */
+/* 18 */,
+/* 19 */,
+/* 20 */,
+/* 21 */,
+/* 22 */,
+/* 23 */,
+/* 24 */,
+/* 25 */,
+/* 26 */,
+/* 27 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// CodeMirror, copyright (c) by Marijn Haverbeke and others
@@ -1931,7 +1916,7 @@ module.exports =
 	
 	(function(mod) {
 	  if (true) // CommonJS
-	    mod(__webpack_require__(78));
+	    mod(__webpack_require__(69));
 	  else if (typeof define == "function" && define.amd) // AMD
 	    define(["../../lib/codemirror"], mod);
 	  else // Plain browser env
@@ -1954,7 +1939,7 @@ module.exports =
 	    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d");
 	    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
 	
-	    return {
+	    var jsKeywords = {
 	      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
 	      "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C,
 	      "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"),
@@ -1966,6 +1951,35 @@ module.exports =
 	      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
 	      "await": C
 	    };
+	
+	    // Extend the 'normal' keywords with the TypeScript language extensions
+	    if (isTS) {
+	      var type = {type: "variable", style: "type"};
+	      var tsKeywords = {
+	        // object-like things
+	        "interface": kw("class"),
+	        "implements": C,
+	        "namespace": C,
+	        "module": kw("module"),
+	        "enum": kw("module"),
+	
+	        // scope modifiers
+	        "public": kw("modifier"),
+	        "private": kw("modifier"),
+	        "protected": kw("modifier"),
+	        "abstract": kw("modifier"),
+	        "readonly": kw("modifier"),
+	
+	        // types
+	        "string": type, "number": type, "boolean": type, "any": type
+	      };
+	
+	      for (var attr in tsKeywords) {
+	        jsKeywords[attr] = tsKeywords[attr];
+	      }
+	    }
+	
+	    return jsKeywords;
 	  }();
 	
 	  var isOperatorChar = /[+\-*&%=<>!?|~^@]/;
@@ -2003,10 +2017,17 @@ module.exports =
 	      return ret(ch);
 	    } else if (ch == "=" && stream.eat(">")) {
 	      return ret("=>", "operator");
-	    } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
+	    } else if (ch == "0" && stream.eat(/x/i)) {
+	      stream.eatWhile(/[\da-f]/i);
+	      return ret("number", "number");
+	    } else if (ch == "0" && stream.eat(/o/i)) {
+	      stream.eatWhile(/[0-7]/i);
+	      return ret("number", "number");
+	    } else if (ch == "0" && stream.eat(/b/i)) {
+	      stream.eatWhile(/[01]/i);
 	      return ret("number", "number");
 	    } else if (/\d/.test(ch)) {
-	      stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
+	      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
 	      return ret("number", "number");
 	    } else if (ch == "/") {
 	      if (stream.eat("*")) {
@@ -2017,7 +2038,7 @@ module.exports =
 	        return ret("comment", "comment");
 	      } else if (expressionAllowed(stream, state, 1)) {
 	        readRegexp(stream);
-	        stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/);
+	        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
 	        return ret("regexp", "string-2");
 	      } else {
 	        stream.eat("=");
@@ -2047,7 +2068,7 @@ module.exports =
 	          var kw = keywords[word]
 	          return ret(kw.type, kw.style, word)
 	        }
-	        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
+	        if (word == "async" && stream.match(/^\s*[\(\w]/, false))
 	          return ret("async", "keyword", word)
 	      }
 	      return ret("variable", "variable", word)
@@ -2186,68 +2207,35 @@ module.exports =
 	    pass.apply(null, arguments);
 	    return true;
 	  }
-	  function inList(name, list) {
-	    for (var v = list; v; v = v.next) if (v.name == name) return true
-	    return false;
-	  }
 	  function register(varname) {
+	    function inList(list) {
+	      for (var v = list; v; v = v.next)
+	        if (v.name == varname) return true;
+	      return false;
+	    }
 	    var state = cx.state;
 	    cx.marked = "def";
 	    if (state.context) {
-	      if (state.lexical.info == "var" && state.context && state.context.block) {
-	        // FIXME function decls are also not block scoped
-	        var newContext = registerVarScoped(varname, state.context)
-	        if (newContext != null) {
-	          state.context = newContext
-	          return
-	        }
-	      } else if (!inList(varname, state.localVars)) {
-	        state.localVars = new Var(varname, state.localVars)
-	        return
-	      }
-	    }
-	    // Fall through means this is global
-	    if (parserConfig.globalVars && !inList(varname, state.globalVars))
-	      state.globalVars = new Var(varname, state.globalVars)
-	  }
-	  function registerVarScoped(varname, context) {
-	    if (!context) {
-	      return null
-	    } else if (context.block) {
-	      var inner = registerVarScoped(varname, context.prev)
-	      if (!inner) return null
-	      if (inner == context.prev) return context
-	      return new Context(inner, context.vars, true)
-	    } else if (inList(varname, context.vars)) {
-	      return context
+	      if (inList(state.localVars)) return;
+	      state.localVars = {name: varname, next: state.localVars};
 	    } else {
-	      return new Context(context.prev, new Var(varname, context.vars), false)
+	      if (inList(state.globalVars)) return;
+	      if (parserConfig.globalVars)
+	        state.globalVars = {name: varname, next: state.globalVars};
 	    }
 	  }
 	
-	  function isModifier(name) {
-	    return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"
-	  }
-	
 	  // Combinators
 	
-	  function Context(prev, vars, block) { this.prev = prev; this.vars = vars; this.block = block }
-	  function Var(name, next) { this.name = name; this.next = next }
-	
-	  var defaultVars = new Var("this", new Var("arguments", null))
+	  var defaultVars = {name: "this", next: {name: "arguments"}};
 	  function pushcontext() {
-	    cx.state.context = new Context(cx.state.context, cx.state.localVars, false)
-	    cx.state.localVars = defaultVars
-	  }
-	  function pushblockcontext() {
-	    cx.state.context = new Context(cx.state.context, cx.state.localVars, true)
-	    cx.state.localVars = null
+	    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
+	    cx.state.localVars = defaultVars;
 	  }
 	  function popcontext() {
-	    cx.state.localVars = cx.state.context.vars
-	    cx.state.context = cx.state.context.prev
+	    cx.state.localVars = cx.state.context.vars;
+	    cx.state.context = cx.state.context.prev;
 	  }
-	  popcontext.lex = true
 	  function pushlex(type, info) {
 	    var result = function() {
 	      var state = cx.state, indent = state.indented;
@@ -2279,12 +2267,12 @@ module.exports =
 	  }
 	
 	  function statement(type, value) {
-	    if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex);
+	    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
 	    if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
 	    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
 	    if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
 	    if (type == "debugger") return cont(expect(";"));
-	    if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext);
+	    if (type == "{") return cont(pushlex("}"), block, poplex);
 	    if (type == ";") return cont();
 	    if (type == "if") {
 	      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
@@ -2293,51 +2281,42 @@ module.exports =
 	    }
 	    if (type == "function") return cont(functiondef);
 	    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-	    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), className, poplex); }
 	    if (type == "variable") {
-	      if (isTS && value == "declare") {
+	      if (isTS && value == "type") {
 	        cx.marked = "keyword"
-	        return cont(statement)
-	      } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) {
-	        cx.marked = "keyword"
-	        if (value == "enum") return cont(enumdef);
-	        else if (value == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
-	        else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
-	      } else if (isTS && value == "namespace") {
-	        cx.marked = "keyword"
-	        return cont(pushlex("form"), expression, block, poplex)
-	      } else if (isTS && value == "abstract") {
+	        return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+	      } if (isTS && value == "declare") {
 	        cx.marked = "keyword"
 	        return cont(statement)
 	      } else {
 	        return cont(pushlex("stat"), maybelabel);
 	      }
 	    }
-	    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext,
-	                                      block, poplex, poplex, popcontext);
+	    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"),
+	                                      block, poplex, poplex);
 	    if (type == "case") return cont(expression, expect(":"));
 	    if (type == "default") return cont(expect(":"));
-	    if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext);
+	    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
+	                                     statement, poplex, popcontext);
+	    if (type == "class") return cont(pushlex("form"), className, poplex);
 	    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
 	    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
+	    if (type == "module") return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
 	    if (type == "async") return cont(statement)
 	    if (value == "@") return cont(expression, statement)
 	    return pass(pushlex("stat"), expression, expect(";"), poplex);
 	  }
-	  function maybeCatchBinding(type) {
-	    if (type == "(") return cont(funarg, expect(")"))
-	  }
-	  function expression(type, value) {
-	    return expressionInner(type, value, false);
+	  function expression(type) {
+	    return expressionInner(type, false);
 	  }
-	  function expressionNoComma(type, value) {
-	    return expressionInner(type, value, true);
+	  function expressionNoComma(type) {
+	    return expressionInner(type, true);
 	  }
 	  function parenExpr(type) {
 	    if (type != "(") return pass()
 	    return cont(pushlex(")"), expression, expect(")"), poplex)
 	  }
-	  function expressionInner(type, value, noComma) {
+	  function expressionInner(type, noComma) {
 	    if (cx.state.fatArrowAt == cx.stream.start) {
 	      var body = noComma ? arrowBodyNoComma : arrowBody;
 	      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);
@@ -2347,7 +2326,7 @@ module.exports =
 	    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
 	    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
 	    if (type == "function") return cont(functiondef, maybeop);
-	    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), classExpression, poplex); }
+	    if (type == "class") return cont(pushlex("form"), classExpression, poplex);
 	    if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression);
 	    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
 	    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
@@ -2355,7 +2334,6 @@ module.exports =
 	    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
 	    if (type == "quasi") return pass(quasi, maybeop);
 	    if (type == "new") return cont(maybeTarget(noComma));
-	    if (type == "import") return cont(expression);
 	    return cont();
 	  }
 	  function maybeexpression(type) {
@@ -2373,8 +2351,6 @@ module.exports =
 	    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
 	    if (type == "operator") {
 	      if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
-	      if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
-	        return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
 	      if (value == "?") return cont(expression, expect(":"), expr);
 	      return cont(expr);
 	    }
@@ -2446,11 +2422,10 @@ module.exports =
 	      return cont(afterprop);
 	    } else if (type == "jsonld-keyword") {
 	      return cont(afterprop);
-	    } else if (isTS && isModifier(value)) {
-	      cx.marked = "keyword"
+	    } else if (type == "modifier") {
 	      return cont(objprop)
 	    } else if (type == "[") {
-	      return cont(expression, maybetype, expect("]"), afterprop);
+	      return cont(expression, expect("]"), afterprop);
 	    } else if (type == "spread") {
 	      return cont(expressionNoComma, afterprop);
 	    } else if (value == "*") {
@@ -2502,32 +2477,20 @@ module.exports =
 	      if (value == "?") return cont(maybetype);
 	    }
 	  }
-	  function mayberettype(type) {
-	    if (isTS && type == ":") {
-	      if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
-	      else return cont(typeexpr)
-	    }
-	  }
-	  function isKW(_, value) {
-	    if (value == "is") {
-	      cx.marked = "keyword"
-	      return cont()
-	    }
-	  }
 	  function typeexpr(type, value) {
-	    if (value == "keyof" || value == "typeof") {
-	      cx.marked = "keyword"
-	      return cont(value == "keyof" ? typeexpr : expressionNoComma)
-	    }
 	    if (type == "variable" || value == "void") {
-	      cx.marked = "type"
-	      return cont(afterType)
+	      if (value == "keyof") {
+	        cx.marked = "keyword"
+	        return cont(typeexpr)
+	      } else {
+	        cx.marked = "type"
+	        return cont(afterType)
+	      }
 	    }
 	    if (type == "string" || type == "number" || type == "atom") return cont(afterType);
 	    if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
 	    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
 	    if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
-	    if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
 	  }
 	  function maybeReturnType(type) {
 	    if (type == "=>") return cont(typeexpr)
@@ -2544,32 +2507,24 @@ module.exports =
 	      return cont(expression, maybetype, expect("]"), typeprop)
 	    }
 	  }
-	  function typearg(type, value) {
-	    if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
-	    if (type == ":") return cont(typeexpr)
-	    return pass(typeexpr)
+	  function typearg(type) {
+	    if (type == "variable") return cont(typearg)
+	    else if (type == ":") return cont(typeexpr)
 	  }
 	  function afterType(type, value) {
 	    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
-	    if (value == "|" || type == "." || value == "&") return cont(typeexpr)
+	    if (value == "|" || type == ".") return cont(typeexpr)
 	    if (type == "[") return cont(expect("]"), afterType)
-	    if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
+	    if (value == "extends") return cont(typeexpr)
 	  }
 	  function maybeTypeArgs(_, value) {
 	    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
 	  }
-	  function typeparam() {
-	    return pass(typeexpr, maybeTypeDefault)
-	  }
-	  function maybeTypeDefault(_, value) {
-	    if (value == "=") return cont(typeexpr)
-	  }
-	  function vardef(_, value) {
-	    if (value == "enum") {cx.marked = "keyword"; return cont(enumdef)}
+	  function vardef() {
 	    return pass(pattern, maybetype, maybeAssign, vardefCont);
 	  }
 	  function pattern(type, value) {
-	    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
+	    if (type == "modifier") return cont(pattern)
 	    if (type == "variable") { register(value); return cont(); }
 	    if (type == "spread") return cont(pattern);
 	    if (type == "[") return contCommasep(pattern, "]");
@@ -2594,8 +2549,7 @@ module.exports =
 	  function maybeelse(type, value) {
 	    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
 	  }
-	  function forspec(type, value) {
-	    if (value == "await") return cont(forspec);
+	  function forspec(type) {
 	    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
 	  }
 	  function forspec1(type) {
@@ -2619,13 +2573,12 @@ module.exports =
 	  function functiondef(type, value) {
 	    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
 	    if (type == "variable") {register(value); return cont(functiondef);}
-	    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext);
-	    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
+	    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
+	    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, functiondef)
 	  }
 	  function funarg(type, value) {
 	    if (value == "@") cont(expression, funarg)
-	    if (type == "spread") return cont(funarg);
-	    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); }
+	    if (type == "spread" || type == "modifier") return cont(funarg);
 	    return pass(pattern, maybetype, maybeAssign);
 	  }
 	  function classExpression(type, value) {
@@ -2637,17 +2590,15 @@ module.exports =
 	    if (type == "variable") {register(value); return cont(classNameAfter);}
 	  }
 	  function classNameAfter(type, value) {
-	    if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
-	    if (value == "extends" || value == "implements" || (isTS && type == ",")) {
-	      if (value == "implements") cx.marked = "keyword";
+	    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, classNameAfter)
+	    if (value == "extends" || value == "implements" || (isTS && type == ","))
 	      return cont(isTS ? typeexpr : expression, classNameAfter);
-	    }
 	    if (type == "{") return cont(pushlex("}"), classBody, poplex);
 	  }
 	  function classBody(type, value) {
-	    if (type == "async" ||
+	    if (type == "modifier" || type == "async" ||
 	        (type == "variable" &&
-	         (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
+	         (value == "static" || value == "get" || value == "set") &&
 	         cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
 	      cx.marked = "keyword";
 	      return cont(classBody);
@@ -2657,7 +2608,7 @@ module.exports =
 	      return cont(isTS ? classfield : functiondef, classBody);
 	    }
 	    if (type == "[")
-	      return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
+	      return cont(expression, expect("]"), isTS ? classfield : functiondef, classBody)
 	    if (value == "*") {
 	      cx.marked = "keyword";
 	      return cont(classBody);
@@ -2684,7 +2635,6 @@ module.exports =
 	  }
 	  function afterImport(type) {
 	    if (type == "string") return cont();
-	    if (type == "(") return pass(expression);
 	    return pass(importSpec, maybeMoreImports, maybeFrom);
 	  }
 	  function importSpec(type, value) {
@@ -2706,12 +2656,6 @@ module.exports =
 	    if (type == "]") return cont();
 	    return pass(commasep(expressionNoComma, "]"));
 	  }
-	  function enumdef() {
-	    return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex)
-	  }
-	  function enummember() {
-	    return pass(pattern, maybeAssign);
-	  }
 	
 	  function isContinuedStatement(state, textAfter) {
 	    return state.lastType == "operator" || state.lastType == "," ||
@@ -2735,7 +2679,7 @@ module.exports =
 	        cc: [],
 	        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
 	        localVars: parserConfig.localVars,
-	        context: parserConfig.localVars && new Context(null, null, false),
+	        context: parserConfig.localVars && {vars: parserConfig.localVars},
 	        indented: basecolumn || 0
 	      };
 	      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
@@ -2776,7 +2720,7 @@ module.exports =
 	        lexical = lexical.prev;
 	      var type = lexical.type, closing = firstChar == type;
 	
-	      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);
+	      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
 	      else if (type == "form" && firstChar == "{") return lexical.indented;
 	      else if (type == "form") return lexical.indented + indentUnit;
 	      else if (type == "stat")
@@ -2825,19 +2769,14 @@ module.exports =
 
 
 /***/ },
-/* 43 */,
-/* 44 */,
-/* 45 */,
-/* 46 */,
-/* 47 */,
-/* 48 */,
-/* 49 */
+/* 28 */,
+/* 29 */
 /***/ function(module, exports) {
 
 	// removed by extract-text-webpack-plugin
 
 /***/ },
-/* 50 */
+/* 30 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(Buffer) {/* cpexcel.js (C) 2013-present SheetJS -- http://sheetjs.com */
@@ -4346,42 +4285,45 @@ module.exports =
 	  return cpt;
 	}));
 	
-	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(29).Buffer))
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(17).Buffer))
 
 /***/ },
-/* 51 */
+/* 31 */
 /***/ function(module, exports) {
 
 	module.exports = require("react-codemirror2");
 
 /***/ },
-/* 52 */
+/* 32 */
 /***/ function(module, exports) {
 
 	/* (ignored) */
 
 /***/ },
-/* 53 */,
-/* 54 */,
-/* 55 */,
-/* 56 */,
-/* 57 */,
-/* 58 */,
-/* 59 */,
-/* 60 */,
-/* 61 */,
-/* 62 */,
-/* 63 */,
-/* 64 */,
-/* 65 */
+/* 33 */,
+/* 34 */,
+/* 35 */,
+/* 36 */,
+/* 37 */,
+/* 38 */,
+/* 39 */,
+/* 40 */,
+/* 41 */,
+/* 42 */,
+/* 43 */,
+/* 44 */,
+/* 45 */,
+/* 46 */,
+/* 47 */,
+/* 48 */
 /***/ function(module, exports) {
 
 	module.exports = require("react-dropzone");
 
 /***/ },
-/* 66 */,
-/* 67 */,
-/* 68 */
+/* 49 */,
+/* 50 */,
+/* 51 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -4396,7 +4338,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _clipboard = __webpack_require__(74);
+	var _clipboard = __webpack_require__(57);
 	
 	var _clipboard2 = _interopRequireDefault(_clipboard);
 	
@@ -4527,7 +4469,7 @@ module.exports =
 	exports.default = AdapterSecret;
 
 /***/ },
-/* 69 */
+/* 52 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -4544,23 +4486,23 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _reactDropzone = __webpack_require__(65);
+	var _reactDropzone = __webpack_require__(48);
 	
 	var _reactDropzone2 = _interopRequireDefault(_reactDropzone);
 	
-	var _papaparse = __webpack_require__(105);
+	var _papaparse = __webpack_require__(76);
 	
 	var _papaparse2 = _interopRequireDefault(_papaparse);
 	
-	var _xlsx = __webpack_require__(104);
+	var _xlsx = __webpack_require__(75);
 	
 	var _xlsx2 = _interopRequireDefault(_xlsx);
 	
-	var _moment = __webpack_require__(26);
+	var _moment = __webpack_require__(11);
 	
 	var _moment2 = _interopRequireDefault(_moment);
 	
-	var _reactBootstrap = __webpack_require__(4);
+	var _reactBootstrap = __webpack_require__(3);
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
@@ -4598,27 +4540,33 @@ module.exports =
 	        console.log('err when trying to parse json = ' + err);
 	      }
 	      if (json) {
-	        var fields = [];
-	        json.forEach(function (row) {
-	          Object.keys(row).forEach(function (col) {
-	            if (!fields.find(function (f) {
-	              return f.label === col;
-	            })) {
-	              fields.push({
-	                label: col,
-	                name: col,
-	                type: row[col] && _typeof(row[col])
-	              });
-	            }
+	        var _ret = function () {
+	          var fields = [];
+	          json.forEach(function (row) {
+	            Object.keys(row).forEach(function (col) {
+	              if (!fields.find(function (f) {
+	                return f.label === col;
+	              })) {
+	                fields.push({
+	                  label: col,
+	                  name: col,
+	                  type: row[col] && _typeof(row[col])
+	                });
+	              }
+	            });
 	          });
-	        });
-	        var meta = {
-	          name: file.name,
-	          type: file.name.substr(0, file.name.lastIndexOf('.')).split(' ').join(''),
-	          byteSize: file.size,
-	          properties: fields
-	        };
-	        return meta;
+	          var meta = {
+	            name: file.name,
+	            type: file.name.substr(0, file.name.lastIndexOf('.')).split(' ').join(''),
+	            byteSize: file.size,
+	            properties: fields
+	          };
+	          return {
+	            v: meta
+	          };
+	        }();
+	
+	        if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
 	      }
 	    };
 	
@@ -4664,78 +4612,82 @@ module.exports =
 	        var extension = file.name.substr(file.name.lastIndexOf('.') + 1, file.name.length);
 	        var blacklisted = extensionBlacklist.includes(extension);
 	        if (!blacklisted) {
-	          var isXLS = extension === 'xlsx' || extension === 'xls';
-	
-	          var reader = new FileReader();
-	          reader.onload = function (e) {
-	
-	            // PARSE METADATA
-	            var data = e.target.result;
-	            var csv = null;
-	            if (isXLS) {
-	              var sheetCounter = 0;
-	              var binary = data;
-	              /*const bytes = new Uint8Array(data)
-	              for (var i = 0; i < length; i++) {
-	                binary += String.fromCharCode(bytes[i]);
-	              }*/
-	              var workbook = _xlsx2.default.read(binary, { type: 'binary' });
-	              var sheetNames = workbook.SheetNames.filter(function (sn) {
-	                return sn !== 'Export Summary';
-	              });
-	              sheetNames.forEach(function (sn) {
-	                csv = _xlsx2.default.utils.sheet_to_csv(workbook.Sheets[sn]);
-	                _this.parseCSV(file, csv).then(function (xlsMeta) {
-	                  meta = meta.concat(Object.assign({}, xlsMeta, {
-	                    sheetName: sn,
-	                    fileType: extension
-	                  }));
-	                  sheetCounter += 1;
+	          (function () {
+	            var isXLS = extension === 'xlsx' || extension === 'xls';
+	
+	            var reader = new FileReader();
+	            reader.onload = function (e) {
+	
+	              // PARSE METADATA
+	              var data = e.target.result;
+	              var csv = null;
+	              if (isXLS) {
+	                (function () {
+	                  var sheetCounter = 0;
+	                  var binary = data;
+	                  /*const bytes = new Uint8Array(data)
+	                  for (var i = 0; i < length; i++) {
+	                    binary += String.fromCharCode(bytes[i]);
+	                  }*/
+	                  var workbook = _xlsx2.default.read(binary, { type: 'binary' });
+	                  var sheetNames = workbook.SheetNames.filter(function (sn) {
+	                    return sn !== 'Export Summary';
+	                  });
+	                  sheetNames.forEach(function (sn) {
+	                    csv = _xlsx2.default.utils.sheet_to_csv(workbook.Sheets[sn]);
+	                    _this.parseCSV(file, csv).then(function (xlsMeta) {
+	                      meta = meta.concat(Object.assign({}, xlsMeta, {
+	                        sheetName: sn,
+	                        fileType: extension
+	                      }));
+	                      sheetCounter += 1;
+	                      counter += 1;
+	                      if (counter >= fs.length && sheetCounter === sheetNames.length) {
+	                        _this.setState({ meta: meta });
+	                        _this.props.onDrop();
+	                      }
+	                    });
+	                  });
+	                })();
+	              } else if (extension === 'csv') {
+	                _this.parseCSV(file, csv).then(function (csvMeta) {
+	                  meta = meta.concat(Object.assign({}, csvMeta, { fileType: extension }));
 	                  counter += 1;
-	                  if (counter >= fs.length && sheetCounter === sheetNames.length) {
+	                  if (counter === fs.length) {
 	                    _this.setState({ meta: meta });
 	                    _this.props.onDrop();
 	                  }
 	                });
-	              });
-	            } else if (extension === 'csv') {
-	              _this.parseCSV(file, csv).then(function (csvMeta) {
-	                meta = meta.concat(Object.assign({}, csvMeta, { fileType: extension }));
-	                counter += 1;
-	                if (counter === fs.length) {
-	                  _this.setState({ meta: meta });
-	                  _this.props.onDrop();
+	              } else if (extension === 'json' || extension === 'jsonl') {
+	                var d = data;
+	                if (extension === 'jsonl') {
+	                  d = _this.parseJsonLines(data);
 	                }
-	              });
-	            } else if (extension === 'json' || extension === 'jsonl') {
-	              var d = data;
-	              if (extension === 'jsonl') {
-	                d = _this.parseJsonLines(data);
-	              }
-	              var fileMeta = _this.parseJsonFile(d, file);
-	              if (fileMeta) {
-	                meta = meta.concat(Object.assign({}, fileMeta, { fileType: extension }));
-	                counter += 1;
-	                if (counter === fs.length) {
-	                  _this.setState({ meta: meta });
-	                  _this.props.onDrop();
+	                var fileMeta = _this.parseJsonFile(d, file);
+	                if (fileMeta) {
+	                  meta = meta.concat(Object.assign({}, fileMeta, { fileType: extension }));
+	                  counter += 1;
+	                  if (counter === fs.length) {
+	                    _this.setState({ meta: meta });
+	                    _this.props.onDrop();
+	                  }
 	                }
 	              }
-	            }
 	
-	            // ADD TO CONTENTS, TO UPLOAD
-	            fileContents = fileContents.concat(file);
-	            contentCounter += 1;
-	            if (contentCounter === fs.length) {
-	              _this.setState({ fileContents: fileContents });
-	            }
-	          }; // end file reader on load callback
+	              // ADD TO CONTENTS, TO UPLOAD
+	              fileContents = fileContents.concat(file);
+	              contentCounter += 1;
+	              if (contentCounter === fs.length) {
+	                _this.setState({ fileContents: fileContents });
+	              }
+	            }; // end file reader on load callback
 	
-	          if (isXLS) {
-	            reader.readAsBinaryString(file); // read as array buffer???
-	          } else {
-	            reader.readAsText(file);
-	          }
+	            if (isXLS) {
+	              reader.readAsBinaryString(file); // read as array buffer???
+	            } else {
+	              reader.readAsText(file);
+	            }
+	          })();
 	        } else {
 	          _this.setState({ dropError: 'File type not accepted.' });
 	          setTimeout(function () {
@@ -5052,7 +5004,7 @@ module.exports =
 	exports.default = FlatFile;
 
 /***/ },
-/* 70 */
+/* 53 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -5067,7 +5019,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	__webpack_require__(49);
+	__webpack_require__(29);
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
@@ -5080,8 +5032,8 @@ module.exports =
 	// SKIP ON SERVER-SIDE RENDERING
 	var codemirror = null;
 	if (typeof window !== 'undefined' && typeof window.navigator !== 'undefined') {
-	  codemirror = __webpack_require__(51);
-	  __webpack_require__(42);
+	  codemirror = __webpack_require__(31);
+	  __webpack_require__(27);
 	}
 	
 	function unCamelize(text) {
@@ -5236,7 +5188,7 @@ module.exports =
 	exports.default = Google;
 
 /***/ },
-/* 71 */
+/* 54 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -5251,23 +5203,23 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	var _flatfile = __webpack_require__(69);
+	var _flatfile = __webpack_require__(52);
 	
 	var _flatfile2 = _interopRequireDefault(_flatfile);
 	
-	var _google = __webpack_require__(70);
+	var _google = __webpack_require__(53);
 	
 	var _google2 = _interopRequireDefault(_google);
 	
-	var _adaptersecret = __webpack_require__(68);
+	var _adaptersecret = __webpack_require__(51);
 	
 	var _adaptersecret2 = _interopRequireDefault(_adaptersecret);
 	
-	var _oauth = __webpack_require__(72);
+	var _oauth = __webpack_require__(55);
 	
 	var _oauth2 = _interopRequireDefault(_oauth);
 	
-	var _sftp = __webpack_require__(73);
+	var _sftp = __webpack_require__(56);
 	
 	var _sftp2 = _interopRequireDefault(_sftp);
 	
@@ -5589,7 +5541,7 @@ module.exports =
 	};
 
 /***/ },
-/* 72 */
+/* 55 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -5868,7 +5820,7 @@ module.exports =
 	exports.default = Oauth;
 
 /***/ },
-/* 73 */
+/* 56 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -5883,7 +5835,7 @@ module.exports =
 	
 	var _react2 = _interopRequireDefault(_react);
 	
-	__webpack_require__(49);
+	__webpack_require__(29);
 	
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 	
@@ -5896,8 +5848,8 @@ module.exports =
 	// SKIP ON SERVER-SIDE RENDERING
 	var codemirror = null;
 	if (typeof window !== 'undefined' && typeof window.navigator !== 'undefined') {
-	  codemirror = __webpack_require__(51);
-	  __webpack_require__(42);
+	  codemirror = __webpack_require__(31);
+	  __webpack_require__(27);
 	}
 	
 	function unCamelize(text) {
@@ -6097,7 +6049,7 @@ module.exports =
 	exports.default = SFTP;
 
 /***/ },
-/* 74 */
+/* 57 */
 /***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
@@ -6278,9 +6230,17 @@ module.exports =
 	});
 
 /***/ },
-/* 75 */,
-/* 76 */,
-/* 77 */
+/* 58 */,
+/* 59 */,
+/* 60 */,
+/* 61 */,
+/* 62 */,
+/* 63 */,
+/* 64 */,
+/* 65 */,
+/* 66 */,
+/* 67 */,
+/* 68 */
 /***/ function(module, exports) {
 
 	'use strict'
@@ -6299,102 +6259,68 @@ module.exports =
 	  revLookup[code.charCodeAt(i)] = i
 	}
 	
-	// Support decoding URL-safe base64 strings, as Node.js does.
-	// See: https://en.wikipedia.org/wiki/Base64#URL_applications
 	revLookup['-'.charCodeAt(0)] = 62
 	revLookup['_'.charCodeAt(0)] = 63
 	
-	function getLens (b64) {
+	function placeHoldersCount (b64) {
 	  var len = b64.length
-	
 	  if (len % 4 > 0) {
 	    throw new Error('Invalid string. Length must be a multiple of 4')
 	  }
 	
-	  // Trim off extra bytes after placeholder bytes are found
-	  // See: https://github.com/beatgammit/base64-js/issues/42
-	  var validLen = b64.indexOf('=')
-	  if (validLen === -1) validLen = len
-	
-	  var placeHoldersLen = validLen === len
-	    ? 0
-	    : 4 - (validLen % 4)
-	
-	  return [validLen, placeHoldersLen]
+	  // the number of equal signs (place holders)
+	  // if there are two placeholders, than the two characters before it
+	  // represent one byte
+	  // if there is only one, then the three characters before it represent 2 bytes
+	  // this is just a cheap hack to not do indexOf twice
+	  return b64[len - 2] === '=' ? 2 : b64[len - 1] === '=' ? 1 : 0
 	}
 	
-	// base64 is 4/3 + up to two characters of the original data
 	function byteLength (b64) {
-	  var lens = getLens(b64)
-	  var validLen = lens[0]
-	  var placeHoldersLen = lens[1]
-	  return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
-	}
-	
-	function _byteLength (b64, validLen, placeHoldersLen) {
-	  return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
+	  // base64 is 4/3 + up to two characters of the original data
+	  return b64.length * 3 / 4 - placeHoldersCount(b64)
 	}
 	
 	function toByteArray (b64) {
-	  var tmp
-	  var lens = getLens(b64)
-	  var validLen = lens[0]
-	  var placeHoldersLen = lens[1]
-	
-	  var arr = new Arr(_byteLength(b64, validLen, placeHoldersLen))
+	  var i, j, l, tmp, placeHolders, arr
+	  var len = b64.length
+	  placeHolders = placeHoldersCount(b64)
 	
-	  var curByte = 0
+	  arr = new Arr(len * 3 / 4 - placeHolders)
 	
 	  // if there are placeholders, only get up to the last complete 4 chars
-	  var len = placeHoldersLen > 0
-	    ? validLen - 4
-	    : validLen
+	  l = placeHolders > 0 ? len - 4 : len
 	
-	  for (var i = 0; i < len; i += 4) {
-	    tmp =
-	      (revLookup[b64.charCodeAt(i)] << 18) |
-	      (revLookup[b64.charCodeAt(i + 1)] << 12) |
-	      (revLookup[b64.charCodeAt(i + 2)] << 6) |
-	      revLookup[b64.charCodeAt(i + 3)]
-	    arr[curByte++] = (tmp >> 16) & 0xFF
-	    arr[curByte++] = (tmp >> 8) & 0xFF
-	    arr[curByte++] = tmp & 0xFF
-	  }
+	  var L = 0
 	
-	  if (placeHoldersLen === 2) {
-	    tmp =
-	      (revLookup[b64.charCodeAt(i)] << 2) |
-	      (revLookup[b64.charCodeAt(i + 1)] >> 4)
-	    arr[curByte++] = tmp & 0xFF
+	  for (i = 0, j = 0; i < l; i += 4, j += 3) {
+	    tmp = (revLookup[b64.charCodeAt(i)] << 18) | (revLookup[b64.charCodeAt(i + 1)] << 12) | (revLookup[b64.charCodeAt(i + 2)] << 6) | revLookup[b64.charCodeAt(i + 3)]
+	    arr[L++] = (tmp >> 16) & 0xFF
+	    arr[L++] = (tmp >> 8) & 0xFF
+	    arr[L++] = tmp & 0xFF
 	  }
 	
-	  if (placeHoldersLen === 1) {
-	    tmp =
-	      (revLookup[b64.charCodeAt(i)] << 10) |
-	      (revLookup[b64.charCodeAt(i + 1)] << 4) |
-	      (revLookup[b64.charCodeAt(i + 2)] >> 2)
-	    arr[curByte++] = (tmp >> 8) & 0xFF
-	    arr[curByte++] = tmp & 0xFF
+	  if (placeHolders === 2) {
+	    tmp = (revLookup[b64.charCodeAt(i)] << 2) | (revLookup[b64.charCodeAt(i + 1)] >> 4)
+	    arr[L++] = tmp & 0xFF
+	  } else if (placeHolders === 1) {
+	    tmp = (revLookup[b64.charCodeAt(i)] << 10) | (revLookup[b64.charCodeAt(i + 1)] << 4) | (revLookup[b64.charCodeAt(i + 2)] >> 2)
+	    arr[L++] = (tmp >> 8) & 0xFF
+	    arr[L++] = tmp & 0xFF
 	  }
 	
 	  return arr
 	}
 	
 	function tripletToBase64 (num) {
-	  return lookup[num >> 18 & 0x3F] +
-	    lookup[num >> 12 & 0x3F] +
-	    lookup[num >> 6 & 0x3F] +
-	    lookup[num & 0x3F]
+	  return lookup[num >> 18 & 0x3F] + lookup[num >> 12 & 0x3F] + lookup[num >> 6 & 0x3F] + lookup[num & 0x3F]
 	}
 	
 	function encodeChunk (uint8, start, end) {
 	  var tmp
 	  var output = []
 	  for (var i = start; i < end; i += 3) {
-	    tmp =
-	      ((uint8[i] << 16) & 0xFF0000) +
-	      ((uint8[i + 1] << 8) & 0xFF00) +
-	      (uint8[i + 2] & 0xFF)
+	    tmp = (uint8[i] << 16) + (uint8[i + 1] << 8) + (uint8[i + 2])
 	    output.push(tripletToBase64(tmp))
 	  }
 	  return output.join('')
@@ -6404,40 +6330,37 @@ module.exports =
 	  var tmp
 	  var len = uint8.length
 	  var extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes
+	  var output = ''
 	  var parts = []
 	  var maxChunkLength = 16383 // must be multiple of 3
 	
 	  // go through the array every three bytes, we'll deal with trailing stuff later
 	  for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
-	    parts.push(encodeChunk(
-	      uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)
-	    ))
+	    parts.push(encodeChunk(uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)))
 	  }
 	
 	  // pad the end with zeros, but make sure to not forget the extra bytes
 	  if (extraBytes === 1) {
 	    tmp = uint8[len - 1]
-	    parts.push(
-	      lookup[tmp >> 2] +
-	      lookup[(tmp << 4) & 0x3F] +
-	      '=='
-	    )
+	    output += lookup[tmp >> 2]
+	    output += lookup[(tmp << 4) & 0x3F]
+	    output += '=='
 	  } else if (extraBytes === 2) {
-	    tmp = (uint8[len - 2] << 8) + uint8[len - 1]
-	    parts.push(
-	      lookup[tmp >> 10] +
-	      lookup[(tmp >> 4) & 0x3F] +
-	      lookup[(tmp << 2) & 0x3F] +
-	      '='
-	    )
+	    tmp = (uint8[len - 2] << 8) + (uint8[len - 1])
+	    output += lookup[tmp >> 10]
+	    output += lookup[(tmp >> 4) & 0x3F]
+	    output += lookup[(tmp << 2) & 0x3F]
+	    output += '='
 	  }
 	
+	  parts.push(output)
+	
 	  return parts.join('')
 	}
 
 
 /***/ },
-/* 78 */
+/* 69 */
 /***/ function(module, exports, __webpack_require__) {
 
 	// CodeMirror, copyright (c) by Marijn Haverbeke and others
@@ -7188,16 +7111,6 @@ module.exports =
 	function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
 	function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
 	
-	function collapsedSpanAround(line, ch) {
-	  var sps = sawCollapsedSpans && line.markedSpans, found;
-	  if (sps) { for (var i = 0; i < sps.length; ++i) {
-	    var sp = sps[i];
-	    if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
-	        (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }
-	  } }
-	  return found
-	}
-	
 	// Test whether there exists a collapsed span that partially
 	// overlaps (covers the start or end, but not both) of a new span.
 	// Such overlap is not allowed.
@@ -9232,11 +9145,12 @@ module.exports =
 	  var lineObj = getLine(doc, lineN);
 	  for (;;) {
 	    var found = coordsCharInner(cm, lineObj, lineN, x, y);
-	    var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0));
-	    if (!collapsed) { return found }
-	    var rangeEnd = collapsed.find(1);
-	    if (rangeEnd.line == lineN) { return rangeEnd }
-	    lineObj = getLine(doc, lineN = rangeEnd.line);
+	    var merged = collapsedSpanAtEnd(lineObj);
+	    var mergedPos = merged && merged.find(0, true);
+	    if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
+	      { lineN = lineNo(lineObj = mergedPos.to.line); }
+	    else
+	      { return found }
 	  }
 	}
 	
@@ -9727,10 +9641,8 @@ module.exports =
 	// Read and store the height of line widgets associated with the
 	// given line.
 	function updateWidgetHeight(line) {
-	  if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i) {
-	    var w = line.widgets[i], parent = w.node.parentNode;
-	    if (parent) { w.height = parent.offsetHeight; }
-	  } }
+	  if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i)
+	    { line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight; } }
 	}
 	
 	// Compute the lines that are visible in a given viewport (defaults
@@ -9996,7 +9908,6 @@ module.exports =
 	  this.cm = cm;
 	  var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
 	  var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-	  vert.tabIndex = horiz.tabIndex = -1;
 	  place(vert); place(horiz);
 	
 	  on(vert, "scroll", function () {
@@ -11248,7 +11159,7 @@ module.exports =
 	
 	  if ((hist.lastOp == opId ||
 	       hist.lastOrigin == change.origin && change.origin &&
-	       ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
+	       ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
 	        change.origin.charAt(0) == "*")) &&
 	      (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
 	    // Merge this change into the last event
@@ -11677,8 +11588,7 @@ module.exports =
 	
 	// Revert a change stored in a document's history.
 	function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-	  var suppress = doc.cm && doc.cm.state.suppressEdits;
-	  if (suppress && !allowSelectionOnly) { return }
+	  if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) { return }
 	
 	  var hist = doc.history, event, selAfter = doc.sel;
 	  var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
@@ -11703,10 +11613,8 @@ module.exports =
 	        return
 	      }
 	      selAfter = event;
-	    } else if (suppress) {
-	      source.push(event);
-	      return
-	    } else { break }
+	    }
+	    else { break }
 	  }
 	
 	  // Build up a reverse change object to add to the opposite history
@@ -11862,7 +11770,7 @@ module.exports =
 	function replaceRange(doc, code, from, to, origin) {
 	  if (!to) { to = from; }
 	  if (cmp(to, from) < 0) { var assign;
-	    (assign = [to, from], from = assign[0], to = assign[1]); }
+	    (assign = [to, from], from = assign[0], to = assign[1], assign); }
 	  if (typeof code == "string") { code = doc.splitLines(code); }
 	  makeChange(doc, {from: from, to: to, text: code, origin: origin});
 	}
@@ -11958,10 +11866,10 @@ module.exports =
 	}
 	
 	LeafChunk.prototype = {
-	  chunkSize: function() { return this.lines.length },
+	  chunkSize: function chunkSize() { return this.lines.length },
 	
 	  // Remove the n lines at offset 'at'.
-	  removeInner: function(at, n) {
+	  removeInner: function removeInner(at, n) {
 	    var this$1 = this;
 	
 	    for (var i = at, e = at + n; i < e; ++i) {
@@ -11974,13 +11882,13 @@ module.exports =
 	  },
 	
 	  // Helper used to collapse a small branch into a single leaf.
-	  collapse: function(lines) {
+	  collapse: function collapse(lines) {
 	    lines.push.apply(lines, this.lines);
 	  },
 	
 	  // Insert the given array of lines at offset 'at', count them as
 	  // having the given height.
-	  insertInner: function(at, lines, height) {
+	  insertInner: function insertInner(at, lines, height) {
 	    var this$1 = this;
 	
 	    this.height += height;
@@ -11989,7 +11897,7 @@ module.exports =
 	  },
 	
 	  // Used to iterate over a part of the tree.
-	  iterN: function(at, n, op) {
+	  iterN: function iterN(at, n, op) {
 	    var this$1 = this;
 	
 	    for (var e = at + n; at < e; ++at)
@@ -12013,9 +11921,9 @@ module.exports =
 	}
 	
 	BranchChunk.prototype = {
-	  chunkSize: function() { return this.size },
+	  chunkSize: function chunkSize() { return this.size },
 	
-	  removeInner: function(at, n) {
+	  removeInner: function removeInner(at, n) {
 	    var this$1 = this;
 	
 	    this.size -= n;
@@ -12041,13 +11949,13 @@ module.exports =
 	    }
 	  },
 	
-	  collapse: function(lines) {
+	  collapse: function collapse(lines) {
 	    var this$1 = this;
 	
 	    for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }
 	  },
 	
-	  insertInner: function(at, lines, height) {
+	  insertInner: function insertInner(at, lines, height) {
 	    var this$1 = this;
 	
 	    this.size += lines.length;
@@ -12076,7 +11984,7 @@ module.exports =
 	  },
 	
 	  // When a node has grown, check whether it should be split.
-	  maybeSpill: function() {
+	  maybeSpill: function maybeSpill() {
 	    if (this.children.length <= 10) { return }
 	    var me = this;
 	    do {
@@ -12098,7 +12006,7 @@ module.exports =
 	    me.parent.maybeSpill();
 	  },
 	
-	  iterN: function(at, n, op) {
+	  iterN: function iterN(at, n, op) {
 	    var this$1 = this;
 	
 	    for (var i = 0; i < this.children.length; ++i) {
@@ -12182,7 +12090,7 @@ module.exports =
 	    }
 	    return true
 	  });
-	  if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); }
+	  signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle));
 	  return widget
 	}
 	
@@ -13040,11 +12948,11 @@ module.exports =
 	}
 	
 	var keyNames = {
-	  3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+	  3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
 	  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
 	  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
 	  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
-	  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", 145: "ScrollLock",
+	  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
 	  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
 	  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
 	  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
@@ -13191,9 +13099,6 @@ module.exports =
 	  if (presto && event.keyCode == 34 && event["char"]) { return false }
 	  var name = keyNames[event.keyCode];
 	  if (name == null || event.altGraphKey) { return false }
-	  // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause,
-	  // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+)
-	  if (event.keyCode == 3 && event.code) { name = event.code; }
 	  return addModifierNames(name, event, noShift)
 	}
 	
@@ -13533,26 +13438,18 @@ module.exports =
 	// for bound mouse clicks.
 	
 	var stopSeq = new Delayed;
-	
 	function dispatchKey(cm, name, e, handle) {
 	  var seq = cm.state.keySeq;
 	  if (seq) {
 	    if (isModifierKey(name)) { return "handled" }
-	    if (/\'$/.test(name))
-	      { cm.state.keySeq = null; }
-	    else
-	      { stopSeq.set(50, function () {
-	        if (cm.state.keySeq == seq) {
-	          cm.state.keySeq = null;
-	          cm.display.input.reset();
-	        }
-	      }); }
-	    if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { return true }
+	    stopSeq.set(50, function () {
+	      if (cm.state.keySeq == seq) {
+	        cm.state.keySeq = null;
+	        cm.display.input.reset();
+	      }
+	    });
+	    name = seq + " " + name;
 	  }
-	  return dispatchKeyInner(cm, name, e, handle)
-	}
-	
-	function dispatchKeyInner(cm, name, e, handle) {
 	  var result = lookupKeyForEditor(cm, name, handle);
 	
 	  if (result == "multi")
@@ -13565,6 +13462,10 @@ module.exports =
 	    restartBlink(cm);
 	  }
 	
+	  if (seq && !result && /\'$/.test(name)) {
+	    e_preventDefault(e);
+	    return true
+	  }
 	  return !!result
 	}
 	
@@ -13776,8 +13677,8 @@ module.exports =
 	  var dragEnd = operation(cm, function (e) {
 	    if (webkit) { display.scroller.draggable = false; }
 	    cm.state.draggingText = false;
-	    off(display.wrapper.ownerDocument, "mouseup", dragEnd);
-	    off(display.wrapper.ownerDocument, "mousemove", mouseMove);
+	    off(document, "mouseup", dragEnd);
+	    off(document, "mousemove", mouseMove);
 	    off(display.scroller, "dragstart", dragStart);
 	    off(display.scroller, "drop", dragEnd);
 	    if (!moved) {
@@ -13786,7 +13687,7 @@ module.exports =
 	        { extendSelection(cm.doc, pos, null, null, behavior.extend); }
 	      // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
 	      if (webkit || ie && ie_version == 9)
-	        { setTimeout(function () {display.wrapper.ownerDocument.body.focus(); display.input.focus();}, 20); }
+	        { setTimeout(function () {document.body.focus(); display.input.focus();}, 20); }
 	      else
 	        { display.input.focus(); }
 	    }
@@ -13801,8 +13702,8 @@ module.exports =
 	  dragEnd.copy = !behavior.moveOnDrag;
 	  // IE's approach to draggable
 	  if (display.scroller.dragDrop) { display.scroller.dragDrop(); }
-	  on(display.wrapper.ownerDocument, "mouseup", dragEnd);
-	  on(display.wrapper.ownerDocument, "mousemove", mouseMove);
+	  on(document, "mouseup", dragEnd);
+	  on(document, "mousemove", mouseMove);
 	  on(display.scroller, "dragstart", dragStart);
 	  on(display.scroller, "drop", dragEnd);
 	
@@ -13934,19 +13835,19 @@ module.exports =
 	    counter = Infinity;
 	    e_preventDefault(e);
 	    display.input.focus();
-	    off(display.wrapper.ownerDocument, "mousemove", move);
-	    off(display.wrapper.ownerDocument, "mouseup", up);
+	    off(document, "mousemove", move);
+	    off(document, "mouseup", up);
 	    doc.history.lastSelOrigin = null;
 	  }
 	
 	  var move = operation(cm, function (e) {
-	    if (e.buttons === 0 || !e_button(e)) { done(e); }
+	    if (!e_button(e)) { done(e); }
 	    else { extend(e); }
 	  });
 	  var up = operation(cm, done);
 	  cm.state.selectingText = up;
-	  on(display.wrapper.ownerDocument, "mousemove", move);
-	  on(display.wrapper.ownerDocument, "mouseup", up);
+	  on(document, "mousemove", move);
+	  on(document, "mouseup", up);
 	}
 	
 	// Used when mouse-selecting to adjust the anchor to the proper side
@@ -14076,7 +13977,6 @@ module.exports =
 	    clearCaches(cm);
 	    regChange(cm);
 	  }, true);
-	
 	  option("lineSeparator", null, function (cm, val) {
 	    cm.doc.lineSep = val;
 	    if (!val) { return }
@@ -14483,7 +14383,7 @@ module.exports =
 	
 	  var paste = cm.state.pasteIncoming || origin == "paste";
 	  var textLines = splitLinesAuto(inserted), multiPaste = null;
-	  // When pasting N lines into N selections, insert one line per selection
+	  // When pasing N lines into N selections, insert one line per selection
 	  if (paste && sel.ranges.length > 1) {
 	    if (lastCopied && lastCopied.text.join("\n") == inserted) {
 	      if (sel.ranges.length % lastCopied.text.length == 0) {
@@ -15219,12 +15119,8 @@ module.exports =
 	  this.showMultipleSelections(info);
 	};
 	
-	ContentEditableInput.prototype.getSelection = function () {
-	  return this.cm.display.wrapper.ownerDocument.getSelection()
-	};
-	
 	ContentEditableInput.prototype.showPrimarySelection = function () {
-	  var sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
+	  var sel = window.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
 	  var from = prim.from(), to = prim.to();
 	
 	  if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
@@ -15291,13 +15187,13 @@ module.exports =
 	};
 	
 	ContentEditableInput.prototype.rememberSelection = function () {
-	  var sel = this.getSelection();
+	  var sel = window.getSelection();
 	  this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
 	  this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
 	};
 	
 	ContentEditableInput.prototype.selectionInEditor = function () {
-	  var sel = this.getSelection();
+	  var sel = window.getSelection();
 	  if (!sel.rangeCount) { return false }
 	  var node = sel.getRangeAt(0).commonAncestorContainer;
 	  return contains(this.div, node)
@@ -15332,14 +15228,14 @@ module.exports =
 	};
 	
 	ContentEditableInput.prototype.selectionChanged = function () {
-	  var sel = this.getSelection();
+	  var sel = window.getSelection();
 	  return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
 	    sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
 	};
 	
 	ContentEditableInput.prototype.pollSelection = function () {
 	  if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { return }
-	  var sel = this.getSelection(), cm = this.cm;
+	  var sel = window.getSelection(), cm = this.cm;
 	  // On Android Chrome (version 56, at least), backspacing into an
 	  // uneditable block element will put the cursor in that element,
 	  // and then, because it's not editable, hide the virtual keyboard.
@@ -15473,7 +15369,7 @@ module.exports =
 	};
 	
 	ContentEditableInput.prototype.onKeyPress = function (e) {
-	  if (e.charCode == 0 || this.composing) { return }
+	  if (e.charCode == 0) { return }
 	  e.preventDefault();
 	  if (!this.cm.isReadOnly())
 	    { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); }
@@ -15513,13 +15409,12 @@ module.exports =
 	function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
 	
 	function domTextBetween(cm, from, to, fromLine, toLine) {
-	  var text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false;
+	  var text = "", closing = false, lineSep = cm.doc.lineSeparator();
 	  function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
 	  function close() {
 	    if (closing) {
 	      text += lineSep;
-	      if (extraLinebreak) { text += lineSep; }
-	      closing = extraLinebreak = false;
+	      closing = false;
 	    }
 	  }
 	  function addText(str) {
@@ -15531,8 +15426,8 @@ module.exports =
 	  function walk(node) {
 	    if (node.nodeType == 1) {
 	      var cmText = node.getAttribute("cm-text");
-	      if (cmText) {
-	        addText(cmText);
+	      if (cmText != null) {
+	        addText(cmText || node.textContent.replace(/\u200b/g, ""));
 	        return
 	      }
 	      var markerID = node.getAttribute("cm-marker"), range$$1;
@@ -15543,24 +15438,19 @@ module.exports =
 	        return
 	      }
 	      if (node.getAttribute("contenteditable") == "false") { return }
-	      var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName);
-	      if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { return }
-	
+	      var isBlock = /^(pre|div|p)$/i.test(node.nodeName);
 	      if (isBlock) { close(); }
 	      for (var i = 0; i < node.childNodes.length; i++)
 	        { walk(node.childNodes[i]); }
-	
-	      if (/^(pre|p)$/i.test(node.nodeName)) { extraLinebreak = true; }
 	      if (isBlock) { closing = true; }
 	    } else if (node.nodeType == 3) {
-	      addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "));
+	      addText(node.nodeValue);
 	    }
 	  }
 	  for (;;) {
 	    walk(from);
 	    if (from == to) { break }
 	    from = from.nextSibling;
-	    extraLinebreak = false;
 	  }
 	  return text
 	}
@@ -15661,10 +15551,13 @@ module.exports =
 	    var this$1 = this;
 	
 	  var input = this, cm = this.cm;
-	  this.createField(display);
-	  var te = this.textarea;
 	
-	  display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild);
+	  // Wraps and hides input textarea
+	  var div = this.wrapper = hiddenTextarea();
+	  // The semihidden textarea that is focused when the editor is
+	  // focused, and receives input.
+	  var te = this.textarea = div.firstChild;
+	  display.wrapper.insertBefore(div, display.wrapper.firstChild);
 	
 	  // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
 	  if (ios) { te.style.width = "0px"; }
@@ -15731,14 +15624,6 @@ module.exports =
 	  });
 	};
 	
-	TextareaInput.prototype.createField = function (_display) {
-	  // Wraps and hides input textarea
-	  this.wrapper = hiddenTextarea();
-	  // The semihidden textarea that is focused when the editor is
-	  // focused, and receives input.
-	  this.textarea = this.wrapper.firstChild;
-	};
-	
 	TextareaInput.prototype.prepareSelection = function () {
 	  // Redraw the selection and/or cursor
 	  var cm = this.cm, display = cm.display, doc = cm.doc;
@@ -16132,7 +16017,7 @@ module.exports =
 	
 	addLegacyProps(CodeMirror$1);
 	
-	CodeMirror$1.version = "5.38.0";
+	CodeMirror$1.version = "5.31.0";
 	
 	return CodeMirror$1;
 	
@@ -16140,30 +16025,12 @@ module.exports =
 
 
 /***/ },
-/* 79 */,
-/* 80 */,
-/* 81 */,
-/* 82 */,
-/* 83 */,
-/* 84 */,
-/* 85 */,
-/* 86 */,
-/* 87 */,
-/* 88 */,
-/* 89 */,
-/* 90 */,
-/* 91 */,
-/* 92 */,
-/* 93 */,
-/* 94 */,
-/* 95 */,
-/* 96 */,
-/* 97 */
+/* 70 */
 /***/ function(module, exports) {
 
 	exports.read = function (buffer, offset, isLE, mLen, nBytes) {
 	  var e, m
-	  var eLen = (nBytes * 8) - mLen - 1
+	  var eLen = nBytes * 8 - mLen - 1
 	  var eMax = (1 << eLen) - 1
 	  var eBias = eMax >> 1
 	  var nBits = -7
@@ -16176,12 +16043,12 @@ module.exports =
 	  e = s & ((1 << (-nBits)) - 1)
 	  s >>= (-nBits)
 	  nBits += eLen
-	  for (; nBits > 0; e = (e * 256) + buffer[offset + i], i += d, nBits -= 8) {}
+	  for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}
 	
 	  m = e & ((1 << (-nBits)) - 1)
 	  e >>= (-nBits)
 	  nBits += mLen
-	  for (; nBits > 0; m = (m * 256) + buffer[offset + i], i += d, nBits -= 8) {}
+	  for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}
 	
 	  if (e === 0) {
 	    e = 1 - eBias
@@ -16196,7 +16063,7 @@ module.exports =
 	
 	exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
 	  var e, m, c
-	  var eLen = (nBytes * 8) - mLen - 1
+	  var eLen = nBytes * 8 - mLen - 1
 	  var eMax = (1 << eLen) - 1
 	  var eBias = eMax >> 1
 	  var rt = (mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0)
@@ -16229,7 +16096,7 @@ module.exports =
 	      m = 0
 	      e = eMax
 	    } else if (e + eBias >= 1) {
-	      m = ((value * c) - 1) * Math.pow(2, mLen)
+	      m = (value * c - 1) * Math.pow(2, mLen)
 	      e = e + eBias
 	    } else {
 	      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen)
@@ -16248,7 +16115,7 @@ module.exports =
 
 
 /***/ },
-/* 98 */
+/* 71 */
 /***/ function(module, exports) {
 
 	var toString = {}.toString;
@@ -16259,7 +16126,7 @@ module.exports =
 
 
 /***/ },
-/* 99 */
+/* 72 */
 /***/ function(module, exports) {
 
 	// shim for using process in browser
@@ -16432,10 +16299,6 @@ module.exports =
 	process.removeListener = noop;
 	process.removeAllListeners = noop;
 	process.emit = noop;
-	process.prependListener = noop;
-	process.prependOnceListener = noop;
-	
-	process.listeners = function (name) { return [] }
 	
 	process.binding = function (name) {
 	    throw new Error('process.binding is not supported');
@@ -16449,9 +16312,7 @@ module.exports =
 
 
 /***/ },
-/* 100 */,
-/* 101 */,
-/* 102 */
+/* 73 */
 /***/ function(module, exports) {
 
 	/* WEBPACK VAR INJECTION */(function(__webpack_amd_options__) {module.exports = __webpack_amd_options__;
@@ -16459,7 +16320,7 @@ module.exports =
 	/* WEBPACK VAR INJECTION */}.call(exports, {}))
 
 /***/ },
-/* 103 */
+/* 74 */
 /***/ function(module, exports, __webpack_require__) {
 
 	var require;var require;var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(Buffer, global) {/*
@@ -16478,7 +16339,7 @@ module.exports =
 	*/
 	(function(e){
 		if("object"==typeof exports&&"undefined"!=typeof module&&"undefined"==typeof DO_NOT_EXPORT_JSZIP)module.exports=e();
-		else if("function"=="function"&&__webpack_require__(102)&&"undefined"==typeof DO_NOT_EXPORT_JSZIP){JSZipSync=e();!(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (e), __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));}
+		else if("function"=="function"&&__webpack_require__(73)&&"undefined"==typeof DO_NOT_EXPORT_JSZIP){JSZipSync=e();!(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (e), __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));}
 		else{
 			var f;
 			"undefined"!=typeof window?f=window:
@@ -25462,10 +25323,10 @@ module.exports =
 	(9)
 	}));
 	
-	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(29).Buffer, (function() { return this; }())))
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(17).Buffer, (function() { return this; }())))
 
 /***/ },
-/* 104 */
+/* 75 */
 /***/ function(module, exports, __webpack_require__) {
 
 	/* WEBPACK VAR INJECTION */(function(global, Buffer, process) {/*! xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
@@ -25474,13 +25335,13 @@ module.exports =
 	/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
 	var XLSX = {};
 	function make_xlsx_lib(XLSX){
-	XLSX.version = '0.13.5';
+	XLSX.version = '0.13.4';
 	var current_codepage = 1200, current_ansi = 1252;
 	/*global cptable:true, window */
 	if(true) {
 		if(typeof cptable === 'undefined') {
-			if(typeof global !== 'undefined') global.cptable = __webpack_require__(50);
-			else if(typeof window !== 'undefined') window.cptable = __webpack_require__(50);
+			if(typeof global !== 'undefined') global.cptable = __webpack_require__(30);
+			else if(typeof window !== 'undefined') window.cptable = __webpack_require__(30);
 		}
 	}
 	
@@ -26629,7 +26490,7 @@ module.exports =
 		return (c === -1) ? p : p.slice(c+1);
 	}
 	var fs;
-	function get_fs() { return fs || (fs = __webpack_require__(52)); }
+	function get_fs() { return fs || (fs = __webpack_require__(32)); }
 	function parse(file, options) {
 	if(file.length < 512) throw new Error("CFB file size " + file.length + " < 512");
 	var mver = 3;
@@ -27317,7 +27178,7 @@ module.exports =
 	
 	if("function" !== 'undefined' && typeof module !== 'undefined' && typeof DO_NOT_EXPORT_CFB === 'undefined') { module.exports = CFB; }
 	var _fs;
-	if(true) try { _fs = __webpack_require__(52); } catch(e) {}
+	if(true) try { _fs = __webpack_require__(32); } catch(e) {}
 	
 	/* normalize data for blob ctor */
 	function blobify(data) {
@@ -27578,7 +27439,7 @@ module.exports =
 	if(typeof JSZipSync !== 'undefined') jszip = JSZipSync;
 	if(true) {
 		if(typeof module !== 'undefined' && module.exports) {
-			if(typeof jszip === 'undefined') jszip = __webpack_require__(103);
+			if(typeof jszip === 'undefined') jszip = __webpack_require__(74);
 		}
 	}
 	
@@ -27661,7 +27522,7 @@ module.exports =
 	var htmlcharegex = /[\u0000-\u001f]/g;
 	function escapehtml(text){
 		var s = text + '';
-		return s.replace(decregex, function(y) { return rencoding[y]; }).replace(/\n/g, "<br/>").replace(htmlcharegex,function(s) { return "&#x" + ("000"+s.charCodeAt(0).toString(16)).slice(-4) + ";"; });
+		return s.replace(decregex, function(y) { return rencoding[y]; }).replace(htmlcharegex,function(s) { return "&#x" + ("000"+s.charCodeAt(0).toString(16)).slice(-4) + ";"; });
 	}
 	
 	function escapexlml(text){
@@ -28199,7 +28060,7 @@ module.exports =
 		var crypto;
 		if(typeof _crypto !== 'undefined') crypto = _crypto;
 		else if(true) {
-			try { crypto = __webpack_require__(106); }
+			try { crypto = __webpack_require__(77); }
 			catch(e) { crypto = null; }
 		}
 	
@@ -39339,13 +39200,13 @@ module.exports =
 				/* 18.2.5    definedName CT_DefinedName + */
 				case '<definedName': {
 					dname = {};
-					dname.Name = utf8read(y.name);
+					dname.Name = y.name;
 					if(y.comment) dname.Comment = y.comment;
 					if(y.localSheetId) dname.Sheet = +y.localSheetId;
 					dnstart = idx + x.length;
 				}	break;
 				case '</definedName>': {
-					dname.Ref = unescapexml(utf8read(data.slice(dnstart, idx)));
+					dname.Ref = data.slice(dnstart, idx);
 					wb.Names.push(dname);
 				} break;
 				case '<definedName/>': break;
@@ -40746,7 +40607,7 @@ module.exports =
 		if(!((wb||{}).Workbook||{}).Names) return "";
 	var names = wb.Workbook.Names;
 		var out = [];
-		for(var i = 0; i < names.length; ++i) {
+		outer: for(var i = 0; i < names.length; ++i) {
 			var n = names[i];
 			if(n.Sheet != idx) continue;
 			/*switch(n.Name) {
@@ -43614,6 +43475,7 @@ module.exports =
 		function make_html_row(ws, r, R, o) {
 			var M = (ws['!merges'] ||[]);
 			var oo = [];
+			var nullcell = "<td>" + (o.editable ? '<span contenteditable="true"></span>' : "" ) + "</td>";
 			for(var C = r.s.c; C <= r.e.c; ++C) {
 				var RS = 0, CS = 0;
 				for(var j = 0; j < M.length; ++j) {
@@ -43625,12 +43487,13 @@ module.exports =
 				if(RS < 0) continue;
 				var coord = encode_cell({r:R,c:C});
 				var cell = o.dense ? (ws[R]||[])[C] : ws[coord];
+				if(!cell || cell.v == null) { oo.push(nullcell); continue; }
+				/* TODO: html entities */
+				var w = cell.h || escapexml(cell.w || (format_cell(cell), cell.w) || "");
 				var sp = {};
 				if(RS > 1) sp.rowspan = RS;
 				if(CS > 1) sp.colspan = CS;
-				/* TODO: html entities */
-				var w = (cell && cell.v != null) && (cell.h || escapehtml(cell.w || (format_cell(cell), cell.w) || "")) || "";
-				sp.t = cell && cell.t || 'z';
+				sp.t = cell.t;
 				if(o.editable) w = '<span contenteditable="true">' + w + '</span>';
 				sp.id = "sjs-" + coord;
 				oo.push(writextag('td', w, sp));
@@ -43816,7 +43679,7 @@ module.exports =
 						}
 						if(merges.length) ws['!merges'] = merges;
 						if(rowinfo.length) ws["!rows"] = rowinfo;
-						sheetag.name = sheetag['名称'] || sheetag.name;
+						sheetag.name = utf8read(sheetag['名称'] || sheetag.name);
 						if(typeof JSON !== 'undefined') JSON.stringify(sheetag);
 						SheetNames.push(sheetag.name);
 						Sheets[sheetag.name] = ws;
@@ -45570,7 +45433,7 @@ module.exports =
 	})(utils);
 	
 	if(has_buf && "function" != 'undefined') (function() {
-		var Readable = __webpack_require__(107).Readable;
+		var Readable = __webpack_require__(78).Readable;
 	
 		var write_csv_stream = function(sheet, opts) {
 			var stream = Readable();
@@ -45715,18 +45578,18 @@ module.exports =
 	/*exported XLS, ODS */
 	var XLS = XLSX, ODS = XLSX;
 	
-	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }()), __webpack_require__(29).Buffer, __webpack_require__(99)))
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }()), __webpack_require__(17).Buffer, __webpack_require__(72)))
 
 /***/ },
-/* 105 */
+/* 76 */
 /***/ function(module, exports) {
 
 	module.exports = require("papaparse");
 
 /***/ },
-/* 106 */
-52,
-/* 107 */
-52
+/* 77 */
+32,
+/* 78 */
+32
 /******/ ])));
 //# sourceMappingURL=credentialSections.js.map