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

[DE] Show more list types

Browse source
This commit is contained in:
Julia Radzhabova 2022-11-16 19:57:02 +03:00
parent 47b088f872
commit c95ca88c86
2 changed files with 232 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -48,7 +48,8 @@ define([
'common/main/lib/component/ThemeColorPalette',
'common/main/lib/component/ColorButton',
'common/main/lib/component/ComboBox',
'common/main/lib/view/SymbolTableDialog'
'common/main/lib/view/SymbolTableDialog',
'documenteditor/main/app/view/ListTypesAdvanced'
], function () { 'use strict';
var nMaxRecent = 5;
@ -223,7 +224,8 @@ define([
};
this.spinners = [];
this.recentBullets = [];
this.recentNumTypes = [];
this.lang = this.api.asc_GetPossibleNumberingLanguage();
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@ -273,7 +275,7 @@ define([
];
var template = [
'<div class="input-group combobox input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<div class="form-control" style="padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>',
'<div class="form-control" style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; padding-top:3px; line-height: 14px; cursor: pointer; <%= style %>"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">'].concat(itemsTemplate).concat([
@ -305,6 +307,7 @@ define([
];
this._itemNoneBullet = { displayValue: this.txtNone, value: Asc.c_oAscNumberingFormat.None };
this._itemNewBullet = { displayValue: this.txtNewBullet, value: -1 };
this._itemMoreTypes = { displayValue: this.txtMoreTypes, value: -2 };
this.loadRecent();
this.cmbFormat = new Common.UI.ComboBoxCustom({
el : $window.find('#id-dlg-numbering-format'),
@ -314,7 +317,7 @@ define([
template : _.template(template.join('')),
itemsTemplate: _.template(itemsTemplate.join('')),
takeFocusOnClose: true,
data : this.type===1 ? [this._itemNoneBullet].concat(this._arrNumbers) : [],
data : [],
updateFormControl: function(record) {
var formcontrol = $(this.el).find('.form-control');
if (record) {
@ -333,6 +336,11 @@ define([
me.fillLevelProps(me.levels[me.level]);
};
this.addNewBullet(callback);
} else if (record.value == -2) {
var callback = function(result) {
me.fillLevelProps(me.levels[me.level]);
};
this.addNewListType(callback);
} else {
var oldformat = this._changedProps.get_Format();
this._changedProps.put_Format(record.value);
@ -711,6 +719,27 @@ define([
win.on('symbol:dblclick', handler);
},
addNewListType: function(callback) {
var me = this,
handler = function(result, value) {
if (result == 'ok') {
if (me._changedProps) {
me._changedProps.put_Format(value);
if (me.api) {
me.api.SetDrawImagePreviewBullet('bulleted-list-preview', me.props, me.level, me.type==2);
}
}
}
callback && callback.call(me, result);
},
win = new DE.Views.ListTypesAdvanced({
modal: true,
lang: me.lang,
handler: handler
});
win.show();
},
_handleInput: function(state) {
if (this.options.handler) {
var props = [], lvlnum = [];
@ -807,16 +836,40 @@ define([
this.btnColor.setColor(color);
if (this.type===1) { // numbers
if (format !== Asc.c_oAscNumberingFormat.None || this.cmbFormat.store.length<1) {
this.checkRecentNum(format);
}
var store = [this._itemNoneBullet].concat(this._arrNumbers);
this.recentNumTypes.forEach(function(item) {
if (item) {
item = parseInt(item);
store.push({ displayValue: AscCommon.IntToNumberFormat(1, item, me.lang) + ', ' + AscCommon.IntToNumberFormat(2, item, me.lang) + ', ' + AscCommon.IntToNumberFormat(3, item, me.lang) + ',...', value: item });
}
});
store.push(this._itemMoreTypes);
this.cmbFormat.setData(store);
this.cmbFormat.setValue((format!==undefined) ? format : '');
this.makeFormatStr(levelProps);
} else {
if (format == Asc.c_oAscNumberingFormat.Bullet || this.cmbFormat.store.length<1) {
(format == Asc.c_oAscNumberingFormat.Bullet) && this.checkRecent(this.bulletProps.symbol, this.bulletProps.font);
if (format !== Asc.c_oAscNumberingFormat.None || this.cmbFormat.store.length<1) {
if (format === Asc.c_oAscNumberingFormat.Bullet)
this.checkRecent(this.bulletProps.symbol, this.bulletProps.font);
else if (format !== Asc.c_oAscNumberingFormat.None)
this.checkRecentNum(format);
var store = (this.type===2) ? [this._itemNoneBullet].concat(this._arrNumbers) : [];
if (this.type===2) {
this.recentNumTypes.forEach(function(item) {
if (item) {
item = parseInt(item);
store.push({ displayValue: AscCommon.IntToNumberFormat(1, item, me.lang) + ', ' + AscCommon.IntToNumberFormat(2, item, me.lang) + ', ' + AscCommon.IntToNumberFormat(3, item, me.lang) + ',...', value: item });
}
});
}
store = store.concat(this._arrBullets);
this.recentBullets.forEach(function(item) {
store.push({ displayValue: me.txtSymbol + ': ', value: Asc.c_oAscNumberingFormat.Bullet, symbol: item.symbol, font: item.font });
});
(this.type===2) && store.push(this._itemMoreTypes);
store.push(this._itemNewBullet);
this.cmbFormat.setData(store);
}
@ -869,7 +922,7 @@ define([
me.levels[num] = me.props.get_Lvl(num);
arr[num] = {start: formatStr.length, index: index};
var lvl = me.levels[num];
formatStr += AscCommon.IntToNumberFormat(lvl.get_Start(), lvl.get_Format());
formatStr += AscCommon.IntToNumberFormat(lvl.get_Start(), lvl.get_Format(), me.lang);
arr[num].end = formatStr.length;
}
});
@ -1071,6 +1124,14 @@ define([
}
}
}
sRecents = Common.localStorage.getItem('de-recent-list-formats');
if(sRecents !== ''){
sRecents = JSON.parse(sRecents);
}
if(_.isArray(sRecents)){
this.recentNumTypes = sRecents;
}
},
saveRecent: function(){
@ -1078,6 +1139,11 @@ define([
Common.localStorage.setItem('de-recent-bullets', sJSON);
},
saveRecentNum: function(){
var sJSON = JSON.stringify(this.recentNumTypes);
Common.localStorage.setItem('de-recent-list-formats', sJSON);
},
checkRecent: function(sSymbol, sFont){
if (!sSymbol) return;
sFont = sFont || '';
@ -1105,6 +1171,32 @@ define([
this.saveRecent();
},
checkRecentNum: function(format){
if (format===null || format===undefined) return;
for(var i = 0; i < this._arrNumbers.length; ++i){
if(this._arrNumbers[i].value === format){
return;
}
}
if(this.recentNumTypes.length === 0){
this.recentNumTypes.push(format);
this.saveRecentNum();
return;
}
for (var i = 0; i < this.recentNumTypes.length; ++i){
if(this.recentNumTypes[i] === format){
this.recentNumTypes.splice(i, 1);
break;
}
}
this.recentNumTypes.splice(0, 0, format);
if(this.recentNumTypes.length > nMaxRecent){
this.recentNumTypes.splice(nMaxRecent, this.recentNumTypes.length - nMaxRecent);
}
this.saveRecentNum();
},
txtTitle: 'List Settings',
txtSize: 'Size',
txtColor: 'Color',
@ -1132,7 +1224,8 @@ define([
txtAlignAt: 'Align at',
txtIndent: 'Text Indent',
txtFollow: 'Follow number with',
txtRestart: 'Restart list'
txtRestart: 'Restart list',
txtMoreTypes: 'More types'
}, DE.Views.ListSettingsDialog || {}))
});

131
apps/documenteditor/main/app/view/ListTypesAdvanced.js Normal file
View file

@ -0,0 +1,131 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2022
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* ListTypesAdvanced.js
*
* Created by Julia Radzhabova on 11/16/2022
* Copyright (c) 2022 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/component/Window'
], function () { 'use strict';
DE.Views.ListTypesAdvanced = Common.UI.Window.extend(_.extend({
options: {
header: false,
width: 250,
cls: 'modal-dlg',
buttons: ['ok', 'cancel']
},
template: '<div class="box">' +
'<div class="input-row">' +
'<label><%= label %></label>' +
'</div>' +
'<div class="input-row" id="id-advanced-list-type">' +
'</div>' +
'</div>',
initialize : function(options) {
_.extend(this.options, options || {}, {
label: this.labelSelect
});
this.options.tpl = _.template(this.template)(this.options);
this.lang = this.options.lang;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
var data = [];
var me = this;
Asc.c_oAscAllNumberingTypes && Asc.c_oAscAllNumberingTypes.forEach(function(item) {
data.push( { displayValue: AscCommon.IntToNumberFormat(1, item, me.lang) + ', ' + AscCommon.IntToNumberFormat(2, item, me.lang) + ', ' + AscCommon.IntToNumberFormat(3, item, me.lang) + ',...', value: item });
});
this.cmbTypes = new Common.UI.ComboBox({
el: $window.find('#id-advanced-list-type'),
cls: 'input-group-nr',
menuStyle: 'min-width: 100%; max-height: 190px;',
data: data,
editable: false,
takeFocusOnClose: true,
scrollAlwaysVisible: true
});
if (this.cmbTypes.scroller) this.cmbTypes.scroller.update({alwaysVisibleY: true});
var rec = (this.options.current!==undefined) ? this.cmbTypes.store.findWhere({value: this.options.current}) : null;
this.cmbTypes.setValue(rec ? rec.value : Asc.c_oAscNumberingFormat.Decimal);
var me = this;
setTimeout(function(){
me.cmbTypes.focus();
}, 100);
},
close: function(suppressevent) {
var $window = this.getChild();
if (!$window.find('.combobox.open').length) {
Common.UI.Window.prototype.close.call(this, arguments);
}
},
onBtnClick: function(event) {
if (this.options.handler) {
this.options.handler.call(this, event.currentTarget.attributes['result'].value, this.cmbTypes.getValue());
}
this.close();
},
onPrimary: function() {
if (this.options.handler) {
this.options.handler.call(this, 'ok', this.cmbTypes.getValue());
}
this.close();
return false;
},
labelSelect : 'Select list type'
}, DE.Views.ListTypesAdvanced || {}))
});