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

Merge pull request #851 from ONLYOFFICE/fix/bug-50113

Browse source 
Fix/bug 50113
This commit is contained in:
Julia Radzhabova 2021-04-29 16:42:05 +03:00 committed by GitHub
parent 559b0292e9 2ef1c936e9
commit 276f068e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 67 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/component/Window.js
View file

@ -769,6 +769,9 @@ define([
'-o-transform': 'scale(1)',
'opacity': '1'
});
setTimeout(function () {
me.fireEvent('animate:after', me);
}, 210);
}, 1);
setTimeout(function () {
@ -779,6 +782,9 @@ define([
this.$window.css({opacity: 1});
this.$window.addClass('notransform');
this.fireEvent('show', this);
setTimeout(function () {
me.fireEvent('animate:after', me);
}, 10);
}
Common.NotificationCenter.trigger('window:show', this);

6
apps/common/main/lib/view/AdvancedSettingsWindow.js
View file

@ -86,6 +86,8 @@ define([
var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
this.on('animate:after', _.bind(this.onAnimateAfter, this));
this.btnsCategory = [];
_.each($window.find('.btn-category'), function(item, index) {
var btnEl = $(item);
@ -173,6 +175,10 @@ define([
if (this.storageName)
Common.localStorage.setItem(this.storageName, this.getActiveCategory());
Common.UI.Window.prototype.close.call(this, suppressevent);
},
onAnimateAfter: function() {
}
}, Common.Views.AdvancedSettingsWindow || {}));
});

2
apps/documenteditor/main/app/controller/FormsTab.js
View file

@ -212,7 +212,7 @@ define([
onNoControlsColor: function(item) {
if (!item.isChecked())
this.api.asc_SetSpecialFormsHighlightColor(255, 192, 0);
this.api.asc_SetSpecialFormsHighlightColor(201, 200, 255);
else
this.api.asc_SetSpecialFormsHighlightColor();
Common.NotificationCenter.trigger('edit:complete', this.toolbar);

12
apps/documenteditor/main/app/view/PageMarginsDialog.js
View file

@ -305,6 +305,8 @@ define([
this.window = this.getChild();
this.window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.on('animate:after', _.bind(this.onAnimateAfter, this));
this.updateMetricUnit();
},
@ -316,6 +318,12 @@ define([
return this.spnTop;
},
onAnimateAfter: function() {
if (this.api && this.properties) {
this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
}
},
_handleInput: function(state) {
if (this.options.handler) {
if (state == 'ok') {
@ -374,10 +382,6 @@ define([
this.cmbGutterPosition.setValue(0);
}
this.cmbGutterPosition.setDisabled(mirrorMargins);
if (this.api) {
this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties);
}
}
},

10
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -687,7 +687,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
];
},
onCategoryClick: function(btn, index) {
onCategoryClick: function(btn, index, cmp, e) {
Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index);
var me = this;
@ -698,6 +698,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
break;
case 3:
me.numSpacing.focus();
if (e && (e instanceof jQuery.Event))
me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty());
break;
case 4:
me.numDefaultTab.focus();
@ -709,6 +711,10 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
}, 10);
},
onAnimateAfter: function() {
(this.getActiveCategory()==3) && this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty());
},
getSettings: function() {
if ( this.ChangedBorders === null ) {
this._changedProps.put_Borders(this.Borders);
@ -892,8 +898,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numSpacing.setValue((props.get_TextSpacing() !== null && props.get_TextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_TextSpacing()) : '', true);
this.numPosition.setValue((props.get_Position() !== null && props.get_Position() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Position()) : '', true);
this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps);
// Tabs
this.numDefaultTab.setValue((props.get_DefaultTab() !== null && props.get_DefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.get_DefaultTab().toFixed(1))) : '', true);

2
apps/documenteditor/main/locale/da.json
View file

@ -2602,7 +2602,7 @@
"DE.Views.Toolbar.tipAlignRight": "Tilpas til højre",
"DE.Views.Toolbar.tipBack": "Tilbage",
"DE.Views.Toolbar.tipBlankPage": "Indsæt tom side",
"DE.Views.Toolbar.tipChangeCase:": "Ændre store/små bogstaver",
"DE.Views.Toolbar.tipChangeCase": "Ændre store/små bogstaver",
"DE.Views.Toolbar.tipChangeChart": "Skift diagramtype",
"DE.Views.Toolbar.tipClearStyle": "Ryd formatering",
"DE.Views.Toolbar.tipColorSchemas": "Skift farveskema",

2
apps/documenteditor/main/locale/de.json
View file

@ -2606,7 +2606,7 @@
"DE.Views.Toolbar.tipAlignRight": "Rechtsbündig ausrichten",
"DE.Views.Toolbar.tipBack": "Zurück",
"DE.Views.Toolbar.tipBlankPage": "Leere Seite einlegen",
"DE.Views.Toolbar.tipChangeCase:": "Groß-/Kleinschreibung",
"DE.Views.Toolbar.tipChangeCase": "Groß-/Kleinschreibung",
"DE.Views.Toolbar.tipChangeChart": "Diagrammtyp ändern",
"DE.Views.Toolbar.tipClearStyle": "Formatierung löschen",
"DE.Views.Toolbar.tipColorSchemas": "Farbschema ändern",

2
apps/documenteditor/main/locale/el.json
View file

@ -2602,7 +2602,7 @@
"DE.Views.Toolbar.tipAlignRight": "Στοίχιση δεξιά",
"DE.Views.Toolbar.tipBack": "Πίσω",
"DE.Views.Toolbar.tipBlankPage": "Εισαγωγή κενής σελίδας",
"DE.Views.Toolbar.tipChangeCase:": "Αλλαγή πεζών-κεφαλαίων",
"DE.Views.Toolbar.tipChangeCase": "Αλλαγή πεζών-κεφαλαίων",
"DE.Views.Toolbar.tipChangeChart": "Αλλαγή τύπου γραφήματος",
"DE.Views.Toolbar.tipClearStyle": "Εκκαθάριση τεχνοτροπίας",
"DE.Views.Toolbar.tipColorSchemas": "Αλλαγή χρωματικού σχεδίου",

3
apps/documenteditor/main/locale/en.json
View file

@ -2609,7 +2609,8 @@
"DE.Views.Toolbar.tipAlignRight": "Align right",
"DE.Views.Toolbar.tipBack": "Back",
"DE.Views.Toolbar.tipBlankPage": "Insert blank page",
"DE.Views.Toolbar.tipChangeCase:": "Change case",
"del_DE.Views.Toolbar.tipChangeCase:": "Change case",
"DE.Views.Toolbar.tipChangeCase": "Change case",
"DE.Views.Toolbar.tipChangeChart": "Change chart type",
"DE.Views.Toolbar.tipClearStyle": "Clear style",
"DE.Views.Toolbar.tipColorSchemas": "Change color scheme",

2
apps/documenteditor/main/locale/es.json
View file

@ -2606,7 +2606,7 @@
"DE.Views.Toolbar.tipAlignRight": "Alinear a la derecha",
"DE.Views.Toolbar.tipBack": "Atrás",
"DE.Views.Toolbar.tipBlankPage": "Insertar página en blanco",
"DE.Views.Toolbar.tipChangeCase:": "Cambiar mayúsculas y minúsculas",
"DE.Views.Toolbar.tipChangeCase": "Cambiar mayúsculas y minúsculas",
"DE.Views.Toolbar.tipChangeChart": "Cambiar tipo de gráfico",
"DE.Views.Toolbar.tipClearStyle": "Borrar estilo",
"DE.Views.Toolbar.tipColorSchemas": "Cambiar combinación de colores",

2
apps/documenteditor/main/locale/fr.json
View file

@ -2606,7 +2606,7 @@
"DE.Views.Toolbar.tipAlignRight": "Aligner à droite",
"DE.Views.Toolbar.tipBack": "Arrière",
"DE.Views.Toolbar.tipBlankPage": "Insérer page vide",
"DE.Views.Toolbar.tipChangeCase:": "Changer de cas",
"DE.Views.Toolbar.tipChangeCase": "Changer de cas",
"DE.Views.Toolbar.tipChangeChart": "Modifier le type de graphique",
"DE.Views.Toolbar.tipClearStyle": "Effacer le style",
"DE.Views.Toolbar.tipColorSchemas": "Modifier le jeu de couleurs",

2
apps/documenteditor/main/locale/hu.json
View file

@ -2599,7 +2599,7 @@
"DE.Views.Toolbar.tipAlignRight": "Jobbra rendez",
"DE.Views.Toolbar.tipBack": "Vissza",
"DE.Views.Toolbar.tipBlankPage": "Üres oldal beillesztése",
"DE.Views.Toolbar.tipChangeCase:": "Kis- és nagybetűk megváltoztatása",
"DE.Views.Toolbar.tipChangeCase": "Kis- és nagybetűk megváltoztatása",
"DE.Views.Toolbar.tipChangeChart": "Diagramtípus módosítása",
"DE.Views.Toolbar.tipClearStyle": "Stílus törlése",
"DE.Views.Toolbar.tipColorSchemas": "Színséma módosítása",

2
apps/documenteditor/main/locale/nl.json
View file

@ -2599,7 +2599,7 @@
"DE.Views.Toolbar.tipAlignRight": "Rechts uitlijnen",
"DE.Views.Toolbar.tipBack": "Terug",
"DE.Views.Toolbar.tipBlankPage": "Invoegen nieuwe pagina",
"DE.Views.Toolbar.tipChangeCase:": "Verander lettertype",
"DE.Views.Toolbar.tipChangeCase": "Verander lettertype",
"DE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen",
"DE.Views.Toolbar.tipClearStyle": "Stijl wissen",
"DE.Views.Toolbar.tipColorSchemas": "Kleurenschema wijzigen",

2
apps/documenteditor/main/locale/ro.json
View file

@ -2599,7 +2599,7 @@
"DE.Views.Toolbar.tipAlignRight": "Aliniere la dreapta",
"DE.Views.Toolbar.tipBack": "Înapoi",
"DE.Views.Toolbar.tipBlankPage": "Inserare pagină necompletată",
"DE.Views.Toolbar.tipChangeCase:": "Modificarea scrierii cu majuscule sau minuscule",
"DE.Views.Toolbar.tipChangeCase": "Modificarea scrierii cu majuscule sau minuscule",
"DE.Views.Toolbar.tipChangeChart": "Modificare tip diagramă",
"DE.Views.Toolbar.tipClearStyle": "Golire stil",
"DE.Views.Toolbar.tipColorSchemas": "Modificare schemă de culori",

2
apps/documenteditor/main/locale/ru.json
View file

@ -2609,7 +2609,7 @@
"DE.Views.Toolbar.tipAlignRight": "Выравнивание по правому краю",
"DE.Views.Toolbar.tipBack": "Назад",
"DE.Views.Toolbar.tipBlankPage": "Вставить пустую страницу",
"DE.Views.Toolbar.tipChangeCase:": "Изменить регистр",
"DE.Views.Toolbar.tipChangeCase": "Изменить регистр",
"DE.Views.Toolbar.tipChangeChart": "Изменить тип диаграммы",
"DE.Views.Toolbar.tipClearStyle": "Очистить стиль",
"DE.Views.Toolbar.tipColorSchemas": "Изменение цветовой схемы",

2
apps/documenteditor/main/locale/sk.json
View file

@ -2421,7 +2421,7 @@
"DE.Views.Toolbar.tipAlignRight": "Zarovnať doprava",
"DE.Views.Toolbar.tipBack": "Späť",
"DE.Views.Toolbar.tipBlankPage": "Vložiť prázdnu stranu",
"DE.Views.Toolbar.tipChangeCase:": "Zmeniť púzdro",
"DE.Views.Toolbar.tipChangeCase": "Zmeniť púzdro",
"DE.Views.Toolbar.tipChangeChart": "Zmeniť typ grafu",
"DE.Views.Toolbar.tipClearStyle": "Vymazať štýl",
"DE.Views.Toolbar.tipColorSchemas": "Zmeniť farebnú schému",

2
apps/documenteditor/main/locale/sl.json
View file

@ -1885,7 +1885,7 @@
"DE.Views.Toolbar.tipAlignRight": "Poravnaj desno",
"DE.Views.Toolbar.tipBack": "Nazaj",
"DE.Views.Toolbar.tipBlankPage": "Vstavi prazno stran",
"DE.Views.Toolbar.tipChangeCase:": "Zamenjaj velikost črk",
"DE.Views.Toolbar.tipChangeCase": "Zamenjaj velikost črk",
"DE.Views.Toolbar.tipChangeChart": "Spremeni vrsto razpredelnice",
"DE.Views.Toolbar.tipClearStyle": "Počisti stil",
"DE.Views.Toolbar.tipColorSchemas": "Spremeni barvno shemo",

10
apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -414,7 +414,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
];
},
onCategoryClick: function(btn, index) {
onCategoryClick: function(btn, index, cmp, e) {
Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index);
var me = this;
@ -425,6 +425,8 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
break;
case 1:
me.numSpacing.focus();
if (e && (e instanceof jQuery.Event))
me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty());
break;
case 2:
me.numDefaultTab.focus();
@ -433,6 +435,10 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
}, 10);
},
onAnimateAfter: function() {
(this.getActiveCategory()==1) && this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty());
},
getSettings: function() {
if ( this._tabListChanged ) {
if (this._changedProps.get_Tabs()===null || this._changedProps.get_Tabs()===undefined)
@ -494,8 +500,6 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.numSpacing.setValue((props.get_TextSpacing() !== null && props.get_TextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_TextSpacing()) : '', true);
this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps);
// Tabs
this.numDefaultTab.setValue((props.get_DefaultTab() !== null && props.get_DefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.get_DefaultTab().toFixed(1))) : '', true);

