Add delete action to the dropdown.

This commit is contained in:
Paulo Reis 2017-01-10 10:33:54 +00:00
parent 70134d44d0
commit 32fb317820
4 changed files with 22 additions and 3 deletions

View file

@ -6,6 +6,7 @@
docs="docs"
on-open="refreshResolvedCommentsDropdown();"
on-unresolve="unresolveComment(threadId);"
on-delete="deleteComment(entryId);"
is-loading="reviewPanel.dropdown.loading"
)
span.review-panel-toolbar-label(ng-click="editor.wantTrackChanges = true;", ng-if="editor.wantTrackChanges === false") Track Changes is
@ -207,7 +208,10 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate')
ng-click="onUnresolve({ 'threadId': threadId });"
)
|  Re-open
a.rp-entry-button(href, ng-click="onDelete();")
a.rp-entry-button(
href
ng-click="onDelete({ 'entryId': entryId });"
)
|  Delete
@ -269,9 +273,11 @@ script(type='text/ng-template', id='resolvedCommentsDropdownTemplate')
)
resolved-comment-entry(
ng-repeat="thread in resolvedCommentsPerFile[doc.doc.id]"
entry-id="thread.entryId"
thread-id="thread.threadId"
thread="thread"
doc="doc"
on-unresolve="handleUnresolve(threadId);"
on-delete="handleDelete(entryId);"
)

View file

@ -231,6 +231,9 @@ define [
$scope.$broadcast "review-panel:recalculate-screen-positions"
$scope.$broadcast "review-panel:layout"
$scope.$on "comment:removed", (comment) ->
console.log comment
$scope.acceptChange = (entry_id) ->
$http.post "/project/#{$scope.project_id}/doc/#{$scope.editor.open_doc_id}/changes/#{entry_id}/accept", {_csrf: window.csrfToken}
$scope.$broadcast "change:accept", entry_id

View file

@ -4,8 +4,10 @@ define [
App.directive "resolvedCommentEntry", () ->
restrict: "E"
templateUrl: "resolvedCommentEntryTemplate"
scope:
scope:
entryId: "="
threadId: "="
thread: "="
doc: "="
onUnresolve: "&"
onUnresolve: "&"
onDelete: "&"

View file

@ -10,6 +10,7 @@ define [
docs : "="
onOpen : "&"
onUnresolve : "&"
onDelete : "&"
isLoading : "="
link: (scope, element, attrs) ->
@ -19,6 +20,7 @@ define [
scope.toggleOpenState = () ->
scope.state.isOpen = !scope.state.isOpen
if (scope.state.isOpen)
filterResolvedComments()
scope.onOpen()
scope.resolvedCommentsPerFile = {}
@ -27,6 +29,11 @@ define [
scope.onUnresolve({ threadId })
filterResolvedComments()
scope.handleDelete = (entryId) ->
scope.onDelete({ entryId })
filterResolvedComments()
filterResolvedComments = () ->
scope.resolvedCommentsPerFile = {}
@ -37,6 +44,7 @@ define [
scope.resolvedCommentsPerFile[fileId][entryId] = angular.copy scope.threads[entry.thread_id]
scope.resolvedCommentsPerFile[fileId][entryId].content = entry.content
scope.resolvedCommentsPerFile[fileId][entryId].threadId = entry.thread_id
scope.resolvedCommentsPerFile[fileId][entryId].entryId = entryId
scope.$watchCollection "entries", filterResolvedComments
scope.$watchCollection "threads", filterResolvedComments