Merge branch 'develop' into feature/support-vega-lite

# Conflicts:
#	package.json
#	public/views/slide.ejs

Author: jackycute

app.js

@@ -28,8 +28,8 @@ var csp = require('./lib/csp')
 function createHttpServer () {
   if (config.useSSL) {
     const ca = (function () {
-      let i, len, results
-      results = []
+      let i, len
+      const results = []
       for (i = 0, len = config.sslCAPath.length; i < len; i++) {
         results.push(fs.readFileSync(config.sslCAPath[i], 'utf8'))
       }
@@ -55,7 +55,7 @@ var server = createHttpServer()
 
 // logger
 app.use(morgan('combined', {
-  'stream': logger.stream
+  stream: logger.stream
 }))
 
 // socket io

lib/config/index.js

@@ -53,14 +53,14 @@ if (['debug', 'verbose', 'info', 'warn', 'error'].includes(config.loglevel)) {
 
 // load LDAP CA
 if (config.ldap.tlsca) {
-  let ca = config.ldap.tlsca.split(',')
-  let caContent = []
-  for (let i of ca) {
-    if (fs.existsSync(i)) {
-      caContent.push(fs.readFileSync(i, 'utf8'))
+  const certificateAuthorities = config.ldap.tlsca.split(',')
+  const caContent = []
+  for (const ca of certificateAuthorities) {
+    if (fs.existsSync(ca)) {
+      caContent.push(fs.readFileSync(ca, 'utf8'))
     }
   }
-  let tlsOptions = {
+  const tlsOptions = {
     ca: caContent
   }
   config.ldap.tlsOptions = config.ldap.tlsOptions ? Object.assign(config.ldap.tlsOptions, tlsOptions) : tlsOptions
@@ -134,10 +134,10 @@ config.isGitlabSnippetsEnable = (!config.gitlab.scope || config.gitlab.scope ===
 config.updateI18nFiles = (env === Environment.development)
 
 // merge legacy values
-let keys = Object.keys(config)
+const keys = Object.keys(config)
 const uppercase = /[A-Z]/
 for (let i = keys.length; i--;) {
-  let lowercaseKey = keys[i].toLowerCase()
+  const lowercaseKey = keys[i].toLowerCase()
   // if the config contains uppercase letters
   // and a lowercase version of this setting exists
   // and the config with uppercase is not set

lib/history.js

@@ -9,14 +9,6 @@ var logger = require('./logger')
 var response = require('./response')
 var models = require('./models')
 
-// public
-var History = {
-  historyGet: historyGet,
-  historyPost: historyPost,
-  historyDelete: historyDelete,
-  updateHistory: updateHistory
-}
-
 function getHistory (userid, callback) {
   models.User.findOne({
     where: {
@@ -41,7 +33,7 @@ function getHistory (userid, callback) {
           continue
         }
         try {
-          let id = LZString.decompressFromBase64(history[i].id)
+          const id = LZString.decompressFromBase64(history[i].id)
           if (id && models.Note.checkNoteIdValid(id)) {
             history[i].id = models.Note.encodeNoteId(id)
           }
@@ -200,4 +192,8 @@ function historyDelete (req, res) {
   }
 }
 
-module.exports = History
+// public
+exports.historyGet = historyGet
+exports.historyPost = historyPost
+exports.historyDelete = historyDelete
+exports.updateHistory = updateHistory

lib/letter-avatars.js

@@ -32,9 +32,9 @@ exports.generateAvatarURL = function (name, email = '', big = true) {
   }
   name = encodeURIComponent(name)
 
-  let hash = crypto.createHash('md5')
+  const hash = crypto.createHash('md5')
   hash.update(email.toLowerCase())
-  let hexDigest = hash.digest('hex')
+  const hexDigest = hash.digest('hex')
 
   if (email !== '' && config.allowGravatar) {
     photo = 'https://www.gravatar.com/avatar/' + hexDigest

lib/models/note.js

@@ -165,15 +165,15 @@ module.exports = function (sequelize, DataTypes) {
   }
   Note.encodeNoteId = function (id) {
     // remove dashes in UUID and encode in url-safe base64
-    let str = id.replace(/-/g, '')
-    let hexStr = Buffer.from(str, 'hex')
+    const str = id.replace(/-/g, '')
+    const hexStr = Buffer.from(str, 'hex')
     return base64url.encode(hexStr)
   }
   Note.decodeNoteId = function (encodedId) {
     // decode from url-safe base64
-    let id = base64url.toBuffer(encodedId).toString('hex')
+    const id = base64url.toBuffer(encodedId).toString('hex')
     // add dashes between the UUID string parts
-    let idParts = []
+    const idParts = []
     idParts.push(id.substr(0, 8))
     idParts.push(id.substr(8, 4))
     idParts.push(id.substr(12, 4))
@@ -196,7 +196,7 @@ module.exports = function (sequelize, DataTypes) {
           }
         }).then(function (note) {
           if (note) {
-            let filePath = path.join(config.docsPath, noteId + '.md')
+            const filePath = path.join(config.docsPath, noteId + '.md')
             if (Note.checkFileExist(filePath)) {
               // if doc in filesystem have newer modified time than last change time
               // then will update the doc in db
@@ -421,20 +421,20 @@ module.exports = function (sequelize, DataTypes) {
       if (ot.TextOperation.isRetain(op)) {
         index += op
       } else if (ot.TextOperation.isInsert(op)) {
-        let opStart = index
-        let opEnd = index + op.length
-        var inserted = false
+        const opStart = index
+        const opEnd = index + op.length
+        let inserted = false
         // authorship format: [userId, startPos, endPos, createdAt, updatedAt]
         if (authorships.length <= 0) authorships.push([userId, opStart, opEnd, timestamp, timestamp])
         else {
           for (let j = 0; j < authorships.length; j++) {
-            let authorship = authorships[j]
+            const authorship = authorships[j]
             if (!inserted) {
-              let nextAuthorship = authorships[j + 1] || -1
+              const nextAuthorship = authorships[j + 1] || -1
               if ((nextAuthorship !== -1 && nextAuthorship[1] >= opEnd) || j >= authorships.length - 1) {
                 if (authorship[1] < opStart && authorship[2] > opStart) {
                   // divide
-                  let postLength = authorship[2] - opStart
+                  const postLength = authorship[2] - opStart
                   authorship[2] = opStart
                   authorship[4] = timestamp
                   authorships.splice(j + 1, 0, [userId, opStart, opEnd, timestamp, timestamp])
@@ -460,13 +460,13 @@ module.exports = function (sequelize, DataTypes) {
         }
         index += op.length
       } else if (ot.TextOperation.isDelete(op)) {
-        let opStart = index
-        let opEnd = index - op
+        const opStart = index
+        const opEnd = index - op
         if (operation.length === 1) {
           authorships = []
         } else if (authorships.length > 0) {
           for (let j = 0; j < authorships.length; j++) {
-            let authorship = authorships[j]
+            const authorship = authorships[j]
             if (authorship[1] >= opStart && authorship[1] <= opEnd && authorship[2] >= opStart && authorship[2] <= opEnd) {
               authorships.splice(j, 1)
               j -= 1
@@ -491,12 +491,12 @@ module.exports = function (sequelize, DataTypes) {
     }
     // merge
     for (let j = 0; j < authorships.length; j++) {
-      let authorship = authorships[j]
+      const authorship = authorships[j]
       for (let k = j + 1; k < authorships.length; k++) {
-        let nextAuthorship = authorships[k]
+        const nextAuthorship = authorships[k]
         if (nextAuthorship && authorship[0] === nextAuthorship[0] && authorship[2] === nextAuthorship[1]) {
-          let minTimestamp = Math.min(authorship[3], nextAuthorship[3])
-          let maxTimestamp = Math.max(authorship[3], nextAuthorship[3])
+          const minTimestamp = Math.min(authorship[3], nextAuthorship[3])
+          const maxTimestamp = Math.max(authorship[3], nextAuthorship[3])
           authorships.splice(j, 1, [authorship[0], authorship[1], nextAuthorship[2], minTimestamp, maxTimestamp])
           authorships.splice(k, 1)
           j -= 1
@@ -506,7 +506,7 @@ module.exports = function (sequelize, DataTypes) {
     }
     // clear
     for (let j = 0; j < authorships.length; j++) {
-      let authorship = authorships[j]
+      const authorship = authorships[j]
       if (!authorship[0]) {
         authorships.splice(j, 1)
         j -= 1
@@ -537,11 +537,11 @@ module.exports = function (sequelize, DataTypes) {
       var lengthBias = 0
       for (let j = 0; j < patch.length; j++) {
         var operation = []
-        let p = patch[j]
+        const p = patch[j]
         var currIndex = p.start1
         var currLength = contentLength - bias
         for (let i = 0; i < p.diffs.length; i++) {
-          let diff = p.diffs[i]
+          const diff = p.diffs[i]
           switch (diff[0]) {
             case 0: // retain
               if (i === 0) {

lib/realtime.js

@@ -744,8 +744,8 @@ function queueForConnect (socket) {
           })
           return socket.disconnect(true)
         }
-        let note = notes[noteId]
-        let user = users[socket.id]
+        const note = notes[noteId]
+        const user = users[socket.id]
         // update user color to author color
         if (note.authors[user.userid]) {
           user.color = users[socket.id].color = note.authors[user.userid].color
@@ -766,7 +766,7 @@ function queueForConnect (socket) {
         socketClient.registerEventHandler()
 
         if (config.debug) {
-          let noteId = socket.noteId
+          const noteId = socket.noteId
           logger.info('SERVER connected a client to [' + noteId + ']:')
           logger.info(JSON.stringify(user))
           // logger.info(notes);