Просмотр исходного кода

Distinguish between inserts and deletes in the entries repeater.

Paulo Reis 10 лет назад
Родитель
Сommit
19241e571f

+ 6 - 2
services/web/app/views/project/editor/editor.jade

@@ -50,8 +50,12 @@ div.full-size(
 				input(type="checkbox", ng-model="reviewPanel.trackNewChanges")
 				input(type="checkbox", ng-model="reviewPanel.trackNewChanges")
 			.review-panel-scroller
 			.review-panel-scroller
 				.review-entry-list(review-panel-sorted)
 				.review-entry-list(review-panel-sorted)
-					.review-entry(ng-repeat="(entry_id, entry) in reviewPanel.entries", ng-style="{'top': top}")
-						div(ng-if="entry.type == 'change'")
+					.review-entry(
+						ng-repeat="(entry_id, entry) in reviewPanel.entries"
+						ng-class="'review-entry-' + entry.type"
+						ng-style="{'top': top}"
+					)
+						div(ng-if="entry.type == 'insert' || entry.type == 'delete'")
 							div.small {{ entry.metadata.ts }}
 							div.small {{ entry.metadata.ts }}
 							{{ entry.content }}
 							{{ entry.content }}
 						div(ng-if="entry.type == 'comment'")
 						div(ng-if="entry.type == 'comment'")

+ 1 - 1
services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee

@@ -158,7 +158,7 @@ define [
 			@$scope.reviewPanel.entries = {}
 			@$scope.reviewPanel.entries = {}
 			for change in @changesTracker.changes
 			for change in @changesTracker.changes
 				@$scope.reviewPanel.entries[change.id] = {
 				@$scope.reviewPanel.entries[change.id] = {
-					type: "change"
+					type: if change.op.i then "insert" else "delete"
 					content: change.op.i or change.op.d
 					content: change.op.i or change.op.d
 					offset: change.op.p
 					offset: change.op.p
 					metadata: change.metadata
 					metadata: change.metadata

+ 4 - 3
services/web/public/stylesheets/app/editor/review-panel.less

@@ -59,10 +59,11 @@
 .review-entry {
 .review-entry {
 	position: absolute;
 	position: absolute;
 	font-size: 12px;
 	font-size: 12px;
-	padding: 2px 6px;
-	border: 1px solid #999;
+	padding: 5px 5px 5px 9px;
+	border-left: solid 4px transparent;
+	border-radius: 3px;
 	margin: 0 6px;
 	margin: 0 6px;
-	background-color: white;
+	background-color: #FFF;
 	max-width: 148px;
 	max-width: 148px;
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }