[PE] Change list presets preview
This commit is contained in:
Julia Radzhabova
parent
410365fa31
commit
f8a76b5693
|
|
@ -557,8 +557,13 @@ define([
|
|||
if (type == 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.get('data').subtype = 0x1000;
|
||||
rec.set('drawdata', {type: type, char: symbol, specialFont: bullet.asc_getSpecialFont()});
|
||||
rec.set('customBullet', custombullet);
|
||||
rec.set('numberingInfo', JSON.stringify(custombullet.asc_getJsonBullet()));
|
||||
rec.set('tip', '');
|
||||
this.toolbar.mnuMarkersPicker.dataViewItems && this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], '');
|
||||
drawDefBullet = false;
|
||||
|
|
@ -567,8 +572,12 @@ define([
|
|||
} else if (type == Asc.asc_PreviewBulletType.image) {
|
||||
var id = bullet.asc_getImageId();
|
||||
if (id) {
|
||||
var custombullet = new Asc.asc_CBullet();
|
||||
custombullet.asc_fillBulletImage(id);
|
||||
|
||||
rec.get('data').subtype = 0x1000;
|
||||
rec.set('drawdata', {type: type, imageId: id});
|
||||
rec.set('customBullet', custombullet);
|
||||
rec.set('numberingInfo', JSON.stringify(custombullet.asc_getJsonBullet()));
|
||||
rec.set('tip', '');
|
||||
this.toolbar.mnuMarkersPicker.dataViewItems && this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], '');
|
||||
drawDefBullet = false;
|
||||
|
|
@ -615,7 +624,7 @@ define([
|
|||
}
|
||||
if (drawDefBullet) {
|
||||
rec.get('data').subtype = 8;
|
||||
rec.set('drawdata', this.toolbar._markersArr[8]);
|
||||
rec.set('numberingInfo', this.toolbar._markersArr[8]);
|
||||
rec.set('tip', this.toolbar.tipMarkersDash);
|
||||
this.toolbar.mnuMarkersPicker.dataViewItems && this.updateBulletTip(this.toolbar.mnuMarkersPicker.dataViewItems[8], this.toolbar.tipMarkersDash);
|
||||
}
|
||||
|
|
@ -1439,9 +1448,10 @@ define([
|
|||
var store = picker.store;
|
||||
var arr = [];
|
||||
store.each(function(item){
|
||||
var data = item.get('drawdata');
|
||||
data['divId'] = item.get('id');
|
||||
arr.push(data);
|
||||
arr.push({
|
||||
numberingInfo: {bullet: item.get('numberingInfo')==='undefined' ? undefined : JSON.parse(item.get('numberingInfo'))},
|
||||
divId: item.get('id')
|
||||
});
|
||||
});
|
||||
if (this.api && this.api.SetDrawImagePreviewBulletForMenu) {
|
||||
this.api.SetDrawImagePreviewBulletForMenu(arr, type);
|
||||
|
|
@ -1469,20 +1479,17 @@ define([
|
|||
|
||||
if (this.api){
|
||||
if (rawData.data.type===0 && rawData.data.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 selectedElements = this.api.getSelectedElements();
|
||||
if (selectedElements && _.isArray(selectedElements)) {
|
||||
for (var i = 0; i< selectedElements.length; i++) {
|
||||
if (Asc.c_oAscTypeSelectElement.Paragraph == selectedElements[i].get_ObjectType()) {
|
||||
var props = selectedElements[i].get_ObjectValue();
|
||||
props.asc_putBullet(bullet);
|
||||
this.api.paraApply(props);
|
||||
break;
|
||||
var bullet = rawData.customBullet;
|
||||
if (bullet) {
|
||||
var selectedElements = this.api.getSelectedElements();
|
||||
if (selectedElements && _.isArray(selectedElements)) {
|
||||
for (var i = 0; i< selectedElements.length; i++) {
|
||||
if (Asc.c_oAscTypeSelectElement.Paragraph == selectedElements[i].get_ObjectType()) {
|
||||
var props = selectedElements[i].get_ObjectValue();
|
||||
props.asc_putBullet(bullet);
|
||||
this.api.paraApply(props);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1591,16 +1591,17 @@ define([
|
|||
// set dataviews
|
||||
|
||||
this._markersArr = [
|
||||
{type: Asc.asc_PreviewBulletType.text, text: 'None'},
|
||||
{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'}
|
||||
'undefined',
|
||||
'{"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}}'
|
||||
];
|
||||
|
||||
var _conf = this.mnuMarkersPicker.conf;
|
||||
this.mnuMarkersPicker = new Common.UI.DataView({
|
||||
el: $('#id-toolbar-menu-markers'),
|
||||
|
|
@ -1610,21 +1611,32 @@ define([
|
|||
allowScrollbar: false,
|
||||
delayRenderTips: true,
|
||||
store: new Common.UI.DataViewStore([
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1},drawdata: this._markersArr[0], skipRenderOnChange: true, tip: this.tipNone},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}, drawdata: this._markersArr[1], skipRenderOnChange: true, tip: this.tipMarkersFRound},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}, drawdata: this._markersArr[2], skipRenderOnChange: true, tip: this.tipMarkersHRound},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}, drawdata: this._markersArr[3], skipRenderOnChange: true, tip: this.tipMarkersFSquare},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}, drawdata: this._markersArr[4], skipRenderOnChange: true, tip: this.tipMarkersStar},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}, drawdata: this._markersArr[5], skipRenderOnChange: true, tip: this.tipMarkersArrow},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}, drawdata: this._markersArr[6], skipRenderOnChange: true, tip: this.tipMarkersCheckmark},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}, drawdata: this._markersArr[7], skipRenderOnChange: true, tip: this.tipMarkersFRhombus},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}, drawdata: this._markersArr[8], skipRenderOnChange: true, tip: this.tipMarkersDash}
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1},numberingInfo: this._markersArr[0], skipRenderOnChange: true, tip: this.tipNone},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}, numberingInfo: this._markersArr[1], skipRenderOnChange: true, tip: this.tipMarkersFRound},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}, numberingInfo: this._markersArr[2], skipRenderOnChange: true, tip: this.tipMarkersHRound},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}, numberingInfo: this._markersArr[3], skipRenderOnChange: true, tip: this.tipMarkersFSquare},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}, numberingInfo: this._markersArr[4], skipRenderOnChange: true, tip: this.tipMarkersStar},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}, numberingInfo: this._markersArr[5], skipRenderOnChange: true, tip: this.tipMarkersArrow},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}, numberingInfo: this._markersArr[6], skipRenderOnChange: true, tip: this.tipMarkersCheckmark},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}, numberingInfo: this._markersArr[7], skipRenderOnChange: true, tip: this.tipMarkersFRhombus},
|
||||
{id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}, numberingInfo: this._markersArr[8], skipRenderOnChange: true, tip: this.tipMarkersDash}
|
||||
]),
|
||||
itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist"></div>')
|
||||
});
|
||||
this.btnMarkers.menu.setInnerMenu([{menu: this.mnuMarkersPicker, index: 0}]);
|
||||
_conf && this.mnuMarkersPicker.selectByIndex(_conf.index, true);
|
||||
|
||||
this._numbersArr = [
|
||||
'undefined',
|
||||
'{"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}}'
|
||||
];
|
||||
|
||||
_conf = this.mnuNumbersPicker.conf;
|
||||
this.mnuNumbersPicker = new Common.UI.DataView({
|
||||
el: $('#id-toolbar-menu-numbering'),
|
||||
|
|
@ -1634,14 +1646,14 @@ define([
|
|||
allowScrollbar: false,
|
||||
delayRenderTips: true,
|
||||
store: new Common.UI.DataViewStore([
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1},drawdata: {type: Asc.asc_PreviewBulletType.text, text: 'None'}, skipRenderOnChange: true, tip: this.tipNone},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.UpperLetterDot_Left}, skipRenderOnChange: true, tip: this.tipNumCapitalLetters},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.LowerLetterBracket_Left}, skipRenderOnChange: true, tip: this.tipNumLettersParentheses},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.LowerLetterDot_Left}, skipRenderOnChange: true, tip: this.tipNumLettersPoints},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.DecimalDot_Right}, skipRenderOnChange: true, tip: this.tipNumNumbersPoint},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.DecimalBracket_Right}, skipRenderOnChange: true, tip: this.tipNumNumbersParentheses},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.UpperRomanDot_Right}, skipRenderOnChange: true, tip: this.tipNumRoman},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, drawdata: {type: Asc.asc_PreviewBulletType.number, numberingType: Asc.asc_oAscNumberingLevel.LowerRomanDot_Right}, skipRenderOnChange: true, tip: this.tipNumRomanSmall}
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}, numberingInfo: this._numbersArr[0], skipRenderOnChange: true, tip: this.tipNone},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}, numberingInfo: this._numbersArr[1], skipRenderOnChange: true, tip: this.tipNumCapitalLetters},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}, numberingInfo: this._numbersArr[2], skipRenderOnChange: true, tip: this.tipNumLettersParentheses},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}, numberingInfo: this._numbersArr[3], skipRenderOnChange: true, tip: this.tipNumLettersPoints},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, numberingInfo: this._numbersArr[4], skipRenderOnChange: true, tip: this.tipNumNumbersPoint},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, numberingInfo: this._numbersArr[5], skipRenderOnChange: true, tip: this.tipNumNumbersParentheses},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, numberingInfo: this._numbersArr[6], skipRenderOnChange: true, tip: this.tipNumRoman},
|
||||
{id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, numberingInfo: this._numbersArr[7], skipRenderOnChange: true, tip: this.tipNumRomanSmall}
|
||||
]),
|
||||
itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist"></div>')
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue