Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-23 15:19:42 +02:00
Code Releases Activity

Flip revisions diff format, by popular request

Browse source 
Switch from 'what you will lose' to 'what you will gain'...
This commit is contained in:
McMatts 2018-04-26 15:01:43 +01:00
parent b1e0e31a9e
commit 3e37b9b7e4
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
domain/page/endpoint.go
View file

@ -1093,14 +1093,17 @@ func (h *Handler) GetDiff(w http.ResponseWriter, r *http.Request) {
var cfg = &htmldiff.Config{ var cfg = &htmldiff.Config{
Granularity: 5, Granularity: 5,
InsertedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: palegreen;"}}, DeletedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: palegreen;"}},
DeletedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightpink; text-decoration: line-through;"}}, InsertedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightpink; text-decoration: line-through;"}},
ReplacedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightskyblue;"}}, ReplacedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightskyblue;"}},
CleanTags: []string{"documize"}, CleanTags: []string{"documize"},
} }
// InsertedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: palegreen;"}},
// DeletedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightpink; text-decoration: line-through;"}},
// ReplacedSpan: []htmldiff.Attribute{{Key: "style", Val: "background-color: lightskyblue;"}},
res, err := cfg.HTMLdiff([]string{latestHTML, previousHTML}) // res, err := cfg.HTMLdiff([]string{latestHTML, previousHTML})
// res, err := cfg.HTMLdiff([]string{previousHTML, latestHTML}) res, err := cfg.HTMLdiff([]string{previousHTML, latestHTML})
if err != nil { if err != nil {
response.WriteServerError(w, method, err) response.WriteServerError(w, method, err)
return return

2
gui/app/components/document/view-revision.js
View file

@ -45,7 +45,7 @@ export default Component.extend(ModalMixin, {
}); });
this.set('revisions', revisions); this.set('revisions', revisions);
if (revisions.length > 0 && is.null(this.get('revision'))) { if (revisions.length > 0 && is.null(this.get('revision'))) {
this.send('onSelectRevision', revisions[0]); this.send('onSelectRevision', revisions[0]);
} }

5
gui/app/pods/document/index/template.hbs
View file

@ -47,14 +47,11 @@
onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted') onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')
refresh=(action 'refresh')}} refresh=(action 'refresh')}}
{{/if}} {{/if}}
{{#if (eq tab 'attachment')}} {{#if (eq tab 'attachment')}}
{{document/view-attachment document=document permissions=permissions}} {{document/view-attachment document=document permissions=permissions}}
{{/if}} {{/if}}
{{#if (eq tab 'revision')}} {{#if (eq tab 'revision')}}
{{document/view-revision document=document folder=folder pages=pages onRollback=(action 'onRollback')}} {{document/view-revision document=document folder=folder pages=pages permissions=permissions onRollback=(action 'onRollback')}}
{{/if}} {{/if}}
</div> </div>
</div> </div>