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
bd053831
Commit
bd053831
authored
Apr 13, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Common] Update for underscore 1.8.3.
parent
6b1a247e
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
22 additions
and
22 deletions
+22
-22
apps/common/main/lib/component/ComboBox.js
apps/common/main/lib/component/ComboBox.js
+1
-1
apps/common/main/lib/component/ComboBoxFonts.js
apps/common/main/lib/component/ComboBoxFonts.js
+1
-1
apps/common/main/lib/component/Window.js
apps/common/main/lib/component/Window.js
+2
-2
apps/common/main/lib/view/AdvancedSettingsWindow.js
apps/common/main/lib/view/AdvancedSettingsWindow.js
+1
-1
apps/common/main/lib/view/Chat.js
apps/common/main/lib/view/Chat.js
+4
-4
apps/common/main/lib/view/Comments.js
apps/common/main/lib/view/Comments.js
+1
-1
apps/common/main/lib/view/CopyWarningDialog.js
apps/common/main/lib/view/CopyWarningDialog.js
+1
-1
apps/common/main/lib/view/DocumentAccessDialog.js
apps/common/main/lib/view/DocumentAccessDialog.js
+1
-1
apps/common/main/lib/view/ExternalDiagramEditor.js
apps/common/main/lib/view/ExternalDiagramEditor.js
+1
-1
apps/common/main/lib/view/ExternalMergeEditor.js
apps/common/main/lib/view/ExternalMergeEditor.js
+1
-1
apps/common/main/lib/view/ImageFromUrlDialog.js
apps/common/main/lib/view/ImageFromUrlDialog.js
+1
-1
apps/common/main/lib/view/InsertTableDialog.js
apps/common/main/lib/view/InsertTableDialog.js
+1
-1
apps/common/main/lib/view/OpenDialog.js
apps/common/main/lib/view/OpenDialog.js
+1
-1
apps/common/main/lib/view/Plugins.js
apps/common/main/lib/view/Plugins.js
+1
-1
apps/common/main/lib/view/RenameDialog.js
apps/common/main/lib/view/RenameDialog.js
+1
-1
apps/common/main/lib/view/ReviewChanges.js
apps/common/main/lib/view/ReviewChanges.js
+2
-2
apps/common/main/lib/view/SearchDialog.js
apps/common/main/lib/view/SearchDialog.js
+1
-1
No files found.
apps/common/main/lib/component/ComboBox.js
View file @
bd053831
...
...
@@ -547,7 +547,7 @@ define([
'
<% _.each(items, function(item) { %>
'
,
'
<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>
'
,
'
<% }); %>
'
].
join
(
''
)
,
{
].
join
(
''
)
)(
{
items
:
this
.
store
.
toJSON
(),
scope
:
this
}));
...
...
apps/common/main/lib/component/ComboBoxFonts.js
View file @
bd053831
...
...
@@ -353,7 +353,7 @@ define([
'
<li id="<%= item.id %>">
'
,
'
<a class="font-item" tabindex="-1" type="menuitem" style="vertical-align:middle; margin: 0 0 0 -10px; height:<%=scope.getListItemHeight()%>px;"/>
'
,
'
</li>
'
].
join
(
''
)
,
{
].
join
(
''
)
)(
{
item
:
item
.
attributes
,
scope
:
this
}));
...
...
apps/common/main/lib/component/Window.js
View file @
bd053831
...
...
@@ -421,7 +421,7 @@ define([
_
.
extend
(
options
,
{
cls
:
'
alert
'
,
onprimary
:
onKeyDown
,
tpl
:
_
.
template
(
template
,
options
)
tpl
:
_
.
template
(
template
)(
options
)
});
var
win
=
new
Common
.
UI
.
Window
(
options
),
...
...
@@ -556,7 +556,7 @@ define([
render
:
function
()
{
var
renderto
=
this
.
initConfig
.
renderTo
||
document
.
body
;
$
(
renderto
).
append
(
_
.
template
(
template
,
this
.
initConfig
)
_
.
template
(
template
)(
this
.
initConfig
)
);
this
.
$window
=
$
(
'
#
'
+
this
.
initConfig
.
id
);
...
...
apps/common/main/lib/view/AdvancedSettingsWindow.js
View file @
bd053831
...
...
@@ -71,7 +71,7 @@ define([
'
</div>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
handler
=
_options
.
handler
;
this
.
toggleGroup
=
_options
.
toggleGroup
;
...
...
apps/common/main/lib/view/Chat.js
View file @
bd053831
...
...
@@ -67,7 +67,7 @@ define([
templateUserList
:
_
.
template
(
'
<ul>
'
+
'
<% _.each(users, function(item) { %>
'
+
'
<%= _.template(usertpl
,
{user: item, scope: scope}) %>
'
+
'
<%= _.template(usertpl
)(
{user: item, scope: scope}) %>
'
+
'
<% }); %>
'
+
'
</ul>
'
),
...
...
@@ -82,7 +82,7 @@ define([
templateMsgList
:
_
.
template
(
'
<ul>
'
+
'
<% _.each(messages, function(item) { %>
'
+
'
<%= _.template(msgtpl
,
{msg: item, scope: scope}) %>
'
+
'
<%= _.template(msgtpl
)(
{msg: item, scope: scope}) %>
'
+
'
<% }); %>
'
+
'
</ul>
'
),
...
...
@@ -162,7 +162,7 @@ define([
_onAddUser
:
function
(
m
,
c
,
opts
)
{
if
(
this
.
panelUsers
)
{
this
.
panelUsers
.
find
(
'
ul
'
).
append
(
_
.
template
(
this
.
tplUser
,
{
user
:
m
,
scope
:
this
}));
this
.
panelUsers
.
find
(
'
ul
'
).
append
(
_
.
template
(
this
.
tplUser
)(
{
user
:
m
,
scope
:
this
}));
this
.
panelUsers
.
scroller
.
update
({
minScrollbarLength
:
25
,
alwaysVisibleY
:
true
});
}
},
...
...
@@ -186,7 +186,7 @@ define([
var
content
=
this
.
panelMessages
.
find
(
'
ul
'
);
if
(
content
&&
content
.
length
)
{
this
.
_prepareMessage
(
m
);
content
.
append
(
_
.
template
(
this
.
tplMsg
,
{
msg
:
m
,
scope
:
this
}));
content
.
append
(
_
.
template
(
this
.
tplMsg
)(
{
msg
:
m
,
scope
:
this
}));
// scroll to end
...
...
apps/common/main/lib/view/Comments.js
View file @
bd053831
...
...
@@ -98,7 +98,7 @@ define([
this
.
store
=
options
.
store
;
this
.
delegate
=
options
.
delegate
;
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
arrow
=
{
margin
:
20
,
width
:
12
,
height
:
34
};
this
.
sdkBounds
=
{
width
:
0
,
height
:
0
,
padding
:
10
,
paddingTop
:
20
};
...
...
apps/common/main/lib/view/CopyWarningDialog.js
View file @
bd053831
...
...
@@ -83,7 +83,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/common/main/lib/view/DocumentAccessDialog.js
View file @
bd053831
...
...
@@ -57,7 +57,7 @@ define([
'
<div id="id-sharing-placeholder"></div>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
settingsurl
=
options
.
settingsurl
||
''
;
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
...
...
apps/common/main/lib/view/ExternalDiagramEditor.js
View file @
bd053831
...
...
@@ -66,7 +66,7 @@ define([
'
</div>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
handler
=
_options
.
handler
;
this
.
_chartData
=
null
;
...
...
apps/common/main/lib/view/ExternalMergeEditor.js
View file @
bd053831
...
...
@@ -66,7 +66,7 @@ define([
'
</div>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
handler
=
_options
.
handler
;
this
.
_mergeData
=
null
;
...
...
apps/common/main/lib/view/ImageFromUrlDialog.js
View file @
bd053831
...
...
@@ -65,7 +65,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/common/main/lib/view/InsertTableDialog.js
View file @
bd053831
...
...
@@ -73,7 +73,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/common/main/lib/view/OpenDialog.js
View file @
bd053831
...
...
@@ -93,7 +93,7 @@ define([
this
.
codepages
=
options
.
codepages
;
this
.
settings
=
options
.
settings
;
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
},
...
...
apps/common/main/lib/view/Plugins.js
View file @
bd053831
...
...
@@ -225,7 +225,7 @@ define([
'
<% } %>
'
].
join
(
''
);
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
url
=
options
.
url
||
''
;
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
...
...
apps/common/main/lib/view/RenameDialog.js
View file @
bd053831
...
...
@@ -66,7 +66,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/common/main/lib/view/ReviewChanges.js
View file @
bd053831
...
...
@@ -80,7 +80,7 @@ define([
this
.
store
=
options
.
store
;
this
.
delegate
=
options
.
delegate
;
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
this
.
arrow
=
{
margin
:
20
,
width
:
12
,
height
:
34
};
this
.
sdkBounds
=
{
width
:
0
,
height
:
0
,
padding
:
10
,
paddingTop
:
20
};
...
...
@@ -441,7 +441,7 @@ define([
var
el
=
$
(
this
.
el
),
me
=
this
;
el
.
addClass
(
'
review-changes
'
);
el
.
html
(
_
.
template
(
this
.
template
,
{
el
.
html
(
_
.
template
(
this
.
template
)(
{
scope
:
this
}));
...
...
apps/common/main/lib/view/SearchDialog.js
View file @
bd053831
...
...
@@ -105,7 +105,7 @@
'
</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
);
},
...
...
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