From 6701de796e9c19fb6ef80b0c376d1f26a9f2de74 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 14 Mar 2014 10:20:00 +0000 Subject: [PATCH] Resize diff view on editor view port change --- services/web/public/coffee/editor/Editor.coffee | 2 +- services/web/public/coffee/track-changes/DiffView.coffee | 3 +++ .../web/public/coffee/track-changes/TrackChangesManager.coffee | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/editor/Editor.coffee b/services/web/public/coffee/editor/Editor.coffee index d4313fe6eb..c7eb19d9d8 100644 --- a/services/web/public/coffee/editor/Editor.coffee +++ b/services/web/public/coffee/editor/Editor.coffee @@ -121,7 +121,7 @@ define [ @aceEditor = aceEditor = AceEditor.edit("editor") @on "resize", => @aceEditor.resize() - @ide.layoutManager.on "resize", => @aceEditor.resize() + @ide.layoutManager.on "resize", => @trigger "resize" mode = window.userSettings.mode theme = window.userSettings.theme diff --git a/services/web/public/coffee/track-changes/DiffView.coffee b/services/web/public/coffee/track-changes/DiffView.coffee index 6bb083986f..7fc95e77ba 100644 --- a/services/web/public/coffee/track-changes/DiffView.coffee +++ b/services/web/public/coffee/track-changes/DiffView.coffee @@ -201,5 +201,8 @@ define [ else @$changesAfter.hide() + resize: () -> + @aceEditor.resize() + return DiffView diff --git a/services/web/public/coffee/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/track-changes/TrackChangesManager.coffee index 4e35ebe45f..24079e6832 100644 --- a/services/web/public/coffee/track-changes/TrackChangesManager.coffee +++ b/services/web/public/coffee/track-changes/TrackChangesManager.coffee @@ -19,6 +19,9 @@ define [ @ide.editor.on "change:doc", () => @hideEl() + @ide.editor.on "resize", () => + @diffView?.resize() + @$el.find(".track-changes-close").on "click", (e) => e.preventDefault @hide()