Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added context menu in the viewer mode (Copy menu item).

Browse source
This commit is contained in:
Julia Radzhabova 2017-06-06 11:04:04 +03:00
parent 556b0c55ae
commit 3d4e53f7b0
11 changed files with 303 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/main/app/controller/Main.js
View file

@ -877,9 +877,11 @@ define([
Common.NotificationCenter.trigger('document:ready', 'main');
}
}, 50);
} else if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
} else {
documentHolderController.getView().createDelayedElementsViewer();
if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
}
if (this.appOptions.canAnalytics && false)
Common.component.Analytics.initialize('UA-12442749-13', 'Document Editor');

89
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -81,7 +81,7 @@ define([
me._currentParaObjDisabled = false;
var showPopupMenu = function(menu, value, event, docElement, eOpts){
if (!_.isUndefined(menu) && menu !== null && me.mode.isEdit){
if (!_.isUndefined(menu) && menu !== null){
Common.UI.Menu.Manager.hideAll();
var showPoint = [event.get_X(), event.get_Y()],
@ -186,9 +186,33 @@ define([
return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
};
var fillViewMenuProps = function(selectedElements) {
if (!selectedElements || !_.isArray(selectedElements)) return;
var menu_props = {},
menu_to_show = me.viewModeMenu,
noobject = true;
for (var i = 0; i <selectedElements.length; i++) {
var elType = selectedElements[i].get_ObjectType();
var elValue = selectedElements[i].get_ObjectValue();
if (Asc.c_oAscTypeSelectElement.Image == elType) {
//image
menu_props.imgProps = {};
menu_props.imgProps.value = elValue;
noobject = false;
} else if (Asc.c_oAscTypeSelectElement.Paragraph == elType)
{
menu_props.paraProps = {};
menu_props.paraProps.value = elValue;
menu_props.paraProps.locked = (elValue) ? elValue.get_Locked() : false;
noobject = false;
}
}
return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
};
var showObjectMenu = function(event, docElement, eOpts){
if (me.api && me.mode.isEdit){
var obj = fillMenuProps(me.api.getSelectedElements());
if (me.api){
var obj = (me.mode.isEdit) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements());
if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
}
};
@ -204,8 +228,8 @@ define([
};
var onFocusObject = function(selectedElements) {
if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
var obj = fillMenuProps(selectedElements);
if (me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
var obj = (me.mode.isEdit) ? fillMenuProps(selectedElements) : fillViewMenuProps(selectedElements);
if (obj) {
if (obj.menu_to_show===me.currentMenu) {
me.currentMenu.options.initMenu(obj.menu_props);
@ -1768,6 +1792,58 @@ define([
me.fireEvent('editcomplete', me);
},
createDelayedElementsViewer: function() {
var me = this;
var menuViewCopy = new Common.UI.MenuItem({
caption: me.textCopy,
value: 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuViewUndo = new Common.UI.MenuItem({
caption: me.textUndo
}).on('click', function () {
me.api.Undo();
});
var menuViewCopySeparator = new Common.UI.MenuItem({
caption: '--'
});
var menuViewAddComment = new Common.UI.MenuItem({
caption: me.addCommentText
}).on('click', _.bind(me.addComment, me));
this.viewModeMenu = new Common.UI.Menu({
initMenu: function (value) {
var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
menuViewUndo.setVisible(me.mode.isEdit);
menuViewCopySeparator.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && me.mode.isEdit);
menuViewAddComment.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && me.mode.isEdit);
menuViewAddComment.setDisabled(value.paraProps && value.paraProps.locked === true);
var cancopy = me.api && me.api.can_CopyCut();
menuViewCopy.setDisabled(!cancopy);
},
items: [
menuViewCopy,
menuViewUndo,
menuViewCopySeparator,
menuViewAddComment
]
}).on('hide:after', function (menu, e, isFromInputControl) {
if (me.suppressEditComplete) {
me.suppressEditComplete = false;
return;
}
if (!isFromInputControl) me.fireEvent('editcomplete', me);
me.currentMenu = null;
});
},
createDelayedElements: function() {
var me = this;
@ -3393,7 +3469,8 @@ define([
txtDeleteRadical: 'Delete radical',
txtDeleteChars: 'Delete enclosing characters',
txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators',
txtKeepTextOnly: 'Keep text only'
txtKeepTextOnly: 'Keep text only',
textUndo: 'Undo'
}, DE.Views.DocumentHolder || {}));
});

1
apps/documenteditor/main/locale/en.json
View file

@ -857,6 +857,7 @@
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
"DE.Views.DocumentHolder.textUndo": "Undo",
"DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.DropcapSettingsAdvanced.okButtonText": "Ok",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",

8
apps/presentationeditor/main/app/controller/Main.js
View file

@ -663,9 +663,11 @@ define([
Common.NotificationCenter.trigger('document:ready', 'main');
}
}, 50);
} else if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
} else {
documentHolderController.getView('DocumentHolder').createDelayedElementsViewer();
if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
}
if (this.appOptions.canAnalytics && false)
Common.component.Analytics.initialize('UA-12442749-13', 'Presentation Editor');

84
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -181,10 +181,34 @@ define([
return {menu_to_show: menu_to_show, menu_props: menu_props};
};
var fillViewMenuProps = function(selectedElements) {
if (!selectedElements || !_.isArray(selectedElements)) return;
var menu_props = {},
menu_to_show = null;
_.each(selectedElements, function(element, index) {
var elType = element.get_ObjectType(),
elValue = element.get_ObjectValue();
if (Asc.c_oAscTypeSelectElement.Image == elType || Asc.c_oAscTypeSelectElement.Table == elType || Asc.c_oAscTypeSelectElement.Shape == elType ||
Asc.c_oAscTypeSelectElement.Chart == elType || Asc.c_oAscTypeSelectElement.Paragraph == elType) {
menu_to_show = me.viewModeMenu;
menu_props.locked = menu_props.locked || ((elValue) ? elValue.get_Locked() : false);
if (Asc.c_oAscTypeSelectElement.Chart == elType)
menu_props.isChart = true;
}
else if (Asc.c_oAscTypeSelectElement.Slide == elType) {
menu_props.locked = menu_props.locked || ((elValue) ? elValue.get_LockDelete() : false);
}
});
return (menu_to_show) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
};
var showObjectMenu = function(event, docElement, eOpts){
if (me.api && me.mode.isEdit){
var obj = fillMenuProps(me.api.getSelectedElements());
if (me.api){
var obj = (me.mode.isEdit) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements());
if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
}
};
@ -200,14 +224,14 @@ define([
};
var onFocusObject = function(selectedElements) {
if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible()){
if (me.currentMenu && me.currentMenu.isVisible()){
if (me.api.asc_getCurrentFocusObject() === 0 ){ // thumbnails
if (me.slideMenu===me.currentMenu) {
me.currentMenu.options.initMenu({isSlideSelect: me.slideMenu.items[2].isVisible(), fromThumbs: true});
me.currentMenu.alignPosition();
}
} else {
var obj = fillMenuProps(selectedElements);
var obj = (me.mode.isEdit) ? fillMenuProps(selectedElements) : fillViewMenuProps(selectedElements);
if (obj) {
if (obj.menu_to_show===me.currentMenu) {
me.currentMenu.options.initMenu(obj.menu_props);
@ -1666,6 +1690,53 @@ define([
}
},
createDelayedElementsViewer: function() {
var me = this;
var menuViewCopy = new Common.UI.MenuItem({
caption: me.textCopy,
value: 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuViewUndo = new Common.UI.MenuItem({
caption: me.textUndo
}).on('click', function () {
me.api.Undo();
});
var menuViewCopySeparator = new Common.UI.MenuItem({
caption: '--'
});
var menuViewAddComment = new Common.UI.MenuItem({
caption: me.addCommentText
}).on('click', _.bind(me.addComment, me));
this.viewModeMenu = new Common.UI.Menu({
initMenu: function (value) {
menuViewUndo.setVisible(me.mode.isEdit);
menuViewCopySeparator.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && me.mode.isEdit);
menuViewAddComment.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && me.mode.isEdit);
menuViewAddComment.setDisabled(value.locked);
},
items: [
menuViewCopy,
menuViewUndo,
menuViewCopySeparator,
menuViewAddComment
]
}).on('hide:after', function (menu, e, isFromInputControl) {
if (me.suppressEditComplete) {
me.suppressEditComplete = false;
return;
}
if (!isFromInputControl) me.fireEvent('editcomplete', me);
me.currentMenu = null;
});
},
createDelayedElements: function(){
var me = this;
@ -3175,7 +3246,8 @@ define([
noSpellVariantsText: 'No variants',
moreText: 'More variants...',
spellcheckText: 'Spellcheck',
langText: 'Select Language'
langText: 'Select Language',
textUndo: 'Undo'
}, PE.Views.DocumentHolder || {}));
});

1
apps/presentationeditor/main/locale/en.json
View file

@ -770,6 +770,7 @@
"PE.Views.DocumentHolder.moreText": "More variants...",
"PE.Views.DocumentHolder.spellcheckText": "Spellcheck",
"PE.Views.DocumentHolder.langText": "Select Language",
"PE.Views.DocumentHolder.textUndo": "Undo",
"PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
"PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
"PE.Views.DocumentPreview.txtClose": "Close Slideshow",

140
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -140,54 +140,59 @@ define([
onCreateDelayedElements: function(view) {
var me = this;
view.pmiCut.on('click', _.bind(me.onCopyPaste, me));
view.pmiCopy.on('click', _.bind(me.onCopyPaste, me));
view.pmiPaste.on('click', _.bind(me.onCopyPaste, me));
view.pmiImgCut.on('click', _.bind(me.onCopyPaste, me));
view.pmiImgCopy.on('click', _.bind(me.onCopyPaste, me));
view.pmiImgPaste.on('click', _.bind(me.onCopyPaste, me));
view.pmiTextCut.on('click', _.bind(me.onCopyPaste, me));
view.pmiTextCopy.on('click', _.bind(me.onCopyPaste, me));
view.pmiTextPaste.on('click', _.bind(me.onCopyPaste, me));
view.pmiInsertEntire.on('click', _.bind(me.onInsertEntire, me));
view.pmiDeleteEntire.on('click', _.bind(me.onDeleteEntire, me));
view.pmiInsertCells.menu.on('item:click', _.bind(me.onInsertCells, me));
view.pmiDeleteCells.menu.on('item:click', _.bind(me.onDeleteCells, me));
view.pmiSparklines.menu.on('item:click', _.bind(me.onClear, me));
view.pmiSortCells.menu.on('item:click', _.bind(me.onSortCells, me));
view.pmiFilterCells.menu.on('item:click', _.bind(me.onFilterCells, me));
view.pmiReapply.on('click', _.bind(me.onReapply, me));
view.pmiClear.menu.on('item:click', _.bind(me.onClear, me));
view.pmiSelectTable.menu.on('item:click', _.bind(me.onSelectTable, me));
view.pmiInsertTable.menu.on('item:click', _.bind(me.onInsertTable, me));
view.pmiDeleteTable.menu.on('item:click', _.bind(me.onDeleteTable, me));
view.pmiInsFunction.on('click', _.bind(me.onInsFunction, me));
view.menuAddHyperlink.on('click', _.bind(me.onInsHyperlink, me));
view.menuEditHyperlink.on('click', _.bind(me.onInsHyperlink, me));
view.menuRemoveHyperlink.on('click', _.bind(me.onDelHyperlink, me));
view.pmiRowHeight.menu.on('item:click', _.bind(me.onSetSize, me));
view.pmiColumnWidth.menu.on('item:click', _.bind(me.onSetSize, me));
view.pmiEntireHide.on('click', _.bind(me.onEntireHide, me));
view.pmiEntireShow.on('click', _.bind(me.onEntireShow, me));
view.pmiFreezePanes.on('click', _.bind(me.onFreezePanes, me));
view.pmiEntriesList.on('click', _.bind(me.onEntriesList, me));
/** coauthoring begin **/
view.pmiAddComment.on('click', _.bind(me.onAddComment, me));
/** coauthoring end **/
view.pmiAddNamedRange.on('click', _.bind(me.onAddNamedRange, me));
view.imgMenu.on('item:click', _.bind(me.onImgMenu, me));
view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me));
view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me));
view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectNoneBullet, me));
view.menuAddHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me));
view.menuEditHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me));
view.menuRemoveHyperlinkShape.on('click', _.bind(me.onRemoveHyperlinkShape, me));
view.pmiTextAdvanced.on('click', _.bind(me.onTextAdvanced, me));
view.mnuShapeAdvanced.on('click', _.bind(me.onShapeAdvanced, me));
view.mnuChartEdit.on('click', _.bind(me.onChartEdit, me));
view.mnuImgAdvanced.on('click', _.bind(me.onImgAdvanced, me));
view.textInShapeMenu.on('render:after', _.bind(me.onTextInShapeAfterRender, me));
if (me.permissions.isEdit) {
view.pmiCut.on('click', _.bind(me.onCopyPaste, me));
view.pmiCopy.on('click', _.bind(me.onCopyPaste, me));
view.pmiPaste.on('click', _.bind(me.onCopyPaste, me));
view.pmiImgCut.on('click', _.bind(me.onCopyPaste, me));
view.pmiImgCopy.on('click', _.bind(me.onCopyPaste, me));
view.pmiImgPaste.on('click', _.bind(me.onCopyPaste, me));
view.pmiTextCut.on('click', _.bind(me.onCopyPaste, me));
view.pmiTextCopy.on('click', _.bind(me.onCopyPaste, me));
view.pmiTextPaste.on('click', _.bind(me.onCopyPaste, me));
view.pmiInsertEntire.on('click', _.bind(me.onInsertEntire, me));
view.pmiDeleteEntire.on('click', _.bind(me.onDeleteEntire, me));
view.pmiInsertCells.menu.on('item:click', _.bind(me.onInsertCells, me));
view.pmiDeleteCells.menu.on('item:click', _.bind(me.onDeleteCells, me));
view.pmiSparklines.menu.on('item:click', _.bind(me.onClear, me));
view.pmiSortCells.menu.on('item:click', _.bind(me.onSortCells, me));
view.pmiFilterCells.menu.on('item:click', _.bind(me.onFilterCells, me));
view.pmiReapply.on('click', _.bind(me.onReapply, me));
view.pmiClear.menu.on('item:click', _.bind(me.onClear, me));
view.pmiSelectTable.menu.on('item:click', _.bind(me.onSelectTable, me));
view.pmiInsertTable.menu.on('item:click', _.bind(me.onInsertTable, me));
view.pmiDeleteTable.menu.on('item:click', _.bind(me.onDeleteTable, me));
view.pmiInsFunction.on('click', _.bind(me.onInsFunction, me));
view.menuAddHyperlink.on('click', _.bind(me.onInsHyperlink, me));
view.menuEditHyperlink.on('click', _.bind(me.onInsHyperlink, me));
view.menuRemoveHyperlink.on('click', _.bind(me.onDelHyperlink, me));
view.pmiRowHeight.menu.on('item:click', _.bind(me.onSetSize, me));
view.pmiColumnWidth.menu.on('item:click', _.bind(me.onSetSize, me));
view.pmiEntireHide.on('click', _.bind(me.onEntireHide, me));
view.pmiEntireShow.on('click', _.bind(me.onEntireShow, me));
view.pmiFreezePanes.on('click', _.bind(me.onFreezePanes, me));
view.pmiEntriesList.on('click', _.bind(me.onEntriesList, me));
/** coauthoring begin **/
view.pmiAddComment.on('click', _.bind(me.onAddComment, me));
/** coauthoring end **/
view.pmiAddNamedRange.on('click', _.bind(me.onAddNamedRange, me));
view.imgMenu.on('item:click', _.bind(me.onImgMenu, me));
view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me));
view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me));
view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectNoneBullet, me));
view.menuAddHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me));
view.menuEditHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me));
view.menuRemoveHyperlinkShape.on('click', _.bind(me.onRemoveHyperlinkShape, me));
view.pmiTextAdvanced.on('click', _.bind(me.onTextAdvanced, me));
view.mnuShapeAdvanced.on('click', _.bind(me.onShapeAdvanced, me));
view.mnuChartEdit.on('click', _.bind(me.onChartEdit, me));
view.mnuImgAdvanced.on('click', _.bind(me.onImgAdvanced, me));
view.textInShapeMenu.on('render:after', _.bind(me.onTextInShapeAfterRender, me));
} else {
view.menuViewCopy.on('click', _.bind(me.onCopyPaste, me));
view.menuViewUndo.on('click', _.bind(me.onUndo, me));
view.menuViewAddComment.on('click', _.bind(me.onAddComment, me));
}
var documentHolderEl = view.cmpEl;
@ -1104,6 +1109,13 @@ define([
}
},
onUndo: function() {
if (this.api) {
this.api.asc_Undo();
Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
}
},
onApiContextMenu: function(event) {
var me = this;
_.delay(function(){
@ -1205,15 +1217,15 @@ define([
},
showObjectMenu: function(event){
if (this.api && this.permissions.isEdit && !this.mouse.isLeftButtonDown && !this.rangeSelectionMode){
this.fillMenuProps(this.api.asc_getCellInfo(), true, event);
if (this.api && !this.mouse.isLeftButtonDown && !this.rangeSelectionMode){
(this.permissions.isEdit) ? this.fillMenuProps(this.api.asc_getCellInfo(), true, event) : this.fillViewMenuProps(this.api.asc_getCellInfo(), true, event);
}
},
onSelectionChanged: function(info){
if (this.permissions.isEdit && !this.mouse.isLeftButtonDown && !this.rangeSelectionMode &&
if (!this.mouse.isLeftButtonDown && !this.rangeSelectionMode &&
this.currentMenu && this.currentMenu.isVisible()){
this.fillMenuProps(info);
(this.permissions.isEdit) ? this.fillMenuProps(info, true, event) : this.fillViewMenuProps(info, true, event);
}
},
@ -1411,7 +1423,7 @@ define([
documentHolder.pmiEntireHide.isrowmenu = isrowmenu;
documentHolder.pmiEntireShow.isrowmenu = isrowmenu;
documentHolder.setMenuItemCommentCaptionMode(cellinfo.asc_getComments().length < 1, this.permissions.canEditComments);
documentHolder.setMenuItemCommentCaptionMode(documentHolder.pmiAddComment, cellinfo.asc_getComments().length < 1, this.permissions.canEditComments);
commentsController && commentsController.blockPopover(true);
documentHolder.pmiClear.menu.items[1].setDisabled(iscelledit);
@ -1461,6 +1473,26 @@ define([
}
},
fillViewMenuProps: function(cellinfo, showMenu, event){
var documentHolder = this.documentHolder,
seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
isCellLocked = cellinfo.asc_getLocked(),
isTableLocked = cellinfo.asc_getLockedTable()===true,
commentsController = this.getApplication().getController('Common.Controllers.Comments'),
iscellmenu = (seltype==Asc.c_oAscSelectionType.RangeCells) && !this.permissions.isEditMailMerge && !this.permissions.isEditDiagram,
iscelledit = this.api.isCellEdited;
if (!showMenu && !documentHolder.viewModeMenu.isVisible()) return;
documentHolder.menuViewUndo.setVisible(this.permissions.isEdit);
documentHolder.menuViewCopySeparator.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments && this.permissions.isEdit);
documentHolder.menuViewAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments && this.permissions.isEdit);
documentHolder.setMenuItemCommentCaptionMode(documentHolder.menuViewAddComment, cellinfo.asc_getComments().length < 1, this.permissions.canEditComments);
commentsController && commentsController.blockPopover(true);
documentHolder.menuViewAddComment.setDisabled(isCellLocked || isTableLocked);
if (showMenu) this.showPopupMenu(documentHolder.viewModeMenu, {}, event);
},
showPopupMenu: function(menu, value, event){
if (!_.isUndefined(menu) && menu !== null){
Common.UI.Menu.Manager.hideAll();
@ -2391,7 +2423,7 @@ define([
_conf && view.paraBulletsPicker.selectRecord(_conf.rec, true);
},
guestText : 'Guest',
guestText : 'Guest',
textCtrlClick : 'Press CTRL and click link',
txtHeight : 'Height',
txtWidth : 'Width',

7
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -671,8 +671,11 @@ define([
Common.NotificationCenter.trigger('document:ready', 'main');
}
}, 50);
} else if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
} else {
documentHolderView.createDelayedElementsViewer();
if (me.appOptions.canBrandingExt)
Common.NotificationCenter.trigger('document:ready', 'main');
}
if (me.appOptions.canAnalytics && false)
Common.component.Analytics.initialize('UA-12442749-13', 'Spreadsheet Editor');

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1643,7 +1643,7 @@ define([
},
onApiSheetChanged: function() {
if ( !this.appConfig.isEditDiagram && !this.appConfig.isEditMailMerge ) {
if ( this.api && !this.appConfig.isEditDiagram && !this.appConfig.isEditMailMerge ) {
var params = this.api.asc_getSheetViewSettings();
this.toolbar.mnuitemHideHeadings.setChecked(!params.asc_getShowRowColHeaders());
this.toolbar.mnuitemHideGridlines.setChecked(!params.asc_getShowGridLines());

40
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -86,6 +86,39 @@ define([
}, 50);
},
createDelayedElementsViewer: function() {
var me = this;
me.menuViewCopy = new Common.UI.MenuItem({
caption: me.txtCopy,
value: 'copy'
});
me.menuViewUndo = new Common.UI.MenuItem({
caption: me.textUndo
});
me.menuViewCopySeparator = new Common.UI.MenuItem({
caption: '--'
});
me.menuViewAddComment = new Common.UI.MenuItem({
id: 'id-context-menu-item-view-add-comment',
caption: me.txtAddComment
});
this.viewModeMenu = new Common.UI.Menu({
items: [
me.menuViewCopy,
me.menuViewUndo,
me.menuViewCopySeparator,
me.menuViewAddComment
]
});
me.fireEvent('createdelayedelements', [me]);
},
createDelayedElements: function() {
var me = this;
@ -667,8 +700,8 @@ define([
me.fireEvent('createdelayedelements', [me]);
},
setMenuItemCommentCaptionMode: function (add, editable) {
this.pmiAddComment.setCaption(add ? this.txtAddComment : (editable ? this.txtEditComment : this.txtShowComment), true);
setMenuItemCommentCaptionMode: function (item, add, editable) {
item.setCaption(add ? this.txtAddComment : (editable ? this.txtEditComment : this.txtShowComment), true);
},
txtSort: 'Sort',
@ -754,7 +787,8 @@ define([
txtShowComment: 'Show Comment',
advancedImgText: 'Image Advanced Settings',
textNone: 'None',
bulletsText: 'Bullets and Numbering'
bulletsText: 'Bullets and Numbering',
textUndo: 'Undo'
}, SSE.Views.DocumentHolder || {}));
});

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1029,6 +1029,7 @@
"SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"SSE.Views.DocumentHolder.textNone": "None",
"SSE.Views.DocumentHolder.bulletsText": "Bullets and Numbering",
"SSE.Views.DocumentHolder.textUndo": "Undo",
"SSE.Views.FileMenu.btnBackCaption": "Go to Documents",
"SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
"SSE.Views.FileMenu.btnCreateNewCaption": "Create New",