[DE] Refactoring text and table context menu

This commit is contained in:
Julia Radzhabova 2022-05-04 22:18:04 +03:00
parent 4d3ce4c3da
commit 16587b4b44
2 changed files with 212 additions and 199 deletions

View file

@ -250,6 +250,7 @@ define([
view.menuViewCopy.on('click', _.bind(me.onCutCopyPaste, me)); view.menuViewCopy.on('click', _.bind(me.onCutCopyPaste, me));
view.menuViewPaste.on('click', _.bind(me.onCutCopyPaste, me)); view.menuViewPaste.on('click', _.bind(me.onCutCopyPaste, me));
view.menuViewCut.on('click', _.bind(me.onCutCopyPaste, me)); view.menuViewCut.on('click', _.bind(me.onCutCopyPaste, me));
view.menuViewUndo.on('click', _.bind(me.onUndo, me));
view.menuViewAddComment.on('click', _.bind(me.addComment, me)); view.menuViewAddComment.on('click', _.bind(me.addComment, me));
view.menuSignatureViewSign.on('click', _.bind(me.onSignatureClick, me)); view.menuSignatureViewSign.on('click', _.bind(me.onSignatureClick, me));
view.menuSignatureDetails.on('click', _.bind(me.onSignatureClick, me)); view.menuSignatureDetails.on('click', _.bind(me.onSignatureClick, me));
@ -369,10 +370,12 @@ define([
view.menuParagraphAdvanced.on('click', _.bind(me.advancedParagraphClick, me)); view.menuParagraphAdvanced.on('click', _.bind(me.advancedParagraphClick, me));
view.menuEditHyperlinkTable.on('click', _.bind(me.editHyperlink, me)); view.menuEditHyperlinkTable.on('click', _.bind(me.editHyperlink, me));
view.menuEditHyperlinkPara.on('click', _.bind(me.editHyperlink, me)); view.menuEditHyperlinkPara.on('click', _.bind(me.editHyperlink, me));
view.menuAddCommentTable.on('click', _.bind(me.addComment, me)); view.menuRemoveHyperlinkTable.on('click', _.bind(me.onRemoveHyperlink, me));
view.menuAddCommentPara.on('click', _.bind(me.addComment, me)); view.menuRemoveHyperlinkPara.on('click', _.bind(me.onRemoveHyperlink, me));
view.menuAddHyperlinkTable.on('click', _.bind(me.addHyperlink, me)); view.menuAddHyperlinkTable.on('click', _.bind(me.addHyperlink, me));
view.menuAddHyperlinkPara.on('click', _.bind(me.addHyperlink, me)); view.menuAddHyperlinkPara.on('click', _.bind(me.addHyperlink, me));
view.menuAddCommentTable.on('click', _.bind(me.addComment, me));
view.menuAddCommentPara.on('click', _.bind(me.addComment, me));
view.menuTableFollow.on('click', _.bind(me.onFollowMove, me)); view.menuTableFollow.on('click', _.bind(me.onFollowMove, me));
view.menuParaFollow.on('click', _.bind(me.onFollowMove, me)); view.menuParaFollow.on('click', _.bind(me.onFollowMove, me));
view.menuTableStartNewList.on('click', _.bind(me.onStartNumbering, me, 1)); view.menuTableStartNewList.on('click', _.bind(me.onStartNumbering, me, 1));
@ -398,6 +401,26 @@ define([
view.menuOriginalSize.on('click', _.bind(me.onImgOriginalSize, me)); view.menuOriginalSize.on('click', _.bind(me.onImgOriginalSize, me));
view.menuImgReplace.menu.on('item:click', _.bind(me.onImgReplace, me)); view.menuImgReplace.menu.on('item:click', _.bind(me.onImgReplace, me));
view.menuImgEditPoints.on('click', _.bind(me.onImgEditPoints, me)); view.menuImgEditPoints.on('click', _.bind(me.onImgEditPoints, me));
view.mnuTableMerge.on('click', _.bind(me.onTableMerge, me));
view.mnuTableSplit.on('click', _.bind(me.onTableSplit, me));
view.menuIgnoreSpellTable.on('click', _.bind(me.onIgnoreSpell, me));
view.menuIgnoreSpellPara.on('click', _.bind(me.onIgnoreSpell, me));
view.menuIgnoreAllSpellTable.on('click', _.bind(me.onIgnoreSpell, me));
view.menuIgnoreAllSpellPara.on('click', _.bind(me.onIgnoreSpell, me));
view.menuToDictionaryTable.on('click', _.bind(me.onToDictionary, me));
view.menuToDictionaryPara.on('click', _.bind(me.onToDictionary, me));
view.menuTableDistRows.on('click', _.bind(me.onTableDist, me));
view.menuTableDistCols.on('click', _.bind(me.onTableDist, me));
view.menuTableDirection.menu.on('item:click', _.bind(me.tableDirection, me));
view.menuTableRefreshField.on('click', _.bind(me.onRefreshField, me));
view.menuParaRefreshField.on('click', _.bind(me.onRefreshField, me));
view.menuParagraphBreakBefore.on('click', _.bind(me.onParagraphBreakBefore, me));
view.menuParagraphKeepLines.on('click', _.bind(me.onParagraphKeepLines, me));
view.menuParagraphVAlign.menu.on('item:click', _.bind(me.paragraphVAlign, me));
view.menuParagraphDirection.menu.on('item:click', _.bind(me.paragraphDirection, me));
view.langParaMenu.menu.on('item:click', _.bind(me.onLangMenu, me, 'para'));
view.langTableMenu.menu.on('item:click', _.bind(me.onLangMenu, me, 'table'));
}, },
getView: function (name) { getView: function (name) {
@ -1549,6 +1572,11 @@ define([
} }
}, },
onRemoveHyperlink: function(item, e){
this.api && this.api.remove_Hyperlink(item.hyperProps.value);
this.documentHolder.fireEvent('editcomplete', this.documentHolder);
},
editChartClick: function(){ editChartClick: function(){
var diagramEditor = DE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); var diagramEditor = DE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
if (diagramEditor) { if (diagramEditor) {
@ -1693,6 +1721,10 @@ define([
me.documentHolder.fireEvent('editcomplete', me); me.documentHolder.fireEvent('editcomplete', me);
}, },
onUndo: function () {
this.api.Undo();
},
onAcceptRejectChange: function(item, e) { onAcceptRejectChange: function(item, e) {
if (this.api) { if (this.api) {
if (item.value == 'accept') if (item.value == 'accept')
@ -2107,12 +2139,97 @@ define([
this.api && this.api.asc_editPointsGeometry(); this.api && this.api.asc_editPointsGeometry();
}, },
onTableMerge: function(item) {
this.api && this.api.MergeCells();
},
onTableSplit: function(item) {
var me = this;
if (me.api){
(new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
me.api.SplitCell(value.columns, value.rows);
}
Common.component.Analytics.trackEvent('DocumentHolder', 'Table');
}
me.documentHolder.fireEvent('editcomplete', me.documentHolder);
}
})).show();
}
},
onIgnoreSpell: function(item, e){
this.api && this.api.asc_ignoreMisspelledWord(this.documentHolder._currentSpellObj, !!item.value);
this.documentHolder.fireEvent('editcomplete', this.documentHolder);
},
onToDictionary: function(item, e){
this.api && this.api.asc_spellCheckAddToDictionary(this.documentHolder._currentSpellObj);
this.documentHolder.fireEvent('editcomplete', this.documentHolder);
},
onTableDist: function(item, e){
this.api && this.api.asc_DistributeTableCells(!!item.value);
this.documentHolder.fireEvent('editcomplete', this.documentHolder);
},
tableDirection: function(menu, item, e) {
var me = this;
if (me.api) {
var properties = new Asc.CTableProp();
properties.put_CellsTextDirection(item.options.direction);
me.api.tblApply(properties);
}
},
onRefreshField: function(item, e){
this.api && this.api.asc_UpdateComplexField(item.options.fieldProps);
this.documentHolder.fireEvent('editcomplete', this.documentHolder);
},
onParagraphBreakBefore: function(item, e){
this.api && this.api.put_PageBreak(item.checked);
},
onParagraphKeepLines: function(item, e){
this.api && this.api.put_KeepLines(item.checked);
},
paragraphVAlign: function(menu, item, e) {
var me = this;
if (me.api) {
var properties = new Asc.asc_CImgProperty();
properties.put_VerticalTextAlign(item.options.valign);
me.api.ImgApply(properties);
}
},
paragraphDirection: function(menu, item, e) {
var me = this;
if (me.api) {
var properties = new Asc.asc_CImgProperty();
properties.put_Vert(item.options.direction);
me.api.ImgApply(properties);
}
},
onLangMenu: function(type, menu, item){
var me = this;
if (me.api){
if (!_.isUndefined(item.langid))
me.api.put_TextPrLang(item.langid);
(type=='para') ? (me.documentHolder._currLang.paraid = item.langid) : (me.documentHolder._currLang.tableid = item.langid);
me.documentHolder.fireEvent('editcomplete', me.documentHolder);
}
},
editComplete: function() { editComplete: function() {
this.documentHolder && this.documentHolder.fireEvent('editcomplete', this.documentHolder); this.documentHolder && this.documentHolder.fireEvent('editcomplete', this.documentHolder);
}, }
}); });
}); });

