| author | Harris Baptiste <harris.baptiste@iri.centrepompidou.fr> |
| Tue, 30 Aug 2016 16:58:59 +0200 | |
| changeset 156 | e1e14766f608 |
| parent 153 | 9ed54b10ce16 |
| permissions | -rw-r--r-- |
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
1 |
<template src='./template.html'></template> |
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
2 |
<style scoped src='./style.css'></style> |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
3 |
|
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
4 |
<script> |
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
5 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
6 |
import ModalPanel from '../modalpanel/ModalPanel.vue' |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
7 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
8 |
|
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
9 |
export default {
|
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
10 |
components: { 'modalpanel': ModalPanel },
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
11 |
mounted: function () {},
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
12 |
props: ['transform-matrix', 'image-path', 'image-height', 'image-width'], |
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
13 |
data () {
|
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
14 |
|
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
15 |
return {
|
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
16 |
diffText: "", |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
17 |
tagMode: false, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
18 |
textMode: false, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
19 |
fragmentMode: false, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
20 |
originalPath: "", |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
21 |
modifiedPath: "", |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
22 |
tags: [] |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
23 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
24 |
}, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
25 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
26 |
mounted () { return false; },
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
27 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
28 |
computed: {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
29 |
matrixTransform: function () {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
30 |
var matrixTransform = ""; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
31 |
if (this.transformMatrix) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
32 |
matrixTransform = "matrix(" + this.transformMatrix + ")";
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
33 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
34 |
return matrixTransform; |
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
35 |
} |
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
36 |
}, |
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
37 |
|
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
38 |
methods: {
|
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
39 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
40 |
setContent: function (content) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
41 |
this.$refs.modalcontent.appendChild(content); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
42 |
}, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
43 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
44 |
switchMode: function (mode) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
45 |
var availableMode = ["tagMode", "textMode", "fragmentMode"]; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
46 |
this.tagMode = false; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
47 |
this.textMode = false; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
48 |
this.fragmentMode = false; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
49 |
if (availableMode.indexOf(mode) !== -1) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
50 |
this[mode] = true; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
51 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
52 |
}, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
53 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
54 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
55 |
showTagDiff: function (tags, editedTags) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
56 |
this.switchMode("tagMode");
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
57 |
//si le label a changé considé qu'il a été effacé. |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
58 |
var diff = iconolab.JsonDiff.diff(tags, editedTags); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
59 |
var tagsToRender = []; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
60 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
61 |
tags.forEach(function(tag, i) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
62 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
63 |
var tag = JSON.parse(JSON.stringify(tag)); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
64 |
var deletedDiff = diff["_"+i]; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
65 |
var currentDiff = diff[i]; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
66 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
67 |
if (!deletedDiff && !currentDiff) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
68 |
tagsToRender.push(tag); //render this tag |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
69 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
70 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
71 |
if (Array.isArray(deletedDiff)) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
72 |
tag.action = "del"; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
73 |
tagsToRender.push(tag); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
74 |
return true; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
75 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
76 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
77 |
if (currentDiff && (currentDiff.tag_label || currentDiff.relevancy || currentDiff.accuracy)) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
78 |
tag.action = (currentDiff.tag_label) ? "replace" : "update"; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
79 |
tag.new_label = editedTags[i].tag_label; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
80 |
tag.new_accuracy = editedTags[i].accuracy; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
81 |
tag.new_relevancy = editedTags[i].relevancy; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
82 |
tagsToRender.push(tag); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
83 |
return true; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
84 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
85 |
if (Array.isArray(currentDiff)) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
86 |
tag.action = "add"; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
87 |
tagsToRender.push(editedTags[i]); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
88 |
return true; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
89 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
90 |
}); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
91 |
/* deal with remain */ |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
92 |
if (tags.length < editedTags.length) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
93 |
var remainedTags = editedTags.slice(tags.length); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
94 |
remainedTags.forEach(function (tag, i) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
95 |
tag.action = "add"; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
96 |
tagsToRender.push(tag); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
97 |
}); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
98 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
99 |
this.tags = tagsToRender; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
100 |
}, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
101 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
102 |
showTextDiff: function (original, mod) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
103 |
this.switchMode("textMode");
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
104 |
var diff = iconolab.JsDiff.diffWords(original, mod); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
105 |
var fragment = document.createDocumentFragment(); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
106 |
for (var i=0; i < diff.length; i++) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
107 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
108 |
if (diff[i].added && diff[i + 1] && diff[i + 1].removed) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
109 |
var swap = diff[i]; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
110 |
diff[i] = diff[i + 1]; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
111 |
diff[i + 1] = swap; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
112 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
113 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
114 |
var node; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
115 |
if (diff[i].removed) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
116 |
node = document.createElement('del');
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
117 |
node.appendChild(document.createTextNode(diff[i].value)); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
118 |
} else if (diff[i].added) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
119 |
node = document.createElement('ins');
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
120 |
node.appendChild(document.createTextNode(diff[i].value)); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
121 |
} else {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
122 |
node = document.createTextNode(diff[i].value); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
123 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
124 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
125 |
fragment.appendChild(node); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
126 |
} |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
127 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
128 |
this.diffText = jQuery('<div>').append(fragment).html();
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
129 |
}, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
130 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
131 |
showFragmentDiff: function (originalPath, modifiedPath) {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
132 |
this.switchMode("fragmentMode");
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
133 |
this.originalPath = originalPath; |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
134 |
this.modifiedPath = modifiedPath; |
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
135 |
}, |
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
136 |
|
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
137 |
show: function () {
|
|
156
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
138 |
this.$refs.panel.show(); |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
139 |
}, |
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
140 |
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
141 |
hide: function () {
|
|
e1e14766f608
adding diffviewer to merging view
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
153
diff
changeset
|
142 |
this.$refs.panel.hide(); |
|
153
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
143 |
} |
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
144 |
} |
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
145 |
} |
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
146 |
|
|
9ed54b10ce16
iconolab js updated
Harris Baptiste <harris.baptiste@iri.centrepompidou.fr>
parents:
diff
changeset
|
147 |
</script> |