From 3b079cde924ea0b8d473901885602cc39cafac7c Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 28 Mar 2014 16:04:44 +0000 Subject: [PATCH 1/3] Change CLSI proxy errors to warnings --- .../web/app/coffee/Features/Compile/CompileController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee index 69ffd4d48d..3641398d18 100644 --- a/services/web/app/coffee/Features/Compile/CompileController.coffee +++ b/services/web/app/coffee/Features/Compile/CompileController.coffee @@ -42,5 +42,5 @@ module.exports = CompileController = proxy = request(url: url, method: req.method, timeout: oneMinute) proxy.pipe(res) proxy.on "error", (error) -> - logger.error err: error, url: url, "CLSI proxy error" + logger.warn err: error, url: url, "CLSI proxy error" From 2ca70f25f6cb02080b80a36e1d4fc30bb19c47fa Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 31 Mar 2014 09:47:36 +0100 Subject: [PATCH 2/3] Make track changes default with override for old history --- .../web/app/coffee/controllers/ProjectController.coffee | 2 +- services/web/app/coffee/models/User.coffee | 2 +- services/web/public/coffee/ide.coffee | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/web/app/coffee/controllers/ProjectController.coffee b/services/web/app/coffee/controllers/ProjectController.coffee index 1c4b9a3349..466c9a0062 100755 --- a/services/web/app/coffee/controllers/ProjectController.coffee +++ b/services/web/app/coffee/controllers/ProjectController.coffee @@ -154,7 +154,7 @@ module.exports = class ProjectController spellCheckLanguage: user.ace.spellCheckLanguage pdfViewer : user.ace.pdfViewer docPositions: {} - trackChanges: user.featureSwitches.trackChanges + oldHistory: !!user.featureSwitches?.oldHistory }) sharelatexObject : JSON.stringify({ siteUrl: Settings.siteUrl, diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee index e71182ec2b..3a3ecdc8e3 100644 --- a/services/web/app/coffee/models/User.coffee +++ b/services/web/app/coffee/models/User.coffee @@ -32,7 +32,7 @@ UserSchema = new Schema } featureSwitches : { dropbox: {type:Boolean, default:true}, - trackChanges: {type:Boolean, default:false} + oldHistory: {type:Boolean} } referal_id : {type:String, default:() -> uuid.v4().split("-")[0]} refered_users: [ type:ObjectId, ref:'User' ] diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 97dde879b5..765ecb5f5e 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -119,10 +119,10 @@ define [ @cursorManager = new CursorManager(@) @fileViewManager = new FileViewManager(@) @analyticsManager = new AnalyticsManager(@) - if @userSettings.trackChanges - @trackChangesManager = new TrackChangesManager(@) - else + if @userSettings.oldHistory @historyManager = new HistoryManager(@) + else + @trackChangesManager = new TrackChangesManager(@) @setLoadingMessage("Connecting") firstConnect = true From 095f9502582c6682e7d1ced1373c5221fa0e0d6d Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 31 Mar 2014 10:22:18 +0100 Subject: [PATCH 3/3] Don't choke when passed null doc to openDoc --- services/web/public/coffee/file-tree/FileTreeManager.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/file-tree/FileTreeManager.coffee b/services/web/public/coffee/file-tree/FileTreeManager.coffee index cee77eaead..13bd45403e 100644 --- a/services/web/public/coffee/file-tree/FileTreeManager.coffee +++ b/services/web/public/coffee/file-tree/FileTreeManager.coffee @@ -75,6 +75,7 @@ define [ children.add(entity) openDoc: (doc, line) -> + return if !doc? doc_id = doc.id or doc @trigger "open:doc", doc_id, line: line @selectEntity(doc_id)