Don't animate review panel entries on toggle and resize

This commit is contained in:
James Allen 2017-02-13 09:49:51 +01:00
parent 123300cdfb
commit 85c2910738
3 changed files with 15 additions and 5 deletions

View file

@ -33,7 +33,7 @@ define [
$scope.$on "layout:pdf:resize", (event, state) -> $scope.$on "layout:pdf:resize", (event, state) ->
$scope.reviewPanel.layoutToLeft = (state.east?.size < 220 || state.east?.initClosed) $scope.reviewPanel.layoutToLeft = (state.east?.size < 220 || state.east?.initClosed)
$scope.$broadcast "review-panel:layout" $scope.$broadcast "review-panel:layout", false
$scope.$on "expandable-text-area:resize", (event) -> $scope.$on "expandable-text-area:resize", (event) ->
$timeout () -> $timeout () ->
@ -154,7 +154,7 @@ define [
return if !reviewPanelOpen? return if !reviewPanelOpen?
$timeout () -> $timeout () ->
$scope.$broadcast "review-panel:toggle" $scope.$broadcast "review-panel:toggle"
$scope.$broadcast "review-panel:layout" $scope.$broadcast "review-panel:layout", false
regenerateTrackChangesId = (doc) -> regenerateTrackChangesId = (doc) ->
old_id = getChangeTracker(doc.doc_id).getIdSeed() old_id = getChangeTracker(doc.doc_id).getIdSeed()

View file

@ -6,7 +6,11 @@ define [
link: (scope, element, attrs) -> link: (scope, element, attrs) ->
previous_focused_entry_index = 0 previous_focused_entry_index = 0
layout = () -> layout = (animate = true) ->
if animate
element.removeClass("no-animate")
else
element.addClass("no-animate")
sl_console.log "LAYOUT" sl_console.log "LAYOUT"
if scope.ui.reviewPanelOpen if scope.ui.reviewPanelOpen
PADDING = 8 PADDING = 8
@ -101,9 +105,9 @@ define [
scope.$applyAsync () -> scope.$applyAsync () ->
layout() layout()
scope.$on "review-panel:layout", () -> scope.$on "review-panel:layout", (e, animate = true) ->
scope.$applyAsync () -> scope.$applyAsync () ->
layout() layout(animate)
scope.$watch "reviewPanel.rendererData.lineHeight", () -> scope.$watch "reviewPanel.rendererData.lineHeight", () ->
layout() layout()

View file

@ -184,6 +184,9 @@
color: #FFF; color: #FFF;
cursor: pointer; cursor: pointer;
transition: top 0.3s, left 0.1s, right 0.1s; transition: top 0.3s, left 0.1s, right 0.1s;
.no-animate & {
transition: none;
}
&-focused { &-focused {
left: 0px; left: 0px;
@ -277,6 +280,9 @@
border-radius: 3px; border-radius: 3px;
background-color: #FFF; background-color: #FFF;
transition: top 0.3s, left 0.1s, right 0.1s; transition: top 0.3s, left 0.1s, right 0.1s;
.no-animate & {
transition: none;
}
&-insert { &-insert {
border-color: @rp-green; border-color: @rp-green;