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
af3ac6e5
Commit
af3ac6e5
authored
Apr 25, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete argument skipNLCheck
parent
1a300e3b
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
193 additions
and
199 deletions
+193
-199
cell/view/CellEditorView.js
cell/view/CellEditorView.js
+4
-5
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+189
-194
No files found.
cell/view/CellEditorView.js
View file @
af3ac6e5
...
@@ -319,9 +319,9 @@
...
@@ -319,9 +319,9 @@
};
};
CellEditor
.
prototype
.
close
=
function
(
saveValue
)
{
CellEditor
.
prototype
.
close
=
function
(
saveValue
)
{
var
opt
=
this
.
options
,
ret
;
var
opt
=
this
.
options
;
if
(
saveValue
&&
"
function
"
===
typeof
opt
.
saveValueCallback
)
{
if
(
saveValue
)
{
var
isFormula
=
this
.
isFormula
();
var
isFormula
=
this
.
isFormula
();
// Для формул делаем пересчет всегда. Для остального - только если мы изменили что-то. http://bugzilla.onlyoffice.com/show_bug.cgi?id=31889
// Для формул делаем пересчет всегда. Для остального - только если мы изменили что-то. http://bugzilla.onlyoffice.com/show_bug.cgi?id=31889
// Сюда же добавляется и ячейка с wrap-текстом, у которой выключен wrap.
// Сюда же добавляется и ячейка с wrap-текстом, у которой выключен wrap.
...
@@ -336,8 +336,7 @@
...
@@ -336,8 +336,7 @@
this
.
noUpdateMode
=
false
;
this
.
noUpdateMode
=
false
;
}
}
ret
=
opt
.
saveValueCallback
(
opt
.
fragments
,
this
.
textFlags
,
/*skip NL check*/
ret
);
if
(
!
opt
.
saveValueCallback
(
opt
.
fragments
,
this
.
textFlags
))
{
if
(
!
ret
)
{
// При ошибке нужно выставить флаг, чтобы по стрелкам не закрывался редактор
// При ошибке нужно выставить флаг, чтобы по стрелкам не закрывался редактор
this
.
handlers
.
trigger
(
'
setStrictClose
'
,
true
);
this
.
handlers
.
trigger
(
'
setStrictClose
'
,
true
);
return
false
;
return
false
;
...
@@ -786,7 +785,7 @@
...
@@ -786,7 +785,7 @@
this
.
options
.
fragments
),
t
=
this
,
ret
=
false
,
range
,
wsOPEN
=
this
.
handlers
.
trigger
(
this
.
options
.
fragments
),
t
=
this
,
ret
=
false
,
range
,
wsOPEN
=
this
.
handlers
.
trigger
(
"
getCellFormulaEnterWSOpen
"
),
ws
=
wsOPEN
?
wsOPEN
.
model
:
this
.
handlers
.
trigger
(
"
getActiveWS
"
);
"
getCellFormulaEnterWSOpen
"
),
ws
=
wsOPEN
?
wsOPEN
.
model
:
this
.
handlers
.
trigger
(
"
getActiveWS
"
);
if
(
s
.
length
<
1
||
s
.
charAt
(
0
)
!==
"
=
"
||
this
.
options
.
cellNumFormat
==
Asc
.
c_oAscNumFormatType
.
Text
)
{
if
(
Asc
.
c_oAscNumFormatType
.
Text
===
this
.
options
.
cellNumFormat
||
s
.
length
<
1
||
s
.
charAt
(
0
)
!==
"
=
"
)
{
return
ret
;
return
ret
;
}
}
...
...
cell/view/WorksheetView.js
View file @
af3ac6e5
This diff is collapsed.
Click to expand it.
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