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
e85bc801
Commit
e85bc801
authored
Nov 25, 2016
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 33535
parent
cfd36293
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
5 deletions
+22
-5
cell/model/clipboard.js
cell/model/clipboard.js
+22
-5
No files found.
cell/model/clipboard.js
View file @
e85bc801
...
@@ -913,6 +913,7 @@
...
@@ -913,6 +913,7 @@
_pasteFromBinaryWord
:
function
(
worksheet
,
base64
,
isIntoShape
,
isCellEditMode
)
_pasteFromBinaryWord
:
function
(
worksheet
,
base64
,
isIntoShape
,
isCellEditMode
)
{
{
var
res
=
true
;
var
res
=
true
;
var
t
=
this
;
var
pasteData
=
this
.
ReadFromBinaryWord
(
base64
,
worksheet
);
var
pasteData
=
this
.
ReadFromBinaryWord
(
base64
,
worksheet
);
if
(
isCellEditMode
)
if
(
isCellEditMode
)
...
@@ -922,7 +923,15 @@
...
@@ -922,7 +923,15 @@
//insert binary from word into SHAPE
//insert binary from word into SHAPE
else
if
(
isIntoShape
)
else
if
(
isIntoShape
)
{
{
this
.
_insertBinaryIntoShapeContent
(
worksheet
,
pasteData
.
content
,
true
);
var
callback
=
function
(
isSuccess
)
{
if
(
isSuccess
)
{
t
.
_insertBinaryIntoShapeContent
(
worksheet
,
pasteData
.
content
,
true
);
}
};
worksheet
.
objectRender
.
controller
.
checkSelectedObjectsAndCallback2
(
callback
);
}
}
else
else
{
{
...
@@ -960,8 +969,15 @@
...
@@ -960,8 +969,15 @@
}
}
else
if
(
isIntoShape
)
else
if
(
isIntoShape
)
{
{
this
.
_insertBinaryIntoShapeContent
(
worksheet
,
docContent
)
var
callback
=
function
(
isSuccess
)
{
if
(
isSuccess
)
{
t
.
_insertBinaryIntoShapeContent
(
worksheet
,
docContent
)
}
};
worksheet
.
objectRender
.
controller
.
checkSelectedObjectsAndCallback2
(
callback
);
return
true
;
return
true
;
}
}
else
else
...
@@ -1084,10 +1100,11 @@
...
@@ -1084,10 +1100,11 @@
_insertBinaryIntoShapeContent
:
function
(
worksheet
,
content
,
isConvertToPPTX
)
_insertBinaryIntoShapeContent
:
function
(
worksheet
,
content
,
isConvertToPPTX
)
{
{
if
(
!
content
||
!
content
.
length
)
if
(
!
content
||
!
content
.
length
)
{
{
return
;
return
;
}
}
History
.
Create_NewPoint
();
History
.
Create_NewPoint
();
History
.
StartTransaction
();
History
.
StartTransaction
();
...
...
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