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
be4d574e
Commit
be4d574e
authored
Oct 07, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix find and replace
parent
a409cd22
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
98 additions
and
125 deletions
+98
-125
cell/utils/utils.js
cell/utils/utils.js
+2
-2
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+2
-2
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+94
-121
No files found.
cell/utils/utils.js
View file @
be4d574e
...
...
@@ -1753,7 +1753,7 @@
this
.
isReplaceAll
=
false
;
// заменить все (если у нас замена)
// внутренние переменные
this
.
active
Range
=
null
;
this
.
active
Cell
=
null
;
this
.
indexInArray
=
0
;
this
.
countFind
=
0
;
this
.
countReplace
=
0
;
...
...
@@ -1774,7 +1774,7 @@
result
.
replaceWith
=
this
.
replaceWith
;
result
.
isReplaceAll
=
this
.
isReplaceAll
;
result
.
active
Range
=
this
.
activeRange
?
this
.
activeRange
.
clone
()
:
null
;
result
.
active
Cell
=
this
.
activeCell
?
this
.
activeCell
.
clone
()
:
null
;
result
.
indexInArray
=
this
.
indexInArray
;
result
.
countFind
=
this
.
countFind
;
result
.
countReplace
=
this
.
countReplace
;
...
...
cell/view/WorkbookView.js
View file @
be4d574e
...
...
@@ -2136,7 +2136,7 @@
// Поиск текста в листе
WorkbookView
.
prototype
.
findCellText
=
function
(
options
)
{
// Для поиска эта переменная не нужна (но она может остаться от replace)
options
.
active
Range
=
null
;
options
.
active
Cell
=
null
;
var
ws
=
this
.
getWorksheet
();
// Останавливаем ввод данных в редакторе ввода
...
...
@@ -2198,7 +2198,7 @@
}
if
(
result
)
{
return
ws
.
_setActiveCell
(
result
.
c1
,
result
.
r1
);
return
ws
.
setSelection
(
result
);
}
this
.
_cleanFindResults
();
return
null
;
...
...
cell/view/WorksheetView.js
View file @
be4d574e
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