2
apps/presentationeditor/main/locale/da.json
View file

@ -1901,7 +1901,7 @@
"PE.Views.Toolbar.textUnderline": "Understreg",
"PE.Views.Toolbar.tipAddSlide": "Tilføj dias",
"PE.Views.Toolbar.tipBack": "Tilbage",
"PE.Views.Toolbar.tipChangeCase:": "Ændre store/små bogstaver",
"PE.Views.Toolbar.tipChangeCase": "Ændre store/små bogstaver",
"PE.Views.Toolbar.tipChangeChart": "Skift diagramtype",
"PE.Views.Toolbar.tipChangeSlide": "Skift dias layout",
"PE.Views.Toolbar.tipClearStyle": "Ryd formatering",

2
apps/presentationeditor/main/locale/de.json
View file

@ -1901,7 +1901,7 @@
"PE.Views.Toolbar.textUnderline": "Unterstrichen",
"PE.Views.Toolbar.tipAddSlide": "Folie hinzufügen",
"PE.Views.Toolbar.tipBack": "Zurück",
"PE.Views.Toolbar.tipChangeCase:": "Groß-/Kleinschreibung",
"PE.Views.Toolbar.tipChangeCase": "Groß-/Kleinschreibung",
"PE.Views.Toolbar.tipChangeChart": "Diagrammtyp ändern",
"PE.Views.Toolbar.tipChangeSlide": "Folienlayout ändern",
"PE.Views.Toolbar.tipClearStyle": "Formatierung löschen",

