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
920dc600
Commit
920dc600
authored
Sep 20, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Added hint to Restore button in the version history.
parent
28be3e9f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
2 deletions
+24
-2
apps/common/main/lib/controller/History.js
apps/common/main/lib/controller/History.js
+5
-0
apps/common/main/lib/view/History.js
apps/common/main/lib/view/History.js
+18
-2
apps/documenteditor/main/locale/en.json
apps/documenteditor/main/locale/en.json
+1
-0
No files found.
apps/common/main/lib/controller/History.js
View file @
920dc600
...
...
@@ -98,6 +98,11 @@ define([
if
(
e
)
{
var
btn
=
$
(
e
.
target
);
if
(
btn
&&
btn
.
hasClass
(
'
revision-restore
'
))
{
var
tip
=
item
.
btnTip
;
if
(
tip
)
{
tip
.
dontShow
=
true
;
tip
.
tip
().
remove
();
}
if
(
record
.
get
(
'
isRevision
'
))
Common
.
Gateway
.
requestRestore
(
record
.
get
(
'
revision
'
));
else
{
...
...
apps/common/main/lib/view/History.js
View file @
920dc600
...
...
@@ -96,12 +96,28 @@ define([
el
:
$
(
'
#history-btn-back
'
),
enableToggle
:
false
});
var
me
=
this
;
var
changetooltip
=
function
(
dataview
,
view
,
record
)
{
if
(
record
.
get
(
'
selected
'
))
{
var
btns
=
$
(
view
.
el
).
find
(
'
.revision-restore
'
).
tooltip
({
title
:
me
.
textRestore
,
placement
:
'
cursor
'
});
if
(
btns
)
view
.
btnTip
=
btns
.
data
(
'
bs.tooltip
'
);
}
else
if
(
view
.
btnTip
)
{
view
.
btnTip
.
dontShow
=
true
;
view
.
btnTip
.
tip
().
remove
();
view
.
btnTip
=
null
;
}
};
this
.
viewHistoryList
.
on
(
'
item:add
'
,
changetooltip
);
this
.
viewHistoryList
.
on
(
'
item:change
'
,
changetooltip
);
this
.
trigger
(
'
render:after
'
,
this
);
return
this
;
},
textHistoryHeader
:
'
Back to Document
'
textHistoryHeader
:
'
Back to Document
'
,
textRestore
:
'
Restore
'
},
Common
.
Views
.
History
||
{}))
});
\ No newline at end of file
apps/documenteditor/main/locale/en.json
View file @
920dc600
...
...
@@ -142,6 +142,7 @@
"Common.Views.Header.openNewTabText"
:
"Open in New Tab"
,
"Common.Views.Header.textBack"
:
"Go to Documents"
,
"Common.Views.History.textHistoryHeader"
:
"Back to Document"
,
"Common.Views.History.textRestore"
:
"Restore"
,
"Common.Views.ImageFromUrlDialog.cancelButtonText"
:
"Cancel"
,
"Common.Views.ImageFromUrlDialog.okButtonText"
:
"OK"
,
"Common.Views.ImageFromUrlDialog.textUrl"
:
"Paste an image URL:"
,
...
...
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