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
30f3d833
Commit
30f3d833
authored
Apr 25, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete argument 'fromBinary' from setSelectionInfo
parent
de2558be
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
15 deletions
+10
-15
cell/model/clipboard.js
cell/model/clipboard.js
+6
-5
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+4
-10
No files found.
cell/model/clipboard.js
View file @
30f3d833
...
@@ -1098,6 +1098,7 @@
...
@@ -1098,6 +1098,7 @@
var
oBinaryFileReader
=
new
AscCommonExcel
.
BinaryFileReader
(
true
);
var
oBinaryFileReader
=
new
AscCommonExcel
.
BinaryFileReader
(
true
);
var
tempWorkbook
=
new
AscCommonExcel
.
Workbook
();
var
tempWorkbook
=
new
AscCommonExcel
.
Workbook
();
var
t
=
this
;
var
t
=
this
;
var
newFonts
;
pptx_content_loader
.
Start_UseFullUrl
();
pptx_content_loader
.
Start_UseFullUrl
();
oBinaryFileReader
.
Read
(
base64
,
tempWorkbook
);
oBinaryFileReader
.
Read
(
base64
,
tempWorkbook
);
...
@@ -1137,7 +1138,7 @@
...
@@ -1137,7 +1138,7 @@
else
if
(
!
(
window
[
"
Asc
"
][
"
editor
"
]
&&
window
[
"
Asc
"
][
"
editor
"
].
isChartEditor
))
else
if
(
!
(
window
[
"
Asc
"
][
"
editor
"
]
&&
window
[
"
Asc
"
][
"
editor
"
].
isChartEditor
))
{
{
var
newFonts
=
{};
newFonts
=
{};
for
(
var
i
=
0
;
i
<
pasteData
.
Drawings
.
length
;
i
++
)
for
(
var
i
=
0
;
i
<
pasteData
.
Drawings
.
length
;
i
++
)
{
{
pasteData
.
Drawings
[
i
].
graphicObject
.
getAllFonts
(
newFonts
);
pasteData
.
Drawings
[
i
].
graphicObject
.
getAllFonts
(
newFonts
);
...
@@ -1178,10 +1179,10 @@
...
@@ -1178,10 +1179,10 @@
}
}
else
if
(
this
.
_checkPasteFromBinaryExcel
(
worksheet
,
true
,
pasteData
))
else
if
(
this
.
_checkPasteFromBinaryExcel
(
worksheet
,
true
,
pasteData
))
{
{
var
newFonts
=
{};
newFonts
=
{};
pasteData
.
generateFontMap
(
newFonts
);
pasteData
.
generateFontMap
(
newFonts
);
worksheet
.
_loadFonts
(
newFonts
,
function
()
{
worksheet
.
_loadFonts
(
newFonts
,
function
()
{
worksheet
.
setSelectionInfo
(
'
paste
'
,
pasteData
,
false
,
true
);
worksheet
.
setSelectionInfo
(
'
paste
'
,
{
data
:
pasteData
,
fromBinary
:
true
}
);
});
});
}
}
}
}
...
@@ -2665,7 +2666,7 @@
...
@@ -2665,7 +2666,7 @@
var
aResult
=
this
.
_getTableFromText
(
worksheet
,
text
);
var
aResult
=
this
.
_getTableFromText
(
worksheet
,
text
);
if
(
aResult
&&
!
(
aResult
.
onlyImages
&&
window
[
"
Asc
"
][
"
editor
"
]
&&
window
[
"
Asc
"
][
"
editor
"
].
isChartEditor
))
if
(
aResult
&&
!
(
aResult
.
onlyImages
&&
window
[
"
Asc
"
][
"
editor
"
]
&&
window
[
"
Asc
"
][
"
editor
"
].
isChartEditor
))
{
{
worksheet
.
setSelectionInfo
(
'
paste
'
,
aResult
,
this
);
worksheet
.
setSelectionInfo
(
'
paste
'
,
{
data
:
aResult
}
);
}
}
},
},
...
@@ -2981,7 +2982,7 @@
...
@@ -2981,7 +2982,7 @@
this
.
aResult
.
props
.
_images
=
pasteData
.
images
&&
pasteData
.
images
.
length
?
pasteData
.
images
:
this
.
aResult
.
props
.
_images
;
this
.
aResult
.
props
.
_images
=
pasteData
.
images
&&
pasteData
.
images
.
length
?
pasteData
.
images
:
this
.
aResult
.
props
.
_images
;
this
.
aResult
.
props
.
_aPastedImages
=
pasteData
.
aPastedImages
&&
pasteData
.
aPastedImages
.
length
?
pasteData
.
aPastedImages
:
this
.
aResult
.
props
.
_aPastedImages
;
this
.
aResult
.
props
.
_aPastedImages
=
pasteData
.
aPastedImages
&&
pasteData
.
aPastedImages
.
length
?
pasteData
.
aPastedImages
:
this
.
aResult
.
props
.
_aPastedImages
;
worksheet
.
setSelectionInfo
(
'
paste
'
,
this
.
aResult
,
this
);
worksheet
.
setSelectionInfo
(
'
paste
'
,
{
data
:
this
.
aResult
}
);
},
},
_parseChildren
:
function
(
children
)
_parseChildren
:
function
(
children
)
...
...
cell/view/WorksheetView.js
View file @
30f3d833
...
@@ -8476,7 +8476,7 @@
...
@@ -8476,7 +8476,7 @@
}
}
};
};
WorksheetView
.
prototype
.
setSelectionInfo
=
function
(
prop
,
val
,
onlyActive
,
fromBinary
)
{
WorksheetView
.
prototype
.
setSelectionInfo
=
function
(
prop
,
val
,
onlyActive
)
{
// Проверка глобального лока
// Проверка глобального лока
if
(
this
.
collaborativeEditing
.
getGlobalLock
())
{
if
(
this
.
collaborativeEditing
.
getGlobalLock
())
{
return
;
return
;
...
@@ -8717,7 +8717,7 @@
...
@@ -8717,7 +8717,7 @@
var
clipboardBase
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
var
clipboardBase
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
clipboardBase
.
specialPasteProps
=
clipboardBase
.
specialPasteProps
?
clipboardBase
.
specialPasteProps
:
new
Asc
.
SpecialPasteProps
();
clipboardBase
.
specialPasteProps
=
clipboardBase
.
specialPasteProps
?
clipboardBase
.
specialPasteProps
:
new
Asc
.
SpecialPasteProps
();
t
.
_loadDataBeforePaste
(
isLargeRange
,
fromBinary
,
val
,
bIsUpdate
,
canChangeColWidth
);
t
.
_loadDataBeforePaste
(
isLargeRange
,
val
.
fromBinary
,
val
.
data
,
bIsUpdate
,
canChangeColWidth
);
bIsUpdate
=
false
;
bIsUpdate
=
false
;
break
;
break
;
case
"
hyperlink
"
:
case
"
hyperlink
"
:
...
@@ -8767,7 +8767,7 @@
...
@@ -8767,7 +8767,7 @@
}
}
//в случае, если вставляем из глобального буфера, транзакцию закрываем внутри функции _loadDataBeforePaste на callbacks от загрузки шрифтов и картинок
//в случае, если вставляем из глобального буфера, транзакцию закрываем внутри функции _loadDataBeforePaste на callbacks от загрузки шрифтов и картинок
if
(
prop
!==
"
paste
"
||
(
prop
===
"
paste
"
&&
fromBinary
))
{
if
(
prop
!==
"
paste
"
||
(
prop
===
"
paste
"
&&
val
.
fromBinary
))
{
History
.
EndTransaction
();
History
.
EndTransaction
();
AscCommonExcel
.
g_clipboardExcel
.
end_paste
();
AscCommonExcel
.
g_clipboardExcel
.
end_paste
();
}
}
...
@@ -8779,13 +8779,7 @@
...
@@ -8779,13 +8779,7 @@
}
}
if
(
"
paste
"
===
prop
&&
val
.
onlyImages
!==
true
)
{
if
(
"
paste
"
===
prop
&&
val
.
onlyImages
!==
true
)
{
var
newRange
;
var
newRange
=
val
.
fromBinary
?
this
.
_pasteFromBinary
(
val
.
data
,
true
)
:
this
.
_pasteFromHTML
(
val
.
data
,
true
);
if
(
fromBinary
)
{
newRange
=
this
.
_pasteFromBinary
(
val
,
true
);
}
else
{
newRange
=
this
.
_pasteFromHTML
(
val
,
true
);
}
var
g_clipboardBase
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
var
g_clipboardBase
=
window
[
'
AscCommon
'
].
g_clipboardBase
;
if
(
!
AscCommonExcel
.
g_clipboardExcel
.
specialPasteStart
)
{
if
(
!
AscCommonExcel
.
g_clipboardExcel
.
specialPasteStart
)
{
g_clipboardBase
.
specialPasteUndoData
.
data
=
g_clipboardBase
.
specialPasteUndoData
.
data
=
...
...
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