2
apps/presentationeditor/main/locale/el.json
View file

@ -1901,7 +1901,7 @@
"PE.Views.Toolbar.textUnderline": "Υπογράμμιση",
"PE.Views.Toolbar.tipAddSlide": "Προσθήκη διαφάνειας",
"PE.Views.Toolbar.tipBack": "Πίσω",
"PE.Views.Toolbar.tipChangeCase:": "Αλλαγή πεζών-κεφαλαίων",
"PE.Views.Toolbar.tipChangeCase": "Αλλαγή πεζών-κεφαλαίων",
"PE.Views.Toolbar.tipChangeChart": "Αλλαγή τύπου γραφήματος",
"PE.Views.Toolbar.tipChangeSlide": "Αλλαγή διάταξης διαφάνειας",
"PE.Views.Toolbar.tipClearStyle": "Εκκαθάριση τεχνοτροπίας",

3
apps/presentationeditor/main/locale/en.json
View file

@ -1906,7 +1906,8 @@
"PE.Views.Toolbar.textUnderline": "Underline",
"PE.Views.Toolbar.tipAddSlide": "Add slide",
"PE.Views.Toolbar.tipBack": "Back",
"PE.Views.Toolbar.tipChangeCase:": "Change case",
"del_PE.Views.Toolbar.tipChangeCase:": "Change case",
"PE.Views.Toolbar.tipChangeCase": "Change case",
"PE.Views.Toolbar.tipChangeChart": "Change chart type",
"PE.Views.Toolbar.tipChangeSlide": "Change slide layout",
"PE.Views.Toolbar.tipClearStyle": "Clear style",

