Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
web-apps
Commits
880e46bd
Commit
880e46bd
authored
May 11, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Debug special paste.
parent
88e3f576
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
53 deletions
+3
-53
apps/documenteditor/main/app/view/DocumentHolder.js
apps/documenteditor/main/app/view/DocumentHolder.js
+2
-37
apps/documenteditor/main/locale/en.json
apps/documenteditor/main/locale/en.json
+1
-16
No files found.
apps/documenteditor/main/app/view/DocumentHolder.js
View file @
880e46bd
...
...
@@ -583,22 +583,7 @@ define([
if
(
pasteContainer
.
length
<
1
)
{
me
.
_arrSpecialPaste
=
[];
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
paste
]
=
me
.
textPaste
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
pasteOnlyFormula
]
=
me
.
txtPasteFormulas
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
formulaNumberFormat
]
=
me
.
txtPasteFormulaNumFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
formulaAllFormatting
]
=
me
.
txtPasteKeepSourceFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
formulaWithoutBorders
]
=
me
.
txtPasteBorders
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
formulaColumnWidth
]
=
me
.
txtPasteColWidths
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
mergeConditionalFormating
]
=
me
.
txtPasteMerge
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
pasteOnlyValues
]
=
me
.
txtPasteValues
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
valueNumberFormat
]
=
me
.
txtPasteValNumFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
valueAllFormating
]
=
me
.
txtPasteValFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
pasteOnlyFormating
]
=
me
.
txtPasteFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
transpose
]
=
me
.
txtPasteTranspose
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
link
]
=
me
.
txtPasteLink
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
picture
]
=
me
.
txtPastePicture
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
linkedPicture
]
=
me
.
txtPasteLinkPicture
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
sourceformatting
]
=
me
.
txtPasteSourceFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
destinationFormatting
]
=
me
.
txtPasteDestFormat
;
me
.
_arrSpecialPaste
[
Asc
.
c_oSpecialPasteProps
.
keepTextOnly
]
=
me
.
txtKeepTextOnly
;
pasteContainer
=
$
(
'
<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>
'
);
me
.
cmpEl
.
append
(
pasteContainer
);
...
...
@@ -620,11 +605,6 @@ define([
var
group_prev
=
-
1
;
_
.
each
(
pasteItems
,
function
(
menuItem
,
index
)
{
var
group
=
(
menuItem
<
7
)
?
0
:
(
menuItem
>
9
?
2
:
1
);
if
(
group_prev
!==
group
&&
group_prev
>=
0
)
menu
.
addItem
(
new
Common
.
UI
.
MenuItem
({
caption
:
'
--
'
}));
group_prev
=
group
;
var
mnu
=
new
Common
.
UI
.
MenuItem
({
caption
:
me
.
_arrSpecialPaste
[
menuItem
],
value
:
menuItem
,
...
...
@@ -3421,22 +3401,7 @@ define([
txtDeleteRadical
:
'
Delete radical
'
,
txtDeleteChars
:
'
Delete enclosing characters
'
,
txtDeleteCharsAndSeparators
:
'
Delete enclosing characters and separators
'
,
txtPasteFormulas
:
'
Paste only formula
'
,
txtPasteFormulaNumFormat
:
'
Formula + number format
'
,
txtPasteKeepSourceFormat
:
'
Formula + all formatting
'
,
txtPasteBorders
:
'
Formula without borders
'
,
txtPasteColWidths
:
'
Formula + column width
'
,
txtPasteMerge
:
'
Merge conditional formatting
'
,
txtPasteTranspose
:
'
Transpose
'
,
txtPasteValues
:
'
Paste only value
'
,
txtPasteValNumFormat
:
'
Value + number format
'
,
txtPasteValFormat
:
'
Value + all formatting
'
,
txtPasteFormat
:
'
Paste only formatting
'
,
txtPasteLink
:
'
Paste Link
'
,
txtPastePicture
:
'
Picture
'
,
txtPasteLinkPicture
:
'
Linked Picture
'
,
txtPasteSourceFormat
:
'
Source formatting
'
,
txtPasteDestFormat
:
'
Destination formatting
'
txtKeepTextOnly
:
'
Keep text only
'
},
DE
.
Views
.
DocumentHolder
||
{}));
});
\ No newline at end of file
apps/documenteditor/main/locale/en.json
View file @
880e46bd
...
...
@@ -835,22 +835,7 @@
"DE.Views.DocumentHolder.txtUngroup"
:
"Ungroup"
,
"DE.Views.DocumentHolder.updateStyleText"
:
"Update %1 style"
,
"DE.Views.DocumentHolder.vertAlignText"
:
"Vertical Alignment"
,
"DE.Views.DocumentHolder.txtPasteFormulas"
:
"Paste only formula"
,
"DE.Views.DocumentHolder.txtPasteFormulaNumFormat"
:
"Formula + number format"
,
"DE.Views.DocumentHolder.txtPasteKeepSourceFormat"
:
"Formula + all formatting"
,
"DE.Views.DocumentHolder.txtPasteBorders"
:
"Formula without borders"
,
"DE.Views.DocumentHolder.txtPasteColWidths"
:
"Formula + column width"
,
"DE.Views.DocumentHolder.txtPasteMerge"
:
"Merge conditional formatting"
,
"DE.Views.DocumentHolder.txtPasteTranspose"
:
"Transpose"
,
"DE.Views.DocumentHolder.txtPasteValues"
:
"Paste only value"
,
"DE.Views.DocumentHolder.txtPasteValNumFormat"
:
"Value + number format"
,
"DE.Views.DocumentHolder.txtPasteValFormat"
:
"Value + all formatting"
,
"DE.Views.DocumentHolder.txtPasteFormat"
:
"Paste only formatting"
,
"DE.Views.DocumentHolder.txtPasteLink"
:
"Paste link"
,
"DE.Views.DocumentHolder.txtPastePicture"
:
"Picture"
,
"DE.Views.DocumentHolder.txtPasteLinkPicture"
:
"Linked picture"
,
"DE.Views.DocumentHolder.txtPasteSourceFormat"
:
"Source formatting"
,
"DE.Views.DocumentHolder.txtPasteDestFormat"
:
"Destination formatting"
,
"DE.Views.DocumentHolder.txtKeepTextOnly"
:
"Keep text only"
,
"DE.Views.DropcapSettingsAdvanced.cancelButtonText"
:
"Cancel"
,
"DE.Views.DropcapSettingsAdvanced.okButtonText"
:
"Ok"
,
"DE.Views.DropcapSettingsAdvanced.strBorders"
:
"Borders & Fill"
,
...
...
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