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

[SSE] Apply list type to text in shape.

Browse source
This commit is contained in:
Julia Radzhabova 2017-05-18 14:28:09 +03:00
parent 89507ae44d
commit 8301073f26
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -647,10 +647,7 @@ define([
onSelectNoneBullet: function(menu, item) { onSelectNoneBullet: function(menu, item) {
if (this.api && item.options.value == -1) { if (this.api && item.options.value == -1) {
// var properties = new Asc.asc_CImgProperty(); this.api.asc_setListType(item.options.value);
// properties.asc_putListType(item.options.value);
// this.api.asc_setGraphicObjectProps(properties);
Common.NotificationCenter.trigger('edit:complete', this.documentHolder); Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
Common.component.Analytics.trackEvent('DocumentHolder', 'List Type'); Common.component.Analytics.trackEvent('DocumentHolder', 'List Type');
} }
@ -671,11 +668,8 @@ define([
rawData = record; rawData = record;
} }
// if (this.api){ if (this.api)
// var properties = new Asc.asc_CImgProperty(); this.api.asc_setListType(rawData.type, rawData.subtype);
// properties.asc_putListType(rawData.type, rawData.subtype);
// this.api.asc_setGraphicObjectProps(properties);
// }
if (e.type !== 'click') if (e.type !== 'click')
this.documentHolder.textInShapeMenu.hide(); this.documentHolder.textInShapeMenu.hide();
@ -1308,8 +1302,7 @@ define([
var value = selectedObjects[i].asc_getObjectValue(), var value = selectedObjects[i].asc_getObjectValue(),
align = value.asc_getVerticalTextAlign(), align = value.asc_getVerticalTextAlign(),
direct = value.asc_getVert(), direct = value.asc_getVert(),
listtype = -1,//value.asc_getListType(); listtype = this.api.asc_getCurrentListType();
listsubtype = -1;//value.asc_getListSubType();
isObjLocked = isObjLocked || value.asc_getLocked(); isObjLocked = isObjLocked || value.asc_getLocked();
documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top);
documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center);
@ -1319,8 +1312,8 @@ define([
documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert); documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert);
documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270); documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270);
documentHolder.menuParagraphBulletNone.setChecked(listtype == -1); documentHolder.menuParagraphBulletNone.setChecked(listtype.get_ListType() == -1);
var rec = documentHolder.paraBulletsPicker.store.findWhere({ type: listtype, subtype: listsubtype }); var rec = documentHolder.paraBulletsPicker.store.findWhere({ type: listtype.get_ListType(), subtype: listtype.get_ListSubType() });
documentHolder.paraBulletsPicker.selectRecord(rec, true); documentHolder.paraBulletsPicker.selectRecord(rec, true);
} else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) { } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) {
documentHolder.pmiTextAdvanced.textInfo = selectedObjects[i].asc_getObjectValue(); documentHolder.pmiTextAdvanced.textInfo = selectedObjects[i].asc_getObjectValue();