2
apps/presentationeditor/main/locale/es.json
View file

@ -1901,7 +1901,7 @@
"PE.Views.Toolbar.textUnderline": "Subrayar",
"PE.Views.Toolbar.tipAddSlide": "Añadir diapositiva",
"PE.Views.Toolbar.tipBack": "Atrás",
"PE.Views.Toolbar.tipChangeCase:": "Cambiar mayúsculas y minúsculas",
"PE.Views.Toolbar.tipChangeCase": "Cambiar mayúsculas y minúsculas",
"PE.Views.Toolbar.tipChangeChart": "Cambiar tipo de gráfico",
"PE.Views.Toolbar.tipChangeSlide": "Cambiar diseño de diapositiva",
"PE.Views.Toolbar.tipClearStyle": "Limpiar estilo",

2
apps/presentationeditor/main/locale/fr.json
View file

@ -1901,7 +1901,7 @@
"PE.Views.Toolbar.textUnderline": "Souligné",
"PE.Views.Toolbar.tipAddSlide": "Ajouter diapositive",
"PE.Views.Toolbar.tipBack": "En arrière",
"PE.Views.Toolbar.tipChangeCase:": "Changer de cas",
"PE.Views.Toolbar.tipChangeCase": "Changer de cas",
"PE.Views.Toolbar.tipChangeChart": "Modifier le type de graphique",
"PE.Views.Toolbar.tipChangeSlide": "Modifier la disposition de diapositive",
"PE.Views.Toolbar.tipClearStyle": "Effacer le style",

