فهرست منبع

Merge pull request #2311 from overleaf/fix-err-error-checks

Fix two err/error confusion issues

GitOrigin-RevId: 3dfdeffa5a8d13d64dca3f70533a87c70a06d49b
Timothée Alby 6 سال پیش
والد
کامیت
56566106c2

+ 3 - 5
services/web/app/src/Features/Chat/ChatController.js

@@ -113,13 +113,11 @@ module.exports = ChatController = {
       const _ = user_ids[user_id]
       ;(user_id =>
         jobs.push(cb =>
-          UserInfoManager.getPersonalInfo(user_id, function(err, user) {
-            if (typeof error !== 'undefined' && error !== null) {
-              return cb(error)
-            }
+          UserInfoManager.getPersonalInfo(user_id, function(error, user) {
+            if (error != null) return cb(error)
             user = UserInfoController.formatPersonalInfo(user)
             users[user_id] = user
-            return cb()
+            cb()
           })
         ))(user_id)
     }

+ 3 - 5
services/web/app/src/Features/History/HistoryController.js

@@ -184,11 +184,9 @@ module.exports = HistoryController = {
       project_id,
       doc_id,
       name,
-      (err, doc) => {
-        if (typeof error !== 'undefined' && error !== null) {
-          return next(error)
-        }
-        return res.json({
+      (error, doc) => {
+        if (error != null) return next(error)
+        res.json({
           doc_id: doc._id
         })
       }