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
582f0a8b
Commit
582f0a8b
authored
Apr 13, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE + SSE mobile] Update for underscore 1.8.3.
parent
fd170092
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
19 additions
and
20 deletions
+19
-20
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+3
-3
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
+1
-1
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
apps/spreadsheeteditor/main/app/view/FormulaDialog.js
+1
-1
apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
...preadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
+1
-1
apps/spreadsheeteditor/main/app/view/SetValueDialog.js
apps/spreadsheeteditor/main/app/view/SetValueDialog.js
+1
-1
apps/spreadsheeteditor/main/app/view/Statusbar.js
apps/spreadsheeteditor/main/app/view/Statusbar.js
+4
-4
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
+1
-1
apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
+2
-2
apps/spreadsheeteditor/mobile/app/view/add/AddLink.js
apps/spreadsheeteditor/mobile/app/view/add/AddLink.js
+2
-2
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
+1
-2
apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
+1
-1
apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js
apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js
+1
-1
No files found.
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file @
582f0a8b
...
...
@@ -93,7 +93,7 @@ define([
this
.
handler
=
options
.
handler
;
this
.
type
=
options
.
type
||
'
number
'
;
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
},
...
...
@@ -342,7 +342,7 @@ define([
this
.
api
=
options
.
api
;
this
.
handler
=
options
.
handler
;
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
},
...
...
@@ -516,7 +516,7 @@ define([
this
.
throughIndexes
=
[];
this
.
filteredIndexes
=
[];
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
},
...
...
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View file @
582f0a8b
...
...
@@ -69,7 +69,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/spreadsheeteditor/main/app/view/FormulaDialog.js
View file @
582f0a8b
...
...
@@ -92,7 +92,7 @@ define([
this
.
formulasGroups
=
options
.
formulasGroups
;
this
.
handler
=
options
.
handler
;
_options
.
tpl
=
_
.
template
(
this
.
template
,
_options
);
_options
.
tpl
=
_
.
template
(
this
.
template
)(
_options
);
Common
.
UI
.
Window
.
prototype
.
initialize
.
call
(
this
,
_options
);
},
...
...
apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
View file @
582f0a8b
...
...
@@ -99,7 +99,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/spreadsheeteditor/main/app/view/SetValueDialog.js
View file @
582f0a8b
...
...
@@ -67,7 +67,7 @@ define([
'
</div>
'
].
join
(
''
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
this
.
startvalue
=
this
.
options
.
startvalue
;
this
.
maxvalue
=
this
.
options
.
maxvalue
;
this
.
defaultUnit
=
this
.
options
.
defaultUnit
;
...
...
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file @
582f0a8b
...
...
@@ -68,7 +68,7 @@ define([
templateUserList
:
_
.
template
(
'
<ul>
'
+
'
<% _.each(users, function(item) { %>
'
+
'
<%= _.template(usertpl
,
{user: item, scope: scope}) %>
'
+
'
<%= _.template(usertpl
)(
{user: item, scope: scope}) %>
'
+
'
<% }); %>
'
+
'
</ul>
'
),
...
...
@@ -489,7 +489,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
});
}
},
...
...
@@ -706,7 +706,7 @@ define([
label
:
this
.
labelSheetName
,
btns
:
{
ok
:
this
.
okButtonText
,
cancel
:
this
.
cancelButtonText
}
});
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
);
},
...
...
@@ -823,7 +823,7 @@ define([
label
:
options
.
ismove
?
this
.
textMoveBefore
:
this
.
textCopyBefore
,
btns
:
{
ok
:
this
.
okButtonText
,
cancel
:
this
.
cancelButtonText
}
});
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/spreadsheeteditor/main/app/view/TableOptionsDialog.js
View file @
582f0a8b
...
...
@@ -72,7 +72,7 @@ define([
'
</div>
'
].
join
(
''
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
,
this
.
options
);
this
.
options
.
tpl
=
_
.
template
(
this
.
template
)(
this
.
options
);
this
.
checkRangeType
=
Asc
.
c_oAscSelectionDialogType
.
FormatTable
;
this
.
selectionType
=
Asc
.
c_oAscSelectionType
.
RangeCells
;
...
...
apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
View file @
582f0a8b
...
...
@@ -57,7 +57,7 @@ define([
};
_
.
extend
(
_params
,
args
);
var
$content
=
$
(
'
<div/>
'
).
append
(
_
.
template
(
this
.
template
,
_params
));
var
$content
=
$
(
'
<div/>
'
).
append
(
_
.
template
(
this
.
template
)(
_params
));
// Android fix for navigation
if
(
Framework7
.
prototype
.
device
.
android
)
{
...
...
@@ -121,7 +121,7 @@ define([
'
Logical
'
:
me
.
sCatLogical
};
me
.
layout
=
$
(
'
<div/>
'
).
append
(
_
.
template
(
me
.
template
,
{
me
.
layout
=
$
(
'
<div/>
'
).
append
(
_
.
template
(
me
.
template
)(
{
android
:
Common
.
SharedSettings
.
get
(
'
android
'
),
phone
:
Common
.
SharedSettings
.
get
(
'
phone
'
),
textGroups
:
me
.
textGroups
,
...
...
apps/spreadsheeteditor/mobile/app/view/add/AddLink.js
View file @
582f0a8b
...
...
@@ -210,7 +210,7 @@ define([
'
<% }) %>
'
;
this
.
layout
.
find
(
'
#add-link-sheet select
'
).
html
(
_
.
template
(
tpl
,
{
_
.
template
(
tpl
)(
{
worksheets
:
sheets
})
);
...
...
@@ -219,7 +219,7 @@ define([
if
(
$view
.
length
>
0
)
{
$view
.
find
(
'
#add-link-sheet select
'
).
html
(
_
.
template
(
tpl
,
{
_
.
template
(
tpl
)(
{
worksheets
:
sheets
})
);
...
...
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
View file @
582f0a8b
...
...
@@ -76,8 +76,7 @@ define([
}
mapNavigation
=
el
=
_
.
template
(
tplNavigation
,
{
el
=
_
.
template
(
tplNavigation
)({
android
:
Common
.
SharedSettings
.
get
(
'
android
'
),
phone
:
Common
.
SharedSettings
.
get
(
'
phone
'
),
textBack
:
this
.
textBack
,
...
...
apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js
View file @
582f0a8b
...
...
@@ -133,7 +133,7 @@ define([
'
<% }); %>
'
,
'
</ul>
'
,
'
<% }); %>
'
].
join
(
''
)
,
{
].
join
(
''
)
)(
{
styles
:
styles
,
styleSize
:
styleSize
});
...
...
apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js
View file @
582f0a8b
...
...
@@ -160,7 +160,7 @@ define([
'
<% }); %>
'
,
'
</ul>
'
,
'
<% }); %>
'
].
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