Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
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
sdkjs
Commits
3fba3d08
Commit
3fba3d08
authored
Mar 16, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asc_closeCellEditor add argument cancel - discard entered value and close cell editor
parent
4c1f0fbd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
cell/api.js
cell/api.js
+5
-5
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+4
-4
No files found.
cell/api.js
View file @
3fba3d08
...
...
@@ -2034,11 +2034,11 @@ var editor;
}
};
spreadsheet_api
.
prototype
.
asc_closeCellEditor
=
function
(
)
{
if
(
this
.
wb
)
{
this
.
wb
.
closeCellEditor
(
);
}
};
spreadsheet_api
.
prototype
.
asc_closeCellEditor
=
function
(
cancel
)
{
if
(
this
.
wb
)
{
this
.
wb
.
closeCellEditor
(
cancel
);
}
};
// Spreadsheet interface
...
...
cell/view/WorkbookView.js
View file @
3fba3d08
...
...
@@ -1393,8 +1393,8 @@
}
};
WorkbookView
.
prototype
.
_onStopCellEditing
=
function
()
{
return
this
.
cellEditor
.
close
(
true
);
WorkbookView
.
prototype
.
_onStopCellEditing
=
function
(
cancel
)
{
return
this
.
cellEditor
.
close
(
!
cancel
);
};
WorkbookView
.
prototype
.
_onCloseCellEditor
=
function
()
{
...
...
@@ -1914,11 +1914,11 @@
};
// Останавливаем ввод данных в редакторе ввода
WorkbookView
.
prototype
.
closeCellEditor
=
function
()
{
WorkbookView
.
prototype
.
closeCellEditor
=
function
(
cancel
)
{
var
ws
=
this
.
getWorksheet
();
// Останавливаем ввод данных в редакторе ввода
if
(
ws
.
getCellEditMode
()
&&
!
this
.
cellEditor
.
formulaIsOperator
()
/*&& !this.cellFormulaEnterWSOpen*/
)
{
this
.
_onStopCellEditing
();
this
.
_onStopCellEditing
(
cancel
);
}
};
...
...
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