From d447ebe304d493ebb719f87dd00595c5adb9848b Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 14 Nov 2016 11:47:36 +0000 Subject: [PATCH] Add timeout around reply layout render --- .../review-panel/controllers/ReviewPanelController.coffee | 8 +++++--- .../ide/review-panel/directives/reviewPanelSorted.coffee | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee index c224b6f4df..f9ec800121 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -3,7 +3,7 @@ define [ "utils/EventEmitter" "ide/colors/ColorManager" ], (App, EventEmitter, ColorManager) -> - App.controller "ReviewPanelController", ($scope, $element, ide) -> + App.controller "ReviewPanelController", ($scope, $element, ide, $timeout) -> $scope.reviewPanel = entries: {} trackNewChanges: false @@ -103,7 +103,8 @@ define [ } entry.replyContent = "" entry.replying = false - $scope.$broadcast "review-panel:layout" + $timeout () -> + $scope.$broadcast "review-panel:layout" # TODO Just for prototyping purposes; remove afterwards window.setTimeout((() -> $scope.$applyAsync(() -> submitMockedReply(entry)) @@ -118,7 +119,8 @@ define [ } entry.replyContent = "" entry.replying = false - $scope.$broadcast "review-panel:layout" + $timeout () -> + $scope.$broadcast "review-panel:layout" $scope.cancelReply = (entry) -> entry.replying = false diff --git a/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee b/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee index 669d52df17..0b5a7b2487 100644 --- a/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee +++ b/services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee @@ -5,6 +5,7 @@ define [ return { link: (scope, element, attrs) -> layout = () -> + sl_console.log "LAYOUT" entries = [] for el in element.find(".rp-entry-wrapper") entries.push { @@ -22,6 +23,7 @@ define [ previousBottom = top + height entry.$box_el.css(top: top) entry.$callout_el.css(top: original_top + 15, height: top - original_top) + sl_console.log "ENTRY", {entry: entry.scope.entry, top} scope.$watch "reviewPanel.entryGeneration", (value) -> scope.$evalAsync () ->