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

refactoring

Browse source
This commit is contained in:
OVSharova 2022-02-17 01:02:01 +03:00
parent 5ec92da4be
commit 06b3af8e7e
5 changed files with 63 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -231,20 +231,23 @@ define([
template: _.template([
'<div class="flex-settings">',
'<table style="margin: 11px 0 0;"><tbody>',
'<tr class="edit">',
'<table style="margin: 10px 14px 0;"><tbody>',
'<tr class="autosave edit forcesave">',
'<td colspan="2" class="group-name top"><label><%= scope.txtEditingSaving %></label></td>',
'</tr>',
'<tr class="autosave">',
'<td colspan="2"><span id="fms-chb-autosave"></span></td>',
'</tr>',
'<tr class="forcesave">',
'<td colspan="2"><span id="fms-chb-forcesave"></span></td>',
'</tr>',
'<tr class="edit">',
'<td colspan="2"><div id="fms-chb-paste-settings"></div></td>',
'</tr>',
'<tr class="edit">',
'<td colspan="2"><span id="fms-chb-compatible"></span></td>',
'</tr>',
'<tr class="edit">',
'<tr class="edit view-review coauth changes-mode">',
'<td colspan="2" class="group-name"><label><%= scope.txtCollaboration %></label></td>',
'</tr>',
'<tr class="coauth changes-mode">',
@ -253,13 +256,13 @@ define([
'<tr class="coauth changes-mode">',
'<td colspan="2"><div style="display: flex;"><div id="fms-rb-coauth-mode-fast"></div>',
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strFast %></label>',
'<label class="comment-text">Real-time co-editing. All changes are saved automatically</label></span></div>',
'<label class="comment-text"><%= scope.strFastTip %></label></span></div>',
'</td>',
'</tr>',
'<tr class="coauth changes-mode">',
'<td colspan="2"><div style="display: flex;"><div id="fms-rb-coauth-mode-strict"></div>',
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strStrict %></label>',
'<label class="comment-text">Use the \'Save\' button to sync the changes you and others make</label></span>',
'<label class="comment-text"><%= scope.strStrictTip %></label></span>',
'</div></td>',
'</tr>',
'<tr class="view-review">',
@ -271,7 +274,7 @@ define([
'<tr class="view-review">',
'<td colspan="2"><div id="fms-rb-show-track-tooltips"></div></td>',
'</tr>',
'<tr class="edit">',
'<tr class="edit show-changes comments">',
'<td colspan="2" class="subgroup-name"><label><%= scope.strShowChanges %></label></td>',
'</tr>',
'<tr class="edit show-changes">',
@ -289,7 +292,7 @@ define([
'<tr class="comments">',
'<td colspan="2"><div id="fms-chb-resolved-comment"></div></td>',
'</tr>',
'<tr class="edit">',
'<tr>',
'<td colspan="2" class="group-name"><label><%= scope.txtProofing %></label></td>',
'</tr>',
'<tr class="edit spellcheck">',
@ -307,10 +310,6 @@ define([
'<tr class="edit">',
'<td colspan="2"><div id="fms-chb-input-mode"></div></td>',
'</tr>',
'<tr class="forcesave">',
'<td><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
'<td><span id="fms-chb-forcesave"></span></td>',
'</tr>',
'<tr class="themes">',
'<td><label><%= scope.strTheme %></label></td>',
'<td>',
@ -338,10 +337,10 @@ define([
'</div>',
'<div class="fms-flex-apply hidden">',
'<table style="margin: 10px 0;"><tbody>',
'<table style="margin: 10px 14px;"><tbody>',
'<tr>',
'<td class="left"></td>',
'<td><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td></td>',
'</tr>',
'</tbody></table>',
'</div>'
@ -416,7 +415,7 @@ define([
this.chForcesave = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-forcesave'),
labelText: this.strForcesave,
labelText: this.textForceSave,
dataHint: '2',
dataHintDirection: 'left',
dataHintOffset: 'small'
@ -830,8 +829,6 @@ define([
this.rbShowChangesLast.setVisible(!fastmode);
},
onChangeCoAuthMode: function (val){
this.fillShowChanges(val == 1);
this.rbShowChangesNone.setValue(val == 1);
@ -919,7 +916,9 @@ define([
txtWorkspace: 'Workspace',
txtHieroglyphs: 'Hieroglyphs',
strShowComments: 'Show comments in text',
strShowResolvedComments: 'Show resolved comments'
strShowResolvedComments: 'Show resolved comments',
txtFastTip: 'Real-time co-editing. All changes are saved automatically',
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make'
}, DE.Views.FileMenuPanels.Settings || {}));
DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

36
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -199,13 +199,16 @@ define([
template: _.template([
'<div class="flex-settings">',
'<table style="margin: 10px 0 0;"><tbody>',
'<table style="margin: 10px 14px auto;"><tbody>',
'<tr class="autosave edit">',
'<td colspan="2" class="group-name top"><label><%= scope.txtEditingSaving %></label></td>',
'</tr>',
'<tr class="autosave">',
'<td colspan="2"><span id="fms-chb-autosave"></span></td>',
'</tr>',
'<tr class="forcesave">',
'<td colspan="2" class="right"><span id="fms-chb-forcesave"></span></td>',
'</tr>',
'<tr class="edit">',
'<td colspan="2"><div id="fms-chb-paste-settings"></div></td>',
'</tr>',
@ -219,14 +222,14 @@ define([
'<td colspan="2"><div style="display: flex;">',
'<div id="fms-rb-coauth-mode-fast"></div>',
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strFast %></label>',
'<label class="comment-text">Real-time co-editing. All changes are saved automatically</label></span>',
'<label class="comment-text"><%= scope.strFastTip %></label></span>',
'</div></td>',
'</tr>',
'<tr class="coauth changes">',
'<td colspan="2"><div style="display: flex;">',
'<div id="fms-rb-coauth-mode-strict"></div>',
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strStrict %></label>',
'<label class="comment-text">Use the \'Save\' button to sync the changes you and others make</label></span>',
'<label class="comment-text"><%= scope.strStrictTip %></label></span>',
'</div></td>',
'</tr>',
'<tr class="edit spellcheck">',
@ -242,10 +245,10 @@ define([
'<td colspan="2" class="group-name"><label><%= scope.txtWorkspace %></label></td>',
'</tr>',
'<tr class="edit">',
'<td><span id="fms-chb-align-guides"></span></td>',
'<td colspan="2"><span id="fms-chb-align-guides"></span></td>',
'</tr>',
'<tr class="edit">',
'<td><div id="fms-chb-input-mode"></div></td>',
'<td colspan="2"><div id="fms-chb-input-mode"></div></td>',
'</tr>',
'<tr class="themes">',
@ -268,24 +271,17 @@ define([
'<td><label><%= scope.strMacrosSettings %></label></td>',
'<td><div><div id="fms-cmb-macros"></div></div></td>',
'</tr>',
'<tr class="forcesave">',
'<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
'<td class="right"><span id="fms-chb-forcesave"></span></td>',
'</tr>','<tr class="divider forcesave"></tr>',
'<tr class="fms-btn-apply">',
'<td class="left"></td>',
'<td class="right" style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.okButtonText %></button></td>',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.okButtonText %></button></td>',
'<td></td>',
'</tr>',
'</tbody></table>',
'</div>',
'<div class="fms-flex-apply hidden">',
'<table style="margin: 10px 0;"><tbody>',
'<table style="margin: 10px 14px;"><tbody>',
'<tr>',
'<td class="left"></td>',
'<td class="right"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td></td>',
'</tr>',
'</tbody></table>',
'</div>'
@ -400,7 +396,7 @@ define([
this.chForcesave = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-forcesave'),
labelText: this.strForcesave,
labelText: this.textForceSave,
dataHint: '2',
dataHintDirection: 'left',
dataHintOffset: 'small'
@ -744,7 +740,9 @@ define([
txtEditingSaving: 'Editing and saving',
txtCollaboration: 'Collaboration',
txtWorkspace: 'Workspace',
txtHieroglyphs: 'Hieroglyphs'
txtHieroglyphs: 'Hieroglyphs',
txtFastTip: 'Real-time co-editing. All changes are saved automatically',
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make'
}, PE.Views.FileMenuPanels.Settings || {}));
PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

1
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -165,6 +165,7 @@
tr {
td {
padding: 6px 10px;
width: auto !important;
&.group-name {
padding-top: 22px;
&.top{padding-top: 5px}

225
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -182,101 +182,6 @@ define([
}
});
SSE.Views.FileMenuPanels.Settings = Common.UI.BaseView.extend(_.extend({
el: '#panel-settings',
menu: undefined,
template: _.template([
'<div style="width:100%; height:100%; position: relative;">',
'<div id="id-settings-menu" style="position: absolute; width:200px; top: 0; bottom: 0;" class="no-padding"></div>',
'<div id="id-settings-content" style="position: absolute; left: 200px; top: 0; right: 0; bottom: 0;" class="no-padding">',
'<div id="panel-settings-general" style="width:100%; height:100%;position:relative;" class="no-padding main-settings-panel active"></div>',
'<div id="panel-settings-spellcheck" style="width:100%; height:100%;position:relative;" class="no-padding main-settings-panel"></div>',
'</div>',
'</div>'
].join('')),
initialize: function(options) {
Common.UI.BaseView.prototype.initialize.call(this,arguments);
this.menu = options.menu;
},
render: function(node) {
var $markup = $(this.template({scope: this}));
this.generalSettings = new SSE.Views.FileMenuPanels.MainSettingsGeneral({menu: this.menu});
this.generalSettings.options = {alias:'MainSettingsGeneral'};
this.generalSettings.render($markup.findById('#panel-settings-general'));
this.spellcheckSettings = new SSE.Views.FileMenuPanels.MainSpellCheckSettings({menu: this.menu});
this.spellcheckSettings.render($markup.findById('#panel-settings-spellcheck'));
this.viewSettingsPicker = new Common.UI.DataView({
el: $markup.findById('#id-settings-menu'),
store: new Common.UI.DataViewStore([
{name: this.txtGeneral, panel: this.generalSettings, iconCls:'toolbar__icon btn-settings', contentTarget: 'panel-settings-general', selected: true},
{name: this.txtSpellChecking, panel: this.spellcheckSettings, iconCls:'toolbar__icon btn-ic-docspell', contentTarget: 'panel-settings-spellcheck'}
]),
itemTemplate: _.template([
'<div id="<%= id %>" class="settings-item-wrap">',
'<div class="settings-icon <%= iconCls %>" style="display: inline-block;" >',
'</div><%= name %>',
'</div>'
].join('')),
itemDataHint: '2',
itemDataHintDirection: 'left',
itemDataHintOffset: [-2, 20]
});
this.viewSettingsPicker.on('item:select', _.bind(function(dataview, itemview, record) {
var panel = record.get('panel');
$('#id-settings-content > div').removeClass('active');
panel.$el.addClass('active');
panel.show();
}, this));
this.$el = $(node).html($markup);
return this;
},
show: function() {
Common.UI.BaseView.prototype.show.call(this,arguments);
var item = this.viewSettingsPicker.getSelectedRec();
item && item.get('panel').show();
},
setMode: function(mode) {
this.mode = mode;
this.generalSettings && this.generalSettings.setMode(this.mode);
this.spellcheckSettings && this.spellcheckSettings.setMode(this.mode);
if (!this.mode.isEdit) {
$(this.viewSettingsPicker.dataViewItems[1].el).hide();
if (this.spellcheckSettings && this.spellcheckSettings.$el && this.spellcheckSettings.$el.hasClass('active'))
this.viewSettingsPicker.selectByIndex(0);
}
},
setApi: function(api) {
this.generalSettings && this.generalSettings.setApi(api);
this.spellcheckSettings && this.spellcheckSettings.setApi(api);
},
SetDisabled: function(disabled) {
if ( disabled ) {
$(this.viewSettingsPicker.dataViewItems[1].el).hide();
this.viewSettingsPicker.selectByIndex(0, true);
} else {
if ( this.mode.isEdit ) {
$(this.viewSettingsPicker.dataViewItems[1].el).show();
}
}
},
txtGeneral: 'General',
txtPageSettings: 'Page Settings',
txtSpellChecking: 'Spell checking'
}, SSE.Views.FileMenuPanels.Settings || {}));
SSE.Views.FileMenuPanels.MainSettingsGeneral = Common.UI.BaseView.extend(_.extend({
el: '#panel-settings-general',
menu: undefined,
@ -284,13 +189,16 @@ define([
template: _.template([
'<div>',
'<div class="flex-settings">',
'<table class="main tb-menu" style="margin: 10px 18px auto;"><tbody>',
'<tr className="autosave edit">',
'<table class="main" style="margin: 10px 18px auto;"><tbody>',
'<tr className="autosave edit forcesave">',
'<td class="group-name top" colspan="2"><label><%= scope.txtEditingSaving %></label></td>',
'</tr>',
'<tr class="autosave">',
'<td colspan = "2"><span id="fms-chb-autosave"></span></td>',
'</tr>',
'<tr class="forcesave">',
'<td colspan="2"><span id="fms-chb-forcesave"></span></td>',
'</tr>',
'<tr class="edit">',
'<td colspan = "2"><div id="fms-chb-paste-settings"></div></td>',
'</tr>',
@ -304,14 +212,14 @@ define([
'<td colspan="2"><div style="display: flex;">',
'<div id="fms-rb-coauth-mode-fast"></div>',
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strFast %></label>',
'<label class="comment-text">Real-time co-editing. All changes are saved automatically</label></span>',
'<label class="comment-text"><%= scope.txtFastTip %></label></span>',
'</div></td>',
'</tr>',
'<tr class="coauth changes">',
'<td colspan="2"><div style="display: flex; ">',
'<div id="fms-rb-coauth-mode-strict"></div>',
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strStrict %></label>',
'<label class="comment-text">Use the \'Save\' button to sync the changes you and others make</label></span>',
'<label class="comment-text"><%= scope.txtStrictTip %></label></span>',
'</div></td>',
'</div></tr>',
'<tr class="comments">',
@ -392,26 +300,18 @@ define([
'<tr>',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtAutoCorrect %></button></div></td>',
'</tr>',
/** coauthoring begin **/
'<tr class="forcesave">',
'<td><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
'<td><span id="fms-chb-forcesave"></span></td>',
'</tr>',
'<tr class="fms-btn-apply">',
'<td></td>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td></td>',
'</tr>',
'</tbody></table>',
'</div>',
'<div class="fms-flex-apply hidden">',
'<table class="main" style="margin: 10px 0; width: 100%"><tbody>',
'<table class="main" style="margin: 10px 18px; width: 100%"><tbody>',
'<tr>',
'<td class="left"></td>',
'<td class="right"><button class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td><button class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td></td>',
'</tr>',
'</tbody></table>',
'</div>',
@ -540,7 +440,7 @@ define([
this.chForcesave = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-forcesave'),
labelText: this.strForcesave,
labelText: this.textForceSave,
dataHint: '2',
dataHintDirection: 'left',
dataHintOffset: 'small'
@ -1092,6 +992,16 @@ define([
this.dlgAutoCorrect.show();
},
SetDisabled: function(disabled) {
if ( disabled ) {
this.$el.hide();
} else {
if ( this.mode.isEdit ) {
this.$el.show();
}
}
},
strLiveComment: 'Turn on option',
strZoom: 'Default Zoom Value',
okButtonText: 'Apply',
@ -1203,95 +1113,12 @@ define([
strDictionaryLanguage: 'Dictionary language',
strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
strIgnoreWordsWithNumbers: 'Ignore words with numbers',
txtAutoCorrect: 'AutoCorrect options...'
txtAutoCorrect: 'AutoCorrect options...',
txtFastTip: 'Real-time co-editing. All changes are saved automatically',
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make'
}, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));
SSE.Views.FileMenuPanels.MainSpellCheckSettings = Common.UI.BaseView.extend(_.extend({
el: '#panel-settings-spellcheck',
menu: undefined,
template: _.template([
'<table class="main" style="margin: 30px 0;"><tbody>',
'<tr class="divider"></tr>',
'<tr>',
'<td class="left"></td>',
'<td class="right"><button id="fms-spellcheck-btn-apply" class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'</tr>',
'</tbody></table>'
].join('')),
initialize: function(options) {
Common.UI.BaseView.prototype.initialize.call(this,arguments);
this.menu = options.menu;
},
render: function(node) {
var me = this;
var $markup = $(this.template({scope: this}));
this.btnApply = new Common.UI.Button({
el: $markup.findById('#fms-spellcheck-btn-apply')
});
this.btnApply.on('click', _.bind(this.applySettings, this));
this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
el: this.$el,
suppressScrollX: true,
alwaysVisibleY: true
});
}
return this;
},
show: function() {
Common.UI.BaseView.prototype.show.call(this,arguments);
this.updateSettings();
this.scroller && this.scroller.update();
},
setMode: function(mode) {
this.mode = mode;
},
setApi: function(api) {
this.api = api;
},
updateSettings: function() {
},
applySettings: function() {
},
okButtonText: 'Apply',
}, SSE.Views.FileMenuPanels.MainSpellCheckSettings || {}));
SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
el: '#panel-recentfiles',
menu: undefined,

6
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -159,7 +159,7 @@
flex-direction: column;
}
#panel-settings, #panel-settings-general {
#panel-settings-general {
padding: 0;
#id-settings-menu {
@ -206,9 +206,7 @@
}
table {
&.tb-menu{
width: auto !important;
}
width: auto !important;
tr {
td {
//padding: 5px 10px;