2
apps/presentationeditor/main/locale/hu.json
View file

@ -1900,7 +1900,7 @@
"PE.Views.Toolbar.textUnderline": "Aláhúzott",
"PE.Views.Toolbar.tipAddSlide": "Minden dia",
"PE.Views.Toolbar.tipBack": "Vissza",
"PE.Views.Toolbar.tipChangeCase:": "Kis- és nagybetűk megváltoztatása",
"PE.Views.Toolbar.tipChangeCase": "Kis- és nagybetűk megváltoztatása",
"PE.Views.Toolbar.tipChangeChart": "Diagramtípus módosítása",
"PE.Views.Toolbar.tipChangeSlide": "Dia elrendezés módosítása",
"PE.Views.Toolbar.tipClearStyle": "Stílus törlése",

2
apps/presentationeditor/main/locale/ja.json
View file

@ -1898,7 +1898,7 @@
"PE.Views.Toolbar.textUnderline": "下線",
"PE.Views.Toolbar.tipAddSlide": "スライドの追加",
"PE.Views.Toolbar.tipBack": "戻る",
"PE.Views.Toolbar.tipChangeCase:": "大文字小文字を変更",
"PE.Views.Toolbar.tipChangeCase": "大文字小文字を変更",
"PE.Views.Toolbar.tipChangeChart": "グラフの種類を変更",
"PE.Views.Toolbar.tipChangeSlide": "レイアウトスライドの変更",
"PE.Views.Toolbar.tipClearStyle": "スタイルのクリア",

