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

[SSE] Bug 43491

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-07 14:01:07 +03:00
parent 71d7ac572b
commit f79725ac7a
3 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@ define([
'common/main/lib/util/Shortcuts',
'common/main/lib/view/CopyWarningDialog',
'common/main/lib/view/OpenDialog',
'common/main/lib/view/ListSettingsDialog',
'spreadsheeteditor/main/app/view/DocumentHolder',
'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog',
'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced',
@ -213,7 +214,7 @@ define([
view.menuImageAlign.menu.on('item:click', _.bind(me.onImgMenuAlign, 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.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectBulletMenu, 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));
@ -744,11 +745,37 @@ define([
}
},
onSelectNoneBullet: function(menu, item) {
if (this.api && item.options.value == -1) {
this.api.asc_setListType(item.options.value);
Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
Common.component.Analytics.trackEvent('DocumentHolder', 'List Type');
onSelectBulletMenu: function(menu, item) {
if (this.api) {
if (item.options.value == -1) {
this.api.asc_setListType(item.options.value);
Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
Common.component.Analytics.trackEvent('DocumentHolder', 'List Type');
} else if (item.options.value == 'settings') {
var me = this,
props;
var selectedObjects = me.api.asc_getGraphicObjectProps();
for (var i = 0; i < selectedObjects.length; i++) {
if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) {
props = selectedObjects[i].asc_getObjectValue();
break;
}
}
if (props) {
(new Common.Views.ListSettingsDialog({
props: props,
type: this.api.asc_getCurrentListType().get_ListType(),
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
me.api.asc_setGraphicObjectProps(value);
}
}
Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
}
})).show();
}
}
}
},
@ -1645,6 +1672,7 @@ define([
documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270);
documentHolder.menuParagraphBulletNone.setChecked(listtype.get_ListType() == -1);
documentHolder.mnuListSettings.setDisabled(listtype.get_ListType() == -1);
var rec = documentHolder.paraBulletsPicker.store.findWhere({ type: listtype.get_ListType(), subtype: listtype.get_ListSubType() });
documentHolder.paraBulletsPicker.selectRecord(rec, true);
} else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) {

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

@ -836,6 +836,10 @@ define([
checkable : true,
checked : false,
value : -1
}),
me.mnuListSettings = new Common.UI.MenuItem({
caption: me.textListSettings,
value: 'settings'
})
]
})
@ -1090,7 +1094,8 @@ define([
textAlign: 'Align',
textCrop: 'Crop',
textCropFill: 'Fill',
textCropFit: 'Fit'
textCropFit: 'Fit',
textListSettings: 'List Settings'
}, SSE.Views.DocumentHolder || {}));
});

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

@ -94,6 +94,12 @@
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
"Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color",
"Common.Views.ListSettingsDialog.txtColor": "Color",
"Common.Views.ListSettingsDialog.txtOfText": "% of text",
"Common.Views.ListSettingsDialog.txtSize": "Size",
"Common.Views.ListSettingsDialog.txtStart": "Start at",
"Common.Views.ListSettingsDialog.txtTitle": "List Settings",
"Common.Views.OpenDialog.closeButtonText": "Close File",
"Common.Views.OpenDialog.txtColon": "Colon",
"Common.Views.OpenDialog.txtComma": "Comma",
@ -1495,6 +1501,7 @@
"SSE.Views.DocumentHolder.txtUngroup": "Ungroup",
"SSE.Views.DocumentHolder.txtWidth": "Width",
"SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"SSE.Views.DocumentHolder.textListSettings": "List Settings",
"SSE.Views.FileMenu.btnBackCaption": "Open file location",
"SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
"SSE.Views.FileMenu.btnCreateNewCaption": "Create New",