Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
6c7ea6af
Commit
6c7ea6af
authored
Oct 28, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Changed format for data in setHistoryData.
parent
75a175b4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
4 deletions
+17
-4
apps/common/main/lib/controller/History.js
apps/common/main/lib/controller/History.js
+17
-4
No files found.
apps/common/main/lib/controller/History.js
View file @
6c7ea6af
...
@@ -163,19 +163,32 @@ define([
...
@@ -163,19 +163,32 @@ define([
if
(
historyStore
&&
data
!==
null
)
{
if
(
historyStore
&&
data
!==
null
)
{
var
rev
,
revisions
=
historyStore
.
findRevisions
(
data
.
version
),
var
rev
,
revisions
=
historyStore
.
findRevisions
(
data
.
version
),
urlGetTime
=
new
Date
();
urlGetTime
=
new
Date
();
var
diff
=
opts
.
data
.
urlDiff
||
opts
.
data
.
changesUrl
;
var
diff
=
opts
.
data
.
urlDiff
||
opts
.
data
.
changesUrl
,
url
,
docId
;
if
(
opts
.
data
.
current
&&
opts
.
data
.
previous
)
{
url
=
_
.
isEmpty
(
diff
)
?
opts
.
data
.
current
.
url
:
opts
.
data
.
previous
.
url
;
docId
=
_
.
isEmpty
(
diff
)
?
opts
.
data
.
current
.
key
:
opts
.
data
.
previous
.
key
;
}
else
{
url
=
opts
.
data
.
url
;
docId
=
_
.
isEmpty
(
diff
)
?
this
.
currentDocId
:
this
.
currentDocIdPrev
;
}
if
(
revisions
&&
revisions
.
length
>
0
)
{
if
(
revisions
&&
revisions
.
length
>
0
)
{
for
(
var
i
=
0
;
i
<
revisions
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
revisions
.
length
;
i
++
)
{
rev
=
revisions
[
i
];
rev
=
revisions
[
i
];
rev
.
set
(
'
url
'
,
opts
.
data
.
url
,
{
silent
:
true
});
rev
.
set
(
'
url
'
,
url
,
{
silent
:
true
});
rev
.
set
(
'
urlDiff
'
,
diff
,
{
silent
:
true
});
rev
.
set
(
'
urlDiff
'
,
diff
,
{
silent
:
true
});
rev
.
set
(
'
urlGetTime
'
,
urlGetTime
,
{
silent
:
true
});
rev
.
set
(
'
urlGetTime
'
,
urlGetTime
,
{
silent
:
true
});
if
(
opts
.
data
.
current
&&
opts
.
data
.
previous
)
{
rev
.
set
(
'
docId
'
,
opts
.
data
.
current
.
key
,
{
silent
:
true
});
rev
.
set
(
'
docIdPrev
'
,
opts
.
data
.
previous
.
key
,
{
silent
:
true
});
}
}
}
}
}
var
hist
=
new
Asc
.
asc_CVersionHistory
();
var
hist
=
new
Asc
.
asc_CVersionHistory
();
hist
.
asc_setUrl
(
opts
.
data
.
url
);
hist
.
asc_setUrl
(
url
);
hist
.
asc_setUrlChanges
(
diff
);
hist
.
asc_setUrlChanges
(
diff
);
hist
.
asc_setDocId
(
_
.
isEmpty
(
diff
)
?
this
.
currentDocId
:
this
.
currentDocIdPrev
);
hist
.
asc_setDocId
(
docId
);
hist
.
asc_setCurrentChangeId
(
this
.
currentChangeId
);
hist
.
asc_setCurrentChangeId
(
this
.
currentChangeId
);
hist
.
asc_setArrColors
(
this
.
currentArrColors
);
hist
.
asc_setArrColors
(
this
.
currentArrColors
);
this
.
api
.
asc_showRevision
(
hist
);
this
.
api
.
asc_showRevision
(
hist
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment