github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-15 08:23:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hide new UI behind query string parameter.

Browse source
This commit is contained in:
Paulo Reis 2017-03-20 13:56:36 +00:00
parent 8951e91e31
commit 0e24d7118d
5 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/app/views/project/editor/editor.pug
View file

@ -19,7 +19,8 @@ div.full-size(
'rp-size-mini': (!ui.reviewPanelOpen && reviewPanel.hasEntries),\ 'rp-size-mini': (!ui.reviewPanelOpen && reviewPanel.hasEntries),\
'rp-size-expanded': ui.reviewPanelOpen,\ 'rp-size-expanded': ui.reviewPanelOpen,\
'rp-layout-left': reviewPanel.layoutToLeft,\ 'rp-layout-left': reviewPanel.layoutToLeft,\
'rp-loading-threads': reviewPanel.loadingThreads\ 'rp-loading-threads': reviewPanel.loadingThreads,\
'rp-new-comment-ui': reviewPanel.newAddCommentUI\
}" }"
) )
.loading-panel(ng-show="!editor.sharejs_doc || editor.opening") .loading-panel(ng-show="!editor.sharejs_doc || editor.opening")

11
services/web/app/views/project/editor/review-panel.pug
View file

@ -7,7 +7,7 @@
) !{translate("track_changes_is_on")} ) !{translate("track_changes_is_on")}
a.rp-add-comment-btn( a.rp-add-comment-btn(
href href
ng-if="reviewPanel.entries[editor.open_doc_id]['add-comment'] != null" ng-if="reviewPanel.newAddCommentUI && reviewPanel.entries[editor.open_doc_id]['add-comment'] != null"
ng-click="addNewComment();" ng-click="addNewComment();"
) )
i.fa.fa-comment i.fa.fa-comment
@ -81,6 +81,7 @@
on-start-new="startNewComment();" on-start-new="startNewComment();"
on-submit="submitNewComment(content);" on-submit="submitNewComment(content);"
on-cancel="cancelNewComment();" on-cancel="cancelNewComment();"
on-indicator-click="toggleReviewPanel();"
layout-to-left="reviewPanel.layoutToLeft" layout-to-left="reviewPanel.layoutToLeft"
) )
@ -321,6 +322,14 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate')
script(type='text/ng-template', id='addCommentEntryTemplate') script(type='text/ng-template', id='addCommentEntryTemplate')
div div
.rp-entry-callout.rp-entry-callout-add-comment .rp-entry-callout.rp-entry-callout-add-comment
.rp-entry-indicator.rp-entry-indicator-add-comment(
ng-if="!commentState.adding"
ng-click="startNewComment(); onIndicatorClick();"
tooltip=translate("add_comment")
tooltip-placement="{{ layoutToLeft ? 'left' : 'right' }}"
tooltip-append-to-body="true"
)
i.fa.fa-commenting
.rp-entry.rp-entry-add-comment( .rp-entry.rp-entry-add-comment(
ng-class="[ (state.isAdding ? 'rp-entry-adding-comment' : ''), (entry.focused ? 'rp-entry-focused' : '')]" ng-class="[ (state.isAdding ? 'rp-entry-adding-comment' : ''), (entry.focused ? 'rp-entry-focused' : '')]"
) )

7
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
View file

@ -28,6 +28,10 @@ define [
layoutToLeft: false layoutToLeft: false
rendererData: {} rendererData: {}
loadingThreads: false loadingThreads: false
newAddCommentUI: false # Test new UI for adding comments; remove afterwards.
if window.location.search.match /new-comments=true/
$scope.reviewPanel.newAddCommentUI = true
window.addEventListener "beforeunload", () -> window.addEventListener "beforeunload", () ->
collapsedStates = {} collapsedStates = {}
@ -166,7 +170,8 @@ define [
entries = $scope.reviewPanel.entries[$scope.editor.open_doc_id] or {} entries = $scope.reviewPanel.entries[$scope.editor.open_doc_id] or {}
permEntries = {} permEntries = {}
for entry, entryData of entries for entry, entryData of entries
permEntries[entry] = entryData if entry != "add-comment" if entry != "add-comment" or !$scope.reviewPanel.newAddCommentUI
permEntries[entry] = entryData
Object.keys(permEntries).length Object.keys(permEntries).length
), (nEntries) -> ), (nEntries) ->
$scope.reviewPanel.hasEntries = nEntries > 0 and $scope.project.features.trackChangesVisible $scope.reviewPanel.hasEntries = nEntries > 0 and $scope.project.features.trackChangesVisible

3
services/web/public/coffee/ide/review-panel/directives/addCommentEntry.coffee
View file

@ -7,7 +7,8 @@ define [
scope: scope:
onStartNew: "&" onStartNew: "&"
onSubmit: "&" onSubmit: "&"
onCancel: "&" onCancel: "&"
onIndicatorClick: "&"
layoutToLeft: "=" layoutToLeft: "="
link: (scope, element, attrs) -> link: (scope, element, attrs) ->
scope.state = scope.state =

8
services/web/public/stylesheets/app/editor/review-panel.less
View file

@ -197,6 +197,10 @@
right: 4px; right: 4px;
z-index: 1; z-index: 1;
} }
.rp-new-comment-ui &-add-comment {
display: none;
}
} }
.rp-entry-wrapper { .rp-entry-wrapper {
@ -569,7 +573,7 @@
} }
} }
.rp-state-current-file &-add-comment { .rp-size-mini.rp-new-comment-ui &-add-comment {
display: none; display: none;
} }
} }
@ -884,7 +888,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
font-size: 10px; font-size: 11px;
.rp-size-mini & { .rp-size-mini & {
right: @review-off-width; right: @review-off-width;