View file

@ -122,8 +122,6 @@ define([
me.menuViewUndo = new Common.UI.MenuItem({ me.menuViewUndo = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-undo', iconCls: 'menu__icon btn-undo',
caption: me.textUndo caption: me.textUndo
}).on('click', function () {
me.api.Undo();
}); });
me.menuViewCopySeparator = new Common.UI.MenuItem({ me.menuViewCopySeparator = new Common.UI.MenuItem({
@ -796,31 +794,13 @@ define([
caption : me.txtInsertCaption caption : me.txtInsertCaption
}); });
var mnuTableMerge = new Common.UI.MenuItem({ me.mnuTableMerge = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-merge-cells', iconCls: 'menu__icon btn-merge-cells',
caption : me.mergeCellsText caption : me.mergeCellsText
}).on('click', function(item) {
if (me.api)
me.api.MergeCells();
}); });
var mnuTableSplit = new Common.UI.MenuItem({ me.mnuTableSplit = new Common.UI.MenuItem({
caption : me.splitCellsText caption : me.splitCellsText
}).on('click', function(item) {
if (me.api){
(new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
me.api.SplitCell(value.columns, value.rows);
}
Common.component.Analytics.trackEvent('DocumentHolder', 'Table');
}
me.fireEvent('editcomplete', me);
}
})).show();
}
}); });
me.menuTableCellAlign = new Common.UI.MenuItem({ me.menuTableCellAlign = new Common.UI.MenuItem({
@ -879,11 +859,8 @@ define([
caption : me.editHyperlinkText caption : me.editHyperlinkText
}); });
var menuRemoveHyperlinkTable = new Common.UI.MenuItem({ me.menuRemoveHyperlinkTable = new Common.UI.MenuItem({
caption : me.removeHyperlinkText caption : me.removeHyperlinkText
}).on('click', function(item, e){
me.api && me.api.remove_Hyperlink(item.hyperProps.value);
me.fireEvent('editcomplete', me);
}); });
var menuHyperlinkTable = new Common.UI.MenuItem({ var menuHyperlinkTable = new Common.UI.MenuItem({
@ -894,7 +871,7 @@ define([
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items : [ items : [
me.menuEditHyperlinkTable, me.menuEditHyperlinkTable,
menuRemoveHyperlinkTable me.menuRemoveHyperlinkTable
] ]
}) })
}); });
@ -1005,29 +982,18 @@ define([
}) })
}); });
var menuIgnoreSpellTable = new Common.UI.MenuItem({ me.menuIgnoreSpellTable = new Common.UI.MenuItem({
caption : me.ignoreSpellText caption : me.ignoreSpellText,
}).on('click', function(item) { value: false
if (me.api) {
me.api.asc_ignoreMisspelledWord(me._currentSpellObj, false);
me.fireEvent('editcomplete', me);
}
}); });
var menuIgnoreAllSpellTable = new Common.UI.MenuItem({ me.menuIgnoreAllSpellTable = new Common.UI.MenuItem({
caption : me.ignoreAllSpellText caption : me.ignoreAllSpellText,
}).on('click', function(menu) { value: true
if (me.api) {
me.api.asc_ignoreMisspelledWord(me._currentSpellObj, true);
me.fireEvent('editcomplete', me);
}
}); });
var menuToDictionaryTable = new Common.UI.MenuItem({ me.menuToDictionaryTable = new Common.UI.MenuItem({
caption : me.toDictionaryText caption : me.toDictionaryText
}).on('click', function(item, e) {
me.api.asc_spellCheckAddToDictionary(me._currentSpellObj);
me.fireEvent('editcomplete', me);
}); });
var menuIgnoreSpellTableSeparator = new Common.UI.MenuItem({ var menuIgnoreSpellTableSeparator = new Common.UI.MenuItem({
@ -1048,9 +1014,9 @@ define([
me.menuSpellTable, me.menuSpellTable,
me.menuSpellMoreTable, me.menuSpellMoreTable,
menuIgnoreSpellTableSeparator, menuIgnoreSpellTableSeparator,
menuIgnoreSpellTable, me.menuIgnoreSpellTable,
menuIgnoreAllSpellTable, me.menuIgnoreAllSpellTable,
menuToDictionaryTable, me.menuToDictionaryTable,
{ caption: '--' }, { caption: '--' },
me.langTableMenu me.langTableMenu
] ]
@ -1099,31 +1065,17 @@ define([
caption : '--' caption : '--'
}); });
var menuTableDistRows = new Common.UI.MenuItem({ me.menuTableDistRows = new Common.UI.MenuItem({
caption : me.textDistributeRows caption : me.textDistributeRows,
}).on('click', _.bind(function(){ value: false
if (me.api) });
me.api.asc_DistributeTableCells(false);
me.fireEvent('editcomplete', me);
}, me));
var menuTableDistCols = new Common.UI.MenuItem({ me.menuTableDistCols = new Common.UI.MenuItem({
caption : me.textDistributeCols caption : me.textDistributeCols,
}).on('click', _.bind(function(){ value: true
if (me.api) });
me.api.asc_DistributeTableCells(true);
me.fireEvent('editcomplete', me);
}, me));
var tableDirection = function(item, e) { me.menuTableDirection = new Common.UI.MenuItem({
if (me.api) {
var properties = new Asc.CTableProp();
properties.put_CellsTextDirection(item.options.direction);
me.api.tblApply(properties);
}
};
var menuTableDirection = new Common.UI.MenuItem({
iconCls: 'menu__icon text-orient-hor', iconCls: 'menu__icon text-orient-hor',
caption : me.directionText, caption : me.directionText,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
@ -1138,7 +1090,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popuptabledirect', toggleGroup : 'popuptabledirect',
direction : Asc.c_oAscCellTextDirection.LRTB direction : Asc.c_oAscCellTextDirection.LRTB
}).on('click', _.bind(tableDirection, me)), }),
me.menuTableDirect90 = new Common.UI.MenuItem({ me.menuTableDirect90 = new Common.UI.MenuItem({
caption : me.direct90Text, caption : me.direct90Text,
iconCls : 'menu__icon text-orient-rdown', iconCls : 'menu__icon text-orient-rdown',
@ -1147,7 +1099,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popuptabledirect', toggleGroup : 'popuptabledirect',
direction : Asc.c_oAscCellTextDirection.TBRL direction : Asc.c_oAscCellTextDirection.TBRL
}).on('click', _.bind(tableDirection, me)), }),
me.menuTableDirect270 = new Common.UI.MenuItem({ me.menuTableDirect270 = new Common.UI.MenuItem({
caption : me.direct270Text, caption : me.direct270Text,
iconCls : 'menu__icon text-orient-rup', iconCls : 'menu__icon text-orient-rup',
@ -1156,7 +1108,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popuptabledirect', toggleGroup : 'popuptabledirect',
direction : Asc.c_oAscCellTextDirection.BTLR direction : Asc.c_oAscCellTextDirection.BTLR
}).on('click', _.bind(tableDirection, me)) })
] ]
}) })
}); });
@ -1186,11 +1138,8 @@ define([
}) })
}); });
var menuTableRefreshField = new Common.UI.MenuItem({ me.menuTableRefreshField = new Common.UI.MenuItem({
caption: me.textRefreshField caption: me.textRefreshField
}).on('click', function(item, e){
me.api.asc_UpdateComplexField(item.options.fieldProps);
me.fireEvent('editcomplete', me);
}); });
var menuTableFieldSeparator = new Common.UI.MenuItem({ var menuTableFieldSeparator = new Common.UI.MenuItem({
@ -1328,7 +1277,7 @@ define([
cls = 'menu__icon text-orient-rup'; cls = 'menu__icon text-orient-rup';
break; break;
} }
menuTableDirection.setIconCls(cls); me.menuTableDirection.setIconCls(cls);
me.menuTableDirectH.setChecked(dir == Asc.c_oAscCellTextDirection.LRTB); me.menuTableDirectH.setChecked(dir == Asc.c_oAscCellTextDirection.LRTB);
me.menuTableDirect90.setChecked(dir == Asc.c_oAscCellTextDirection.TBRL); me.menuTableDirect90.setChecked(dir == Asc.c_oAscCellTextDirection.TBRL);
me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR); me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR);
@ -1338,14 +1287,14 @@ define([
me.tableMenu.items[15].setDisabled(disabled); me.tableMenu.items[15].setDisabled(disabled);
if (me.api) { if (me.api) {
mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells()); me.mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells());
mnuTableSplit.setDisabled(disabled || !me.api.CheckBeforeSplitCells()); me.mnuTableSplit.setDisabled(disabled || !me.api.CheckBeforeSplitCells());
} }
menuTableDistRows.setDisabled(disabled); me.menuTableDistRows.setDisabled(disabled);
menuTableDistCols.setDisabled(disabled); me.menuTableDistCols.setDisabled(disabled);
me.menuTableCellAlign.setDisabled(disabled); me.menuTableCellAlign.setDisabled(disabled);
menuTableDirection.setDisabled(disabled); me.menuTableDirection.setDisabled(disabled);
me.menuTableAdvanced.setDisabled(disabled); me.menuTableAdvanced.setDisabled(disabled);
var cancopy = me.api && me.api.can_CopyCut(); var cancopy = me.api && me.api.can_CopyCut();
@ -1385,7 +1334,7 @@ define([
menuHyperlinkTable.setVisible(value.hyperProps!==undefined); menuHyperlinkTable.setVisible(value.hyperProps!==undefined);
me.menuEditHyperlinkTable.hyperProps = value.hyperProps; me.menuEditHyperlinkTable.hyperProps = value.hyperProps;
menuRemoveHyperlinkTable.hyperProps = value.hyperProps; me.menuRemoveHyperlinkTable.hyperProps = value.hyperProps;
if (text!==false) { if (text!==false) {
me.menuAddHyperlinkTable.hyperProps = {}; me.menuAddHyperlinkTable.hyperProps = {};
@ -1406,7 +1355,7 @@ define([
}); });
me.menuTableFollow.setVisible(move); me.menuTableFollow.setVisible(move);
menuHyperlinkSeparator.setVisible(me.menuAddHyperlinkTable.isVisible() || menuHyperlinkTable.isVisible() || menuNumberingTable.isVisible() || menuTableFollow.isVisible()); menuHyperlinkSeparator.setVisible(me.menuAddHyperlinkTable.isVisible() || menuHyperlinkTable.isVisible() || menuNumberingTable.isVisible() || me.menuTableFollow.isVisible());
// paragraph properties // paragraph properties
me.menuParagraphAdvancedInTable.setVisible(value.paraProps!==undefined); me.menuParagraphAdvancedInTable.setVisible(value.paraProps!==undefined);
@ -1417,7 +1366,7 @@ define([
me.menuParagraphAdvancedInTable.setDisabled(disabled); me.menuParagraphAdvancedInTable.setDisabled(disabled);
me.menuSpellCheckTable.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); me.menuSpellCheckTable.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
menuToDictionaryTable.setVisible(me.mode.isDesktopApp); me.menuToDictionaryTable.setVisible(me.mode.isDesktopApp);
menuSpellcheckTableSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); menuSpellcheckTableSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
me.langTableMenu.setDisabled(disabled); me.langTableMenu.setDisabled(disabled);
@ -1475,11 +1424,11 @@ define([
/** coauthoring end **/ /** coauthoring end **/
var in_field = me.api.asc_GetCurrentComplexField(); var in_field = me.api.asc_GetCurrentComplexField();
menuTableRefreshField.setVisible(!!in_field); me.menuTableRefreshField.setVisible(!!in_field);
menuTableRefreshField.setDisabled(disabled); me.menuTableRefreshField.setDisabled(disabled);
menuTableFieldSeparator.setVisible(!!in_field); menuTableFieldSeparator.setVisible(!!in_field);
if (in_field) { if (in_field) {
menuTableRefreshField.options.fieldProps = in_field; me.menuTableRefreshField.options.fieldProps = in_field;
} }
}, },
items: [ items: [
@ -1494,20 +1443,20 @@ define([
me.menuTableReject, me.menuTableReject,
menuTableReviewSeparator, menuTableReviewSeparator,
menuEquationSeparatorInTable, menuEquationSeparatorInTable,
menuTableRefreshField, me.menuTableRefreshField,
menuTableFieldSeparator, menuTableFieldSeparator,
me.menuTableSelectText, me.menuTableSelectText,
me.menuTableInsertText, me.menuTableInsertText,
me.menuTableDeleteText, me.menuTableDeleteText,
{ caption: '--' }, { caption: '--' },
mnuTableMerge, me.mnuTableMerge,
mnuTableSplit, me.mnuTableSplit,
{ caption: '--' }, { caption: '--' },
menuTableDistRows, me.menuTableDistRows,
menuTableDistCols, me.menuTableDistCols,
{ caption: '--' }, { caption: '--' },
me.menuTableCellAlign, me.menuTableCellAlign,
menuTableDirection, me.menuTableDirection,
{ caption: '--' }, { caption: '--' },
me.menuTableInsertCaption, me.menuTableInsertCaption,
{ caption: '--' }, { caption: '--' },
@ -1538,29 +1487,17 @@ define([
/* text menu */ /* text menu */
var menuParagraphBreakBefore = new Common.UI.MenuItem({ me.menuParagraphBreakBefore = new Common.UI.MenuItem({
caption : me.breakBeforeText, caption : me.breakBeforeText,
checkable : true checkable : true
}).on('click', function(item, e) {
me.api.put_PageBreak(item.checked);
}); });
var menuParagraphKeepLines = new Common.UI.MenuItem({ me.menuParagraphKeepLines = new Common.UI.MenuItem({
caption : me.keepLinesText, caption : me.keepLinesText,
checkable : true checkable : true
}).on('click', function(item, e) {
me.api.put_KeepLines(item.checked);
}); });
var paragraphVAlign = function(item, e) { me.menuParagraphVAlign = new Common.UI.MenuItem({
if (me.api) {
var properties = new Asc.asc_CImgProperty();
properties.put_VerticalTextAlign(item.options.valign);
me.api.ImgApply(properties);
}
};
var menuParagraphVAlign = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-top', iconCls: 'menu__icon btn-align-top',
caption : me.vertAlignText, caption : me.vertAlignText,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
@ -1575,7 +1512,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Top valign : Asc.c_oAscVAlign.Top
}).on('click', _.bind(paragraphVAlign, me)), }),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-middle', iconCls: 'menu__icon btn-align-middle',
caption : me.textShapeAlignMiddle, caption : me.textShapeAlignMiddle,
@ -1584,7 +1521,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Center valign : Asc.c_oAscVAlign.Center
}).on('click', _.bind(paragraphVAlign, me)), }),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-bottom', iconCls: 'menu__icon btn-align-bottom',
caption : me.textShapeAlignBottom, caption : me.textShapeAlignBottom,
@ -1593,20 +1530,12 @@ define([
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Bottom valign : Asc.c_oAscVAlign.Bottom
}).on('click', _.bind(paragraphVAlign, me)) })
] ]
}) })
}); });
var paragraphDirection = function(item, e) { me.menuParagraphDirection = new Common.UI.MenuItem({
if (me.api) {
var properties = new Asc.asc_CImgProperty();
properties.put_Vert(item.options.direction);
me.api.ImgApply(properties);
}
};
var menuParagraphDirection = new Common.UI.MenuItem({
iconCls: 'menu__icon text-orient-hor', iconCls: 'menu__icon text-orient-hor',
caption : me.directionText, caption : me.directionText,
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
@ -1621,7 +1550,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popupparagraphdirect', toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.normal direction : Asc.c_oAscVertDrawingText.normal
}).on('click', _.bind(paragraphDirection, me)), }),
me.menuParagraphDirect90 = new Common.UI.MenuItem({ me.menuParagraphDirect90 = new Common.UI.MenuItem({
caption : me.direct90Text, caption : me.direct90Text,
iconCls : 'menu__icon text-orient-rdown', iconCls : 'menu__icon text-orient-rdown',
@ -1630,7 +1559,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popupparagraphdirect', toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.vert direction : Asc.c_oAscVertDrawingText.vert
}).on('click', _.bind(paragraphDirection, me)), }),
me.menuParagraphDirect270 = new Common.UI.MenuItem({ me.menuParagraphDirect270 = new Common.UI.MenuItem({
caption : me.direct270Text, caption : me.direct270Text,
iconCls : 'menu__icon text-orient-rup', iconCls : 'menu__icon text-orient-rup',
@ -1639,7 +1568,7 @@ define([
checked : false, checked : false,
toggleGroup : 'popupparagraphdirect', toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.vert270 direction : Asc.c_oAscVertDrawingText.vert270
}).on('click', _.bind(paragraphDirection, me)) })
] ]
}) })
}); });
@ -1682,11 +1611,8 @@ define([
caption : me.editHyperlinkText caption : me.editHyperlinkText
}); });
var menuRemoveHyperlinkPara = new Common.UI.MenuItem({ me.menuRemoveHyperlinkPara = new Common.UI.MenuItem({
caption : me.removeHyperlinkText caption : me.removeHyperlinkText
}).on('click', function(item, e) {
me.api.remove_Hyperlink(item.hyperProps.value);
me.fireEvent('editcomplete', me);
}); });
var menuHyperlinkPara = new Common.UI.MenuItem({ var menuHyperlinkPara = new Common.UI.MenuItem({
@ -1697,7 +1623,7 @@ define([
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items : [ items : [
me.menuEditHyperlinkPara, me.menuEditHyperlinkPara,
menuRemoveHyperlinkPara me.menuRemoveHyperlinkPara
] ]
}) })
}); });
@ -1747,25 +1673,18 @@ define([
}) })
}); });
var menuIgnoreSpellPara = new Common.UI.MenuItem({ me.menuIgnoreSpellPara = new Common.UI.MenuItem({
caption : me.ignoreSpellText caption : me.ignoreSpellText,
}).on('click', function(item, e) { value: false
me.api.asc_ignoreMisspelledWord(me._currentSpellObj, false);
me.fireEvent('editcomplete', me);
}); });
var menuIgnoreAllSpellPara = new Common.UI.MenuItem({ me.menuIgnoreAllSpellPara = new Common.UI.MenuItem({
caption : me.ignoreAllSpellText caption : me.ignoreAllSpellText,
}).on('click', function(item, e) { value: true
me.api.asc_ignoreMisspelledWord(me._currentSpellObj, true);
me.fireEvent('editcomplete', me);
}); });
var menuToDictionaryPara = new Common.UI.MenuItem({ me.menuToDictionaryPara = new Common.UI.MenuItem({
caption : me.toDictionaryText caption : me.toDictionaryText
}).on('click', function(item, e) {
me.api.asc_spellCheckAddToDictionary(me._currentSpellObj);
me.fireEvent('editcomplete', me);
}); });
var menuIgnoreSpellParaSeparator = new Common.UI.MenuItem({ var menuIgnoreSpellParaSeparator = new Common.UI.MenuItem({
@ -1865,11 +1784,8 @@ define([
caption : '--' caption : '--'
}); });
var menuParaRefreshField = new Common.UI.MenuItem({ me.menuParaRefreshField = new Common.UI.MenuItem({
caption: me.textRefreshField caption: me.textRefreshField
}).on('click', function(item, e){
me.api.asc_UpdateComplexField(item.options.fieldProps);
me.fireEvent('editcomplete', me);
}); });
var menuParaFieldSeparator = new Common.UI.MenuItem({ var menuParaFieldSeparator = new Common.UI.MenuItem({
@ -1912,8 +1828,8 @@ define([
control_props = in_control ? me.api.asc_GetContentControlProperties() : null, control_props = in_control ? me.api.asc_GetContentControlProperties() : null,
is_form = control_props && control_props.get_FormPr(); is_form = control_props && control_props.get_FormPr();
menuParagraphVAlign.setVisible(isInShape && !isInChart && !isEquation && !(is_form && control_props.get_FormPr().get_Fixed())); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! me.menuParagraphVAlign.setVisible(isInShape && !isInChart && !isEquation && !(is_form && control_props.get_FormPr().get_Fixed())); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation && !(is_form && control_props.get_FormPr().get_Fixed())); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! me.menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation && !(is_form && control_props.get_FormPr().get_Fixed())); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !!
if ( isInShape || isInChart ) { if ( isInShape || isInChart ) {
var align = value.imgProps.value.get_VerticalTextAlign(); var align = value.imgProps.value.get_VerticalTextAlign();
var cls = ''; var cls = '';
@ -1928,7 +1844,7 @@ define([
cls = 'menu__icon btn-align-bottom'; cls = 'menu__icon btn-align-bottom';
break; break;
} }
menuParagraphVAlign.setIconCls(cls); me.menuParagraphVAlign.setIconCls(cls);
me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom);
@ -1946,18 +1862,18 @@ define([
cls = 'menu__icon text-orient-rup'; cls = 'menu__icon text-orient-rup';
break; break;
} }
menuParagraphDirection.setIconCls(cls); me.menuParagraphDirection.setIconCls(cls);
me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal);
me.menuParagraphDirect90.setChecked(dir == Asc.c_oAscVertDrawingText.vert); me.menuParagraphDirect90.setChecked(dir == Asc.c_oAscVertDrawingText.vert);
me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270); me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270);
} }
me.menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart); me.menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart);
me.menuParagraphAdvanced.isSmartArtInternal = (value.imgProps && value.imgProps.isSmartArtInternal); me.menuParagraphAdvanced.isSmartArtInternal = (value.imgProps && value.imgProps.isSmartArtInternal);
menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation); me.menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation);
menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation); me.menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation);
if (value.paraProps) { if (value.paraProps) {
menuParagraphBreakBefore.setChecked(value.paraProps.value.get_PageBreakBefore()); me.menuParagraphBreakBefore.setChecked(value.paraProps.value.get_PageBreakBefore());
menuParagraphKeepLines.setChecked(value.paraProps.value.get_KeepLines()); me.menuParagraphKeepLines.setChecked(value.paraProps.value.get_KeepLines());
} }
var text = null; var text = null;
@ -1968,7 +1884,7 @@ define([
menuHyperlinkPara.setVisible(value.hyperProps!==undefined); menuHyperlinkPara.setVisible(value.hyperProps!==undefined);
menuHyperlinkParaSeparator.setVisible(me.menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible()); menuHyperlinkParaSeparator.setVisible(me.menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible());
me.menuEditHyperlinkPara.hyperProps = value.hyperProps; me.menuEditHyperlinkPara.hyperProps = value.hyperProps;
menuRemoveHyperlinkPara.hyperProps = value.hyperProps; me.menuRemoveHyperlinkPara.hyperProps = value.hyperProps;
if (text!==false) { if (text!==false) {
me.menuAddHyperlinkPara.hyperProps = {}; me.menuAddHyperlinkPara.hyperProps = {};
me.menuAddHyperlinkPara.hyperProps.value = new Asc.CHyperlinkProperty(); me.menuAddHyperlinkPara.hyperProps.value = new Asc.CHyperlinkProperty();
@ -1993,13 +1909,13 @@ define([
me.menuParaFollow.setVisible(move); me.menuParaFollow.setVisible(move);
menuParaFollowSeparator.setVisible(move); menuParaFollowSeparator.setVisible(move);
menuParagraphBreakBefore.setDisabled(disabled || !_.isUndefined(value.headerProps) || !_.isUndefined(value.imgProps)); me.menuParagraphBreakBefore.setDisabled(disabled || !_.isUndefined(value.headerProps) || !_.isUndefined(value.imgProps));
menuParagraphKeepLines.setDisabled(disabled); me.menuParagraphKeepLines.setDisabled(disabled);
me.menuParagraphAdvanced.setDisabled(disabled); me.menuParagraphAdvanced.setDisabled(disabled);
me.menuFrameAdvanced.setDisabled(disabled); me.menuFrameAdvanced.setDisabled(disabled);
me.menuDropCapAdvanced.setDisabled(disabled); me.menuDropCapAdvanced.setDisabled(disabled);
menuParagraphVAlign.setDisabled(disabled); me.menuParagraphVAlign.setDisabled(disabled);
menuParagraphDirection.setDisabled(disabled); me.menuParagraphDirection.setDisabled(disabled);
var cancopy = me.api && me.api.can_CopyCut(); var cancopy = me.api && me.api.can_CopyCut();
me.menuParaCopy.setDisabled(!cancopy); me.menuParaCopy.setDisabled(!cancopy);
@ -2017,9 +1933,9 @@ define([
var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
me.menuSpellPara.setVisible(spell); me.menuSpellPara.setVisible(spell);
menuSpellcheckParaSeparator.setVisible(spell); menuSpellcheckParaSeparator.setVisible(spell);
menuIgnoreSpellPara.setVisible(spell); me.menuIgnoreSpellPara.setVisible(spell);
menuIgnoreAllSpellPara.setVisible(spell); me.menuIgnoreAllSpellPara.setVisible(spell);
menuToDictionaryPara.setVisible(spell && me.mode.isDesktopApp); me.menuToDictionaryPara.setVisible(spell && me.mode.isDesktopApp);
me.langParaMenu.setVisible(spell); me.langParaMenu.setVisible(spell);
me.langParaMenu.setDisabled(disabled); me.langParaMenu.setDisabled(disabled);
menuIgnoreSpellParaSeparator.setVisible(spell); menuIgnoreSpellParaSeparator.setVisible(spell);
@ -2089,11 +2005,11 @@ define([
/** coauthoring end **/ /** coauthoring end **/
var in_field = me.api.asc_GetCurrentComplexField(); var in_field = me.api.asc_GetCurrentComplexField();
menuParaRefreshField.setVisible(!!in_field); me.menuParaRefreshField.setVisible(!!in_field);
menuParaRefreshField.setDisabled(disabled); me.menuParaRefreshField.setDisabled(disabled);
menuParaFieldSeparator.setVisible(!!in_field); menuParaFieldSeparator.setVisible(!!in_field);
if (in_field) { if (in_field) {
menuParaRefreshField.options.fieldProps = in_field; me.menuParaRefreshField.options.fieldProps = in_field;
} }
var listId = me.api.asc_GetCurrentNumberingId(), var listId = me.api.asc_GetCurrentNumberingId(),
@ -2118,9 +2034,9 @@ define([
me.menuSpellPara, me.menuSpellPara,
me.menuSpellMorePara, me.menuSpellMorePara,
menuSpellcheckParaSeparator, menuSpellcheckParaSeparator,
menuIgnoreSpellPara, me.menuIgnoreSpellPara,
menuIgnoreAllSpellPara, me.menuIgnoreAllSpellPara,
menuToDictionaryPara, me.menuToDictionaryPara,
me.langParaMenu, me.langParaMenu,
menuIgnoreSpellParaSeparator, menuIgnoreSpellParaSeparator,
me.menuParaCut, me.menuParaCut,
@ -2137,15 +2053,15 @@ define([
me.menuParaRemoveControl, me.menuParaRemoveControl,
me.menuParaControlSettings, me.menuParaControlSettings,
menuParaControlSeparator, menuParaControlSeparator,
menuParaRefreshField, me.menuParaRefreshField,
menuParaFieldSeparator, menuParaFieldSeparator,
menuParaTOCSettings, menuParaTOCSettings,
menuParaTOCRefresh, menuParaTOCRefresh,
menuParaTOCSeparator, menuParaTOCSeparator,
menuParagraphBreakBefore, me.menuParagraphBreakBefore,
menuParagraphKeepLines, me.menuParagraphKeepLines,
menuParagraphVAlign, me.menuParagraphVAlign,
menuParagraphDirection, me.menuParagraphDirection,
me.menuParagraphAdvanced, me.menuParagraphAdvanced,
me.menuFrameAdvanced, me.menuFrameAdvanced,
me.menuDropCapAdvanced, me.menuDropCapAdvanced,
@ -2897,26 +2813,6 @@ define([
}); });
me.langParaMenu.menu.resetItems(arrPara); me.langParaMenu.menu.resetItems(arrPara);
me.langTableMenu.menu.resetItems(arrTable); me.langTableMenu.menu.resetItems(arrTable);
me.langParaMenu.menu.on('item:click', function(menu, item){
if (me.api){
if (!_.isUndefined(item.langid))
me.api.put_TextPrLang(item.langid);
me._currLang.paraid = item.langid;
me.fireEvent('editcomplete', me);
}
});
me.langTableMenu.menu.on('item:click', function(menu, item, e){
if (me.api){
if (!_.isUndefined(item.langid))
me.api.put_TextPrLang(item.langid);
me._currLang.tableid = item.langid;
me.fireEvent('editcomplete', me);
}
});
} }
}, },