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
5208331e
Commit
5208331e
authored
Apr 05, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Обновление списка темплейтов.
parent
5a58f2c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
21 deletions
+31
-21
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
+1
-1
apps/spreadsheeteditor/main/app/view/TableSettings.js
apps/spreadsheeteditor/main/app/view/TableSettings.js
+30
-20
No files found.
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file @
5208331e
...
...
@@ -157,7 +157,7 @@ define([
items
:
[
{
caption
:
this
.
deleteRowText
,
value
:
c_oAscDeleteOptions
.
DeleteRows
},
{
caption
:
this
.
deleteColumnText
,
value
:
c_oAscDeleteOptions
.
DeleteColumns
},
{
caption
:
this
.
deleteTableText
,
value
:
c_oAscDeleteOptions
.
Delete
Columns
}
{
caption
:
this
.
deleteTableText
,
value
:
c_oAscDeleteOptions
.
Delete
Table
}
]
})
});
...
...
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file @
5208331e
...
...
@@ -279,60 +279,47 @@ define([
this
.
_state
.
Range
=
props
.
asc_getTableRange
();
//for table-template
value
=
props
.
asc_getTableStyleName
();
if
(
this
.
_state
.
TemplateName
!==
value
||
this
.
_isTemplatesChanged
)
{
this
.
cmbTableTemplate
.
suspendEvents
();
var
rec
=
this
.
cmbTableTemplate
.
menuPicker
.
store
.
findWhere
({
name
:
value
});
this
.
cmbTableTemplate
.
menuPicker
.
selectRecord
(
rec
);
this
.
cmbTableTemplate
.
resumeEvents
();
if
(
this
.
_isTemplatesChanged
)
{
if
(
rec
)
this
.
cmbTableTemplate
.
fillComboView
(
this
.
cmbTableTemplate
.
menuPicker
.
getSelectedRec
(),
true
);
else
this
.
cmbTableTemplate
.
fillComboView
(
this
.
cmbTableTemplate
.
menuPicker
.
store
.
at
(
0
),
true
);
}
this
.
_state
.
TemplateName
=
value
;
}
this
.
_isTemplatesChanged
=
false
;
var
needTablePictures
=
false
;
value
=
props
.
asc_getFirstRow
();
if
(
this
.
_state
.
CheckHeader
!==
value
)
{
this
.
chHeader
.
setValue
(
value
,
true
);
this
.
_state
.
CheckHeader
=
value
;
needTablePictures
=
true
;
}
value
=
props
.
asc_getLastRow
();
if
(
this
.
_state
.
CheckTotal
!==
value
)
{
this
.
chTotal
.
setValue
(
value
,
true
);
this
.
_state
.
CheckTotal
=
value
;
needTablePictures
=
true
;
}
value
=
props
.
asc_getBandHor
();
if
(
this
.
_state
.
CheckBanded
!==
value
)
{
this
.
chBanded
.
setValue
(
value
,
true
);
this
.
_state
.
CheckBanded
=
value
;
needTablePictures
=
true
;
}
value
=
props
.
asc_getFirstCol
();
if
(
this
.
_state
.
CheckFirst
!==
value
)
{
this
.
chFirst
.
setValue
(
value
,
true
);
this
.
_state
.
CheckFirst
=
value
;
needTablePictures
=
true
;
}
value
=
props
.
asc_getLastCol
();
if
(
this
.
_state
.
CheckLast
!==
value
)
{
this
.
chLast
.
setValue
(
value
,
true
);
this
.
_state
.
CheckLast
=
value
;
needTablePictures
=
true
;
}
value
=
props
.
asc_getBandVer
();
if
(
this
.
_state
.
CheckColBanded
!==
value
)
{
this
.
chColBanded
.
setValue
(
value
,
true
);
this
.
_state
.
CheckColBanded
=
value
;
needTablePictures
=
true
;
}
value
=
props
.
asc_getFilterButton
();
...
...
@@ -340,6 +327,29 @@ define([
this
.
chFilter
.
setValue
(
value
,
true
);
this
.
_state
.
CheckFilter
=
value
;
}
if
(
needTablePictures
)
this
.
onApiInitTableTemplates
(
this
.
api
.
asc_getTablePictures
(
props
));
//for table-template
value
=
props
.
asc_getTableStyleName
();
if
(
this
.
_state
.
TemplateName
!==
value
||
this
.
_isTemplatesChanged
)
{
this
.
cmbTableTemplate
.
suspendEvents
();
var
rec
=
this
.
cmbTableTemplate
.
menuPicker
.
store
.
findWhere
({
name
:
value
});
this
.
cmbTableTemplate
.
menuPicker
.
selectRecord
(
rec
);
this
.
cmbTableTemplate
.
resumeEvents
();
if
(
this
.
_isTemplatesChanged
)
{
if
(
rec
)
this
.
cmbTableTemplate
.
fillComboView
(
this
.
cmbTableTemplate
.
menuPicker
.
getSelectedRec
(),
true
);
else
this
.
cmbTableTemplate
.
fillComboView
(
this
.
cmbTableTemplate
.
menuPicker
.
store
.
at
(
0
),
true
);
}
this
.
_state
.
TemplateName
=
value
;
}
this
.
_isTemplatesChanged
=
false
;
}
},
...
...
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