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
df965949
Commit
df965949
authored
Apr 13, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE + DE mobile] Update for underscore 1.8.3.
parent
bd053831
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
12 deletions
+12
-12
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
+1
-1
apps/documenteditor/main/app/view/MailMergeRecepients.js
apps/documenteditor/main/app/view/MailMergeRecepients.js
+1
-1
apps/documenteditor/main/app/view/MailMergeSaveDlg.js
apps/documenteditor/main/app/view/MailMergeSaveDlg.js
+1
-1
apps/documenteditor/main/app/view/PageMarginsDialog.js
apps/documenteditor/main/app/view/PageMarginsDialog.js
+1
-1
apps/documenteditor/main/app/view/PageSizeDialog.js
apps/documenteditor/main/app/view/PageSizeDialog.js
+1
-1
apps/documenteditor/main/app/view/Statusbar.js
apps/documenteditor/main/app/view/Statusbar.js
+3
-3
apps/documenteditor/main/app/view/StyleTitleDialog.js
apps/documenteditor/main/app/view/StyleTitleDialog.js
+1
-1
apps/documenteditor/mobile/app/view/Settings.js
apps/documenteditor/mobile/app/view/Settings.js
+1
-1
apps/documenteditor/mobile/app/view/edit/EditChart.js
apps/documenteditor/mobile/app/view/edit/EditChart.js
+1
-1
apps/documenteditor/mobile/app/view/edit/EditTable.js
apps/documenteditor/mobile/app/view/edit/EditTable.js
+1
-1
No files found.
apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
View file @
df965949
...
...
@@ -81,7 +81,7 @@ define([
'
</div>
'
].
join
(
''
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
this
.
api
=
this
.
options
.
api
;
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
this
.
options
);
...
...
apps/documenteditor/main/app/view/MailMergeRecepients.js
View file @
df965949
...
...
@@ -54,7 +54,7 @@ define([
'
<div id="id-mail-recepients-placeholder"></div>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
fileChoiceUrl
=
options
.
fileChoiceUrl
||
''
;
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
...
...
apps/documenteditor/main/app/view/MailMergeSaveDlg.js
View file @
df965949
...
...
@@ -55,7 +55,7 @@ define([
'
<div id="id-mail-merge-folder-placeholder"></div>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
mergeFolderUrl
=
options
.
mergeFolderUrl
||
''
;
this
.
mergedFileUrl
=
options
.
mergedFileUrl
||
''
;
...
...
apps/documenteditor/main/app/view/PageMarginsDialog.js
View file @
df965949
...
...
@@ -89,7 +89,7 @@ define([
'
</div>
'
].
join
(
''
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
this
.
spinners
=
[];
this
.
_noApply
=
false
;
...
...
apps/documenteditor/main/app/view/PageSizeDialog.js
View file @
df965949
...
...
@@ -79,7 +79,7 @@ define([
'
</div>
'
].
join
(
''
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
this
.
spinners
=
[];
this
.
_noApply
=
false
;
...
...
apps/documenteditor/main/app/view/Statusbar.js
View file @
df965949
...
...
@@ -96,7 +96,7 @@ define([
templateUserList
:
_
.
template
(
'
<ul>
'
+
'
<% _.each(users, function(item) { %>
'
+
'
<%= _.template(usertpl
,
{user: item, scope: scope}) %>
'
+
'
<%= _.template(usertpl
)(
{user: item, scope: scope}) %>
'
+
'
<% }); %>
'
+
'
</ul>
'
),
...
...
@@ -436,7 +436,7 @@ define([
_onAddUser
:
function
(
m
,
c
,
opts
)
{
if
(
this
.
panelUsersList
)
{
this
.
panelUsersList
.
find
(
'
ul
'
).
append
(
_
.
template
(
this
.
tplUser
,
{
user
:
m
,
scope
:
this
}));
this
.
panelUsersList
.
find
(
'
ul
'
).
append
(
_
.
template
(
this
.
tplUser
)(
{
user
:
m
,
scope
:
this
}));
this
.
panelUsersList
.
scroller
.
update
({
minScrollbarLength
:
40
,
alwaysVisibleY
:
true
});
}
},
...
...
@@ -566,7 +566,7 @@ define([
label
:
this
.
labelSelect
,
btns
:
{
ok
:
this
.
btnOk
,
cancel
:
this
.
btnCancel
}
});
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
this
.
options
);
},
...
...
apps/documenteditor/main/app/view/StyleTitleDialog.js
View file @
df965949
...
...
@@ -70,7 +70,7 @@ define([
'
</div>
'
].
join
(
''
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
this
.
options
);
},
...
...
apps/documenteditor/mobile/app/view/Settings.js
View file @
df965949
...
...
@@ -175,7 +175,7 @@ define([
'
</div>
'
,
'
</label>
'
,
'
</li>
'
].
join
(
''
)
,
{
].
join
(
''
)
)(
{
android
:
Framework7
.
prototype
.
device
.
android
,
item
:
size
,
index
:
index
,
...
...
apps/documenteditor/mobile/app/view/edit/EditChart.js
View file @
df965949
...
...
@@ -203,7 +203,7 @@ define([
'
<% }); %>
'
,
'
</ul>
'
,
'
<% }); %>
'
].
join
(
''
)
,
{
].
join
(
''
)
)(
{
styles
:
styles
});
...
...
apps/documenteditor/mobile/app/view/edit/EditTable.js
View file @
df965949
...
...
@@ -138,7 +138,7 @@ define([
'
</div>
'
,
'
<% }); %>
'
,
'
</div>
'
].
join
(
''
)
,
{
].
join
(
''
)
)(
{
styles
:
styles
});
...
...
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