2
apps/presentationeditor/main/locale/nl.json
View file

@ -1900,7 +1900,7 @@
"PE.Views.Toolbar.textUnderline": "Onderstrepen",
"PE.Views.Toolbar.tipAddSlide": "Dia toevoegen",
"PE.Views.Toolbar.tipBack": "Terug",
"PE.Views.Toolbar.tipChangeCase:": "Verander lettertype",
"PE.Views.Toolbar.tipChangeCase": "Verander lettertype",
"PE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen",
"PE.Views.Toolbar.tipChangeSlide": "Dia-indeling wijzigen",
"PE.Views.Toolbar.tipClearStyle": "Stijl wissen",

2
apps/presentationeditor/main/locale/ro.json
View file

@ -1900,7 +1900,7 @@
"PE.Views.Toolbar.textUnderline": "Subliniat",
"PE.Views.Toolbar.tipAddSlide": "Adăugare diapozitiv",
"PE.Views.Toolbar.tipBack": "Înapoi",
"PE.Views.Toolbar.tipChangeCase:": "Modificarea scrierii cu majuscule sau minuscule",
"PE.Views.Toolbar.tipChangeCase": "Modificarea scrierii cu majuscule sau minuscule",
"PE.Views.Toolbar.tipChangeChart": "Modificare tip diagramă",
"PE.Views.Toolbar.tipChangeSlide": "Modificare aspect diapozitiv",
"PE.Views.Toolbar.tipClearStyle": "Golire stil",

2
apps/presentationeditor/main/locale/ru.json
View file

@ -1906,7 +1906,7 @@
"PE.Views.Toolbar.textUnderline": "Подчеркнутый",
"PE.Views.Toolbar.tipAddSlide": "Добавить слайд",
"PE.Views.Toolbar.tipBack": "Назад",
"PE.Views.Toolbar.tipChangeCase:": "Изменить регистр",
"PE.Views.Toolbar.tipChangeCase": "Изменить регистр",
"PE.Views.Toolbar.tipChangeChart": "Изменить тип диаграммы",
"PE.Views.Toolbar.tipChangeSlide": "Изменить макет слайда",
"PE.Views.Toolbar.tipClearStyle": "Очистить стиль",

10
apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -412,7 +412,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
];
},
onCategoryClick: function(btn, index) {
onCategoryClick: function(btn, index, cmp, e) {
Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index);
var me = this;
@ -423,6 +423,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
break;
case 1:
me.numSpacing.focus();
if (e && (e instanceof jQuery.Event))
me.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty());
break;
case 2:
me.numDefaultTab.focus();
@ -431,6 +433,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
}, 10);
},
onAnimateAfter: function() {
(this.getActiveCategory()==1) && this.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty());
},
getSettings: function() {
if ( this._tabListChanged ) {
if (this._changedProps.asc_getTabs()===null || this._changedProps.asc_getTabs()===undefined)
@ -489,8 +495,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.numSpacing.setValue((props.asc_getTextSpacing() !== null && props.asc_getTextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getTextSpacing()) : '', true);
this.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps);
// Tabs
this.numDefaultTab.setValue((props.asc_getDefaultTab() !== null && props.asc_getDefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.asc_getDefaultTab().toFixed(1))) : '', true);