[SSE] Fill groups for special paste. Add item for Text import
This commit is contained in:
Julia Radzhabova
parent
0dcc980e9f
commit
da22437f35
|
|
@ -2135,23 +2135,25 @@ define([
|
||||||
// Prepare menu container
|
// Prepare menu container
|
||||||
if (pasteContainer.length < 1) {
|
if (pasteContainer.length < 1) {
|
||||||
me._arrSpecialPaste = [];
|
me._arrSpecialPaste = [];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.txtPaste;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = [me.txtPaste, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormula] = me.txtPasteFormulas;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormula] = [me.txtPasteFormulas, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaNumberFormat] = me.txtPasteFormulaNumFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaNumberFormat] = [me.txtPasteFormulaNumFormat, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaAllFormatting] = me.txtPasteKeepSourceFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaAllFormatting] = [me.txtPasteKeepSourceFormat, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaWithoutBorders] = me.txtPasteBorders;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaWithoutBorders] = [me.txtPasteBorders, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaColumnWidth] = me.txtPasteColWidths;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaColumnWidth] = [me.txtPasteColWidths, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.mergeConditionalFormating] = me.txtPasteMerge;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.mergeConditionalFormating] = [me.txtPasteMerge, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyValues] = me.txtPasteValues;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.transpose] = [me.txtPasteTranspose, 0];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueNumberFormat] = me.txtPasteValNumFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyValues] = [me.txtPasteValues, 1];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueAllFormating] = me.txtPasteValFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueNumberFormat] = [me.txtPasteValNumFormat, 1];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormating] = me.txtPasteFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueAllFormating] = [me.txtPasteValFormat, 1];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.transpose] = me.txtPasteTranspose;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormating] = [me.txtPasteFormat, 2];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.link] = me.txtPasteLink;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.link] = [me.txtPasteLink, 2];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture] = me.txtPastePicture;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture] = [me.txtPastePicture, 2];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.linkedPicture] = me.txtPasteLinkPicture;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.linkedPicture] = [me.txtPasteLinkPicture, 2];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.sourceformatting] = me.txtPasteSourceFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.sourceformatting] = [me.txtPasteSourceFormat, 2];
|
||||||
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.destinationFormatting] = me.txtPasteDestFormat;
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.destinationFormatting] = [me.txtPasteDestFormat, 2];
|
||||||
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.keepTextOnly] = [me.txtKeepTextOnly, 2];
|
||||||
|
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.useTextImport] = [me.txtUseTextImport, 3];
|
||||||
|
|
||||||
pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
|
pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
|
||||||
documentHolderView.cmpEl.append(pasteContainer);
|
documentHolderView.cmpEl.append(pasteContainer);
|
||||||
|
|
@ -2170,28 +2172,55 @@ define([
|
||||||
menu.removeItem(menu.items[i]);
|
menu.removeItem(menu.items[i]);
|
||||||
i--;
|
i--;
|
||||||
}
|
}
|
||||||
|
var groups = [];
|
||||||
|
for (var i = 0; i < 3; i++) {
|
||||||
|
groups[i] = [];
|
||||||
|
}
|
||||||
|
|
||||||
var group_prev = -1;
|
var importText;
|
||||||
_.each(pasteItems, function(menuItem, index) {
|
_.each(pasteItems, function(menuItem, index) {
|
||||||
var group = (menuItem<7) ? 0 : (menuItem>9 ? 2 : 1);
|
if (menuItem == Asc.c_oSpecialPasteProps.useTextImport) {
|
||||||
if (group_prev !== group && group_prev>=0)
|
importText = new Common.UI.MenuItem({
|
||||||
menu.addItem(new Common.UI.MenuItem({ caption: '--' }));
|
caption: me._arrSpecialPaste[menuItem][0],
|
||||||
group_prev = group;
|
value: menuItem
|
||||||
|
}).on('click', function(item, e) {
|
||||||
var mnu = new Common.UI.MenuItem({
|
var props = new Asc.SpecialPasteProps();
|
||||||
caption: me._arrSpecialPaste[menuItem],
|
props.asc_setProps(item.value);
|
||||||
value: menuItem,
|
me.api.asc_SpecialPaste(props);
|
||||||
checkable: true,
|
setTimeout(function(){menu.hide();}, 100);
|
||||||
toggleGroup : 'specialPasteGroup'
|
});
|
||||||
}).on('click', function(item, e) {
|
} else {
|
||||||
var props = new Asc.SpecialPasteProps();
|
var mnu = new Common.UI.MenuItem({
|
||||||
props.asc_setProps(item.value);
|
caption: me._arrSpecialPaste[menuItem][0],
|
||||||
me.api.asc_SpecialPaste(props);
|
value: menuItem,
|
||||||
setTimeout(function(){menu.hide();}, 100);
|
checkable: true,
|
||||||
});
|
toggleGroup : 'specialPasteGroup'
|
||||||
menu.addItem(mnu);
|
}).on('click', function(item, e) {
|
||||||
|
var props = new Asc.SpecialPasteProps();
|
||||||
|
props.asc_setProps(item.value);
|
||||||
|
me.api.asc_SpecialPaste(props);
|
||||||
|
setTimeout(function(){menu.hide();}, 100);
|
||||||
|
});
|
||||||
|
groups[me._arrSpecialPaste[menuItem][1]].push(mnu);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
var newgroup = false;
|
||||||
|
for (var i = 0; i < 3; i++) {
|
||||||
|
if (newgroup && groups[i].length>0) {
|
||||||
|
menu.addItem(new Common.UI.MenuItem({ caption: '--' }));
|
||||||
|
newgroup = false;
|
||||||
|
}
|
||||||
|
_.each(groups[i], function(menuItem, index) {
|
||||||
|
menu.addItem(menuItem);
|
||||||
|
newgroup = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
(menu.items.length>0) && menu.items[0].setChecked(true, true);
|
(menu.items.length>0) && menu.items[0].setChecked(true, true);
|
||||||
|
|
||||||
|
if (importText) {
|
||||||
|
menu.addItem(new Common.UI.MenuItem({ caption: '--' }));
|
||||||
|
menu.addItem(importText);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( coord[0].asc_getX()<0 || coord[0].asc_getY()<0) {
|
if ( coord[0].asc_getX()<0 || coord[0].asc_getY()<0) {
|
||||||
|
|
@ -3180,6 +3209,8 @@ define([
|
||||||
txtPasteLinkPicture: 'Linked Picture',
|
txtPasteLinkPicture: 'Linked Picture',
|
||||||
txtPasteSourceFormat: 'Source formatting',
|
txtPasteSourceFormat: 'Source formatting',
|
||||||
txtPasteDestFormat: 'Destination formatting',
|
txtPasteDestFormat: 'Destination formatting',
|
||||||
|
txtKeepTextOnly: 'Keep text only',
|
||||||
|
txtUseTextImport: 'Use text import wizard',
|
||||||
txtUndoExpansion: 'Undo table autoexpansion',
|
txtUndoExpansion: 'Undo table autoexpansion',
|
||||||
txtRedoExpansion: 'Redo table autoexpansion',
|
txtRedoExpansion: 'Redo table autoexpansion',
|
||||||
txtAnd: 'and',
|
txtAnd: 'and',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue