[SSE] Change list presets preview
This commit is contained in:
Julia Radzhabova
parent
f8a76b5693
commit
9db3e8ad56
|
|
@ -974,13 +974,8 @@ define([
|
|||
}
|
||||
|
||||
if (rawData.type===0 && rawData.subtype===0x1000) {// custom bullet
|
||||
var bullet = new Asc.asc_CBullet();
|
||||
if (rawData.drawdata.type===Asc.asc_PreviewBulletType.char) {
|
||||
bullet.asc_putSymbol(rawData.drawdata.char);
|
||||
bullet.asc_putFont(rawData.drawdata.specialFont);
|
||||
} else if (rawData.drawdata.type===Asc.asc_PreviewBulletType.image)
|
||||
bullet.asc_fillBulletImage(rawData.drawdata.imageId);
|
||||
|
||||
var bullet = rawData.customBullet;
|
||||
if (bullet) {
|
||||
var props;
|
||||
var selectedObjects = this.api.asc_getGraphicObjectProps();
|
||||
for (var i = 0; i < selectedObjects.length; i++) {
|
||||
|
|
@ -991,6 +986,7 @@ define([
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else
|
||||
this.api.asc_setListType(rawData.type, rawData.subtype);
|
||||
|
||||
|
|
@ -2230,9 +2226,14 @@ define([
|
|||
if (bullettype === Asc.asc_PreviewBulletType.char) {
|
||||
var symbol = bullet.asc_getChar();
|
||||
if (symbol) {
|
||||
var custombullet = new Asc.asc_CBullet();
|
||||
custombullet.asc_putSymbol(symbol);
|
||||
custombullet.asc_putFont(bullet.asc_getSpecialFont());
|
||||
|
||||
rec = defrec;
|
||||
rec.set('subtype', 0x1000);
|
||||
rec.set('drawdata', {type: bullettype, char: symbol, specialFont: bullet.asc_getSpecialFont()});
|
||||
rec.set('customBullet', custombullet);
|
||||
rec.set('numberingInfo', JSON.stringify(custombullet.asc_getJsonBullet()));
|
||||
rec.set('tip', '');
|
||||
documentHolder.paraBulletsPicker.dataViewItems && this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], '');
|
||||
drawDefBullet = false;
|
||||
|
|
@ -2241,9 +2242,13 @@ define([
|
|||
} else if (bullettype === Asc.asc_PreviewBulletType.image) {
|
||||
var id = bullet.asc_getImageId();
|
||||
if (id) {
|
||||
var custombullet = new Asc.asc_CBullet();
|
||||
custombullet.asc_fillBulletImage(id);
|
||||
|
||||
rec = defrec;
|
||||
rec.set('subtype', 0x1000);
|
||||
rec.set('drawdata', {type: bullettype, imageId: id});
|
||||
rec.set('customBullet', custombullet);
|
||||
rec.set('numberingInfo', JSON.stringify(custombullet.asc_getJsonBullet()));
|
||||
rec.set('tip', '');
|
||||
documentHolder.paraBulletsPicker.dataViewItems && this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], '');
|
||||
drawDefBullet = false;
|
||||
|
|
@ -2254,7 +2259,7 @@ define([
|
|||
documentHolder.paraBulletsPicker.selectRecord(rec, true);
|
||||
if (drawDefBullet) {
|
||||
defrec.set('subtype', 8);
|
||||
defrec.set('drawdata', documentHolder._markersArr[7]);
|
||||
defrec.set('numberingInfo', documentHolder._markersArr[7]);
|
||||
defrec.set('tip', documentHolder.tipMarkersDash);
|
||||
documentHolder.paraBulletsPicker.dataViewItems && this.updateBulletTip(documentHolder.paraBulletsPicker.dataViewItems[7], documentHolder.tipMarkersDash);
|
||||
}
|
||||
|
|
@ -4024,12 +4029,10 @@ define([
|
|||
var store = this.documentHolder.paraBulletsPicker.store;
|
||||
var arrNum = [], arrMarker = [];
|
||||
store.each(function(item){
|
||||
var data = item.get('drawdata');
|
||||
data['divId'] = item.get('id');
|
||||
if (item.get('group')==='menu-list-bullet-group')
|
||||
arrMarker.push(data);
|
||||
else
|
||||
arrNum.push(data);
|
||||
(item.get('group')==='menu-list-bullet-group' ? arrMarker : arrNum).push({
|
||||
numberingInfo: {bullet: item.get('numberingInfo')==='undefined' ? undefined : JSON.parse(item.get('numberingInfo'))},
|
||||
divId: item.get('id')
|
||||
});
|
||||
});
|
||||
|
||||
if (this.api && this.api.SetDrawImagePreviewBulletForMenu) {
|
||||
|
|
|
|||
|
|
@ -987,34 +987,43 @@ define([
|
|||
});
|
||||
|
||||
me._markersArr = [
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x00B7), specialFont: 'Symbol'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: 'o', specialFont: 'Courier New'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x00A7), specialFont: 'Wingdings'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x0076), specialFont: 'Wingdings'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x00D8), specialFont: 'Wingdings'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x00FC), specialFont: 'Wingdings'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x00A8), specialFont: 'Symbol'},
|
||||
{type: Asc.asc_PreviewBulletType.char, char: String.fromCharCode(0x2013), specialFont: 'Arial'}
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Symbol"},"bulletType":{"type":"char","char":"·","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Courier New"},"bulletType":{"type":"char","char":"o","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Wingdings"},"bulletType":{"type":"char","char":"§","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Wingdings"},"bulletType":{"type":"char","char":"v","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Wingdings"},"bulletType":{"type":"char","char":"Ø","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Wingdings"},"bulletType":{"type":"char","char":"ü","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Symbol"},"bulletType":{"type":"char","char":"¨","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"char","char":"–","startAt":null}}'
|
||||
];
|
||||
me._numbersArr = [
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"alphaUcPeriod","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"alphaLcParenR","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"alphaLcPeriod","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"arabicPeriod","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"arabicParenR","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"romanUcPeriod","startAt":null}}',
|
||||
'{"bulletTypeface":{"type":"bufont","typeface":"Arial"},"bulletType":{"type":"autonum","char":null,"autoNumType":"romanLcPeriod","startAt":null}}'
|
||||
];
|
||||
me.paraBulletsPicker = {
|
||||
conf: {rec: null},
|
||||
delayRenderTips: true,
|
||||
store : new Common.UI.DataViewStore([
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 1, drawdata: me._markersArr[0], skipRenderOnChange: true, tip: this.tipMarkersFRound},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 2, drawdata: me._markersArr[1], skipRenderOnChange: true, tip: this.tipMarkersHRound},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 3, drawdata: me._markersArr[2], skipRenderOnChange: true, tip: this.tipMarkersFSquare},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 4, drawdata: me._markersArr[3], skipRenderOnChange: true, tip: this.tipMarkersStar},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 5, drawdata: me._markersArr[4], skipRenderOnChange: true, tip: this.tipMarkersArrow},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 6, drawdata: me._markersArr[5], skipRenderOnChange: true, tip: this.tipMarkersCheckmark},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 7, drawdata: me._markersArr[6], skipRenderOnChange: true, tip: this.tipMarkersFRhombus},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 8, drawdata: me._markersArr[7], skipRenderOnChange: true, tip: this.tipMarkersDash},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 4, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.UpperLetterDot_Left}, skipRenderOnChange: true, tip: this.tipNumCapitalLetters},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 5, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.LowerLetterBracket_Left}, skipRenderOnChange: true, tip: this.tipNumLettersParentheses},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 6, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.LowerLetterDot_Left}, skipRenderOnChange: true, tip: this.tipNumLettersPoints},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 1, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.DecimalDot_Right}, skipRenderOnChange: true, tip: this.tipNumNumbersPoint},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 2, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.DecimalBracket_Right}, skipRenderOnChange: true, tip: this.tipNumNumbersParentheses},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 3, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.UpperRomanDot_Right}, skipRenderOnChange: true, tip: this.tipNumRoman},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 7, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.LowerRomanDot_Right}, skipRenderOnChange: true, tip: this.tipNumRomanSmall}
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 1, numberingInfo: me._markersArr[0], skipRenderOnChange: true, tip: this.tipMarkersFRound},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 2, numberingInfo: me._markersArr[1], skipRenderOnChange: true, tip: this.tipMarkersHRound},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 3, numberingInfo: me._markersArr[2], skipRenderOnChange: true, tip: this.tipMarkersFSquare},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 4, numberingInfo: me._markersArr[3], skipRenderOnChange: true, tip: this.tipMarkersStar},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 5, numberingInfo: me._markersArr[4], skipRenderOnChange: true, tip: this.tipMarkersArrow},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 6, numberingInfo: me._markersArr[5], skipRenderOnChange: true, tip: this.tipMarkersCheckmark},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 7, numberingInfo: me._markersArr[6], skipRenderOnChange: true, tip: this.tipMarkersFRhombus},
|
||||
{group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 8, numberingInfo: me._markersArr[7], skipRenderOnChange: true, tip: this.tipMarkersDash},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 4, numberingInfo: me._numbersArr[0], skipRenderOnChange: true, tip: this.tipNumCapitalLetters},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 5, numberingInfo: me._numbersArr[1], skipRenderOnChange: true, tip: this.tipNumLettersParentheses},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 6, numberingInfo: me._numbersArr[2], skipRenderOnChange: true, tip: this.tipNumLettersPoints},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 1, numberingInfo: me._numbersArr[3], skipRenderOnChange: true, tip: this.tipNumNumbersPoint},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 2, numberingInfo: me._numbersArr[4], skipRenderOnChange: true, tip: this.tipNumNumbersParentheses},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 3, numberingInfo: me._numbersArr[5], skipRenderOnChange: true, tip: this.tipNumRoman},
|
||||
{group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 7, numberingInfo: me._numbersArr[6], skipRenderOnChange: true, tip: this.tipNumRomanSmall}
|
||||
]),
|
||||
groups: new Common.UI.DataViewGroupStore([
|
||||
{id: 'menu-list-bullet-group', caption: this.textBullets},
|
||||
|
|
|
|||
Loading…
Reference in a new issue