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
be296d97
Commit
be296d97
authored
Jan 25, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setSelectionUndoRedo -> setSelection
parent
5b55c153
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
cell/api.js
cell/api.js
+1
-1
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+2
-2
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+7
-7
No files found.
cell/api.js
View file @
be296d97
...
...
@@ -1995,7 +1995,7 @@ var editor;
}
ws
=
this
.
wb
.
getWorksheet
();
d
=
ws
.
setSelection
UndoRedo
(
d
[
0
].
getBBox0
(),
true
);
d
=
ws
.
setSelection
(
d
[
0
].
getBBox0
(),
true
);
if
(
d
.
deltaX
)
{
this
.
controller
.
scrollHorizontal
(
d
.
deltaX
);
}
...
...
cell/view/WorkbookView.js
View file @
be296d97
...
...
@@ -930,7 +930,7 @@
WorkbookView
.
prototype
.
_onSetSelection
=
function
(
range
,
validRange
)
{
var
ws
=
this
.
getWorksheet
();
ws
.
_checkSelectionShape
();
var
d
=
ws
.
setSelection
UndoRedo
(
range
,
validRange
);
var
d
=
ws
.
setSelection
(
range
,
validRange
);
this
.
controller
.
scroll
(
d
);
};
...
...
@@ -2246,7 +2246,7 @@
}
if
(
result
)
{
return
ws
.
setSelection
UndoRedo
(
result
);
return
ws
.
setSelection
(
result
);
}
this
.
_cleanFindResults
();
return
null
;
...
...
cell/view/WorksheetView.js
View file @
be296d97
...
...
@@ -7245,7 +7245,7 @@
this
.
model
.
workbook
.
handlers
.
trigger
(
"
asc_onHideComment
"
);
this
.
_updateSelectionNameAndInfo
();
};
WorksheetView
.
prototype
.
setSelection
UndoRedo
=
function
(
range
,
validRange
)
{
WorksheetView
.
prototype
.
setSelection
=
function
(
range
,
validRange
)
{
// Проверка на валидность range.
if
(
validRange
&&
(
range
.
c2
>=
this
.
nColsCount
||
range
.
r2
>=
this
.
nRowsCount
))
{
if
(
range
.
c2
>=
this
.
nColsCount
)
{
...
...
@@ -11394,7 +11394,7 @@
//updates
if
(
styleName
&&
addNameColumn
)
{
t
.
setSelection
UndoRedo
(
filterRange
);
t
.
setSelection
(
filterRange
);
}
t
.
_onUpdateFormatTable
(
filterRange
,
!!
(
styleName
),
true
);
...
...
@@ -11834,7 +11834,7 @@
}
if
(
!
this
.
model
.
selectionRange
.
getLast
().
isEqual
(
range
))
{
this
.
setSelection
UndoRedo
(
range
);
this
.
setSelection
(
range
);
}
var
i
,
r
=
range
.
r1
,
bIsUpdate
=
false
,
w
;
...
...
@@ -12536,7 +12536,7 @@
if
(
tablePart
.
Ref
.
intersection
(
activeRange
))
{
if
(
t
.
model
.
autoFilters
.
_activeRangeContainsTablePart
(
activeRange
,
tablePart
.
Ref
))
{
var
newActiveRange
=
new
Asc
.
Range
(
tablePart
.
Ref
.
c1
,
tablePart
.
Ref
.
r1
,
tablePart
.
Ref
.
c2
,
tablePart
.
Ref
.
r2
);
t
.
setSelection
UndoRedo
(
newActiveRange
);
t
.
setSelection
(
newActiveRange
);
}
break
;
...
...
@@ -12550,7 +12550,7 @@
if
(
tableParts
[
i
].
HeaderRowCount
!==
0
&&
tableParts
[
i
].
Ref
.
containsRange
(
activeRange
)
&&
tableParts
[
i
].
Ref
.
r1
===
activeRange
.
r1
)
{
var
newActiveRange
=
new
Asc
.
Range
(
activeRange
.
c1
,
activeRange
.
r1
,
activeRange
.
c1
,
tableParts
[
i
].
Ref
.
r2
);
if
(
!
activeRange
.
isEqual
(
newActiveRange
))
{
t
.
setSelection
UndoRedo
(
newActiveRange
);
t
.
setSelection
(
newActiveRange
);
}
break
;
}
...
...
@@ -12669,7 +12669,7 @@
}
}
t
.
setSelection
UndoRedo
(
new
Asc
.
Range
(
startCol
,
startRow
,
endCol
,
endRow
));
t
.
setSelection
(
new
Asc
.
Range
(
startCol
,
startRow
,
endCol
,
endRow
));
};
WorksheetView
.
prototype
.
af_changeFormatTableInfo
=
function
(
tableName
,
optionType
,
val
)
{
...
...
@@ -12698,7 +12698,7 @@
var
endRow
=
newTableRef
.
r2
<
ar
.
r2
?
newTableRef
.
r2
:
ar
.
r2
;
var
newActiveRange
=
new
Asc
.
Range
(
ar
.
c1
,
startRow
,
ar
.
c2
,
endRow
);
t
.
setSelection
UndoRedo
(
newActiveRange
);
t
.
setSelection
(
newActiveRange
);
History
.
SetSelectionRedo
(
newActiveRange
);
}
...
...
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