From 880e46bd2628920042a2115a14cd28dbf61c877c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 11 May 2017 16:30:24 +0300 Subject: [PATCH] [DE] Debug special paste. --- .../main/app/view/DocumentHolder.js | 39 +------------------ apps/documenteditor/main/locale/en.json | 17 +------- 2 files changed, 3 insertions(+), 53 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index f024d5f94..109e7d5a4 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -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 = $('
'); 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 diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 38a031bd2..2edaf034b 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -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",