Merge pull request #477 from ONLYOFFICE/fix/bugfix

Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-08-24 18:47:47 +03:00 committed by GitHub
commit a5916ab5d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 65 additions and 27 deletions

View file

@ -159,7 +159,7 @@ define([
data : [
{ displayValue: this.txtNone, value: -1 },
{ displayValue: 'A, B, C,...', value: 4 },
{ displayValue: 'a), b), c),...', value: 6 },
{ displayValue: 'a), b), c),...', value: 5 },
{ displayValue: 'a, b, c,...', value: 6 },
{ displayValue: '1, 2, 3,...', value: 1 },
{ displayValue: '1), 2), 3),...', value: 2 },

View file

@ -2241,7 +2241,7 @@ define([
});
win.$window.find('#id-equation-convert-help').on('click', function (e) {
win && win.close();
me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm');
me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm#convertequation');
})
},

View file

@ -832,7 +832,7 @@ define([
toolbar.mnuInsertPageNum.setDisabled(need_disable);
var in_footnote = this.api.asc_IsCursorInFootnote();
need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock;
need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock;
toolbar.btnsPageBreak.setDisabled(need_disable);
toolbar.btnBlankPage.setDisabled(need_disable);

View file

@ -1529,7 +1529,7 @@ define([
});
this.viewHelpPicker.on('item:select', function(dataview, itemview, record) {
me.iFrame.src = me.urlPref + record.get('src');
me.onSelectItem(record.get('src'));
});
this.iFrame = document.createElement('iframe');
@ -1575,10 +1575,14 @@ define([
}
},
success: function () {
var rec = (me.openUrl) ? store.findWhere({ src: me.openUrl }) || store.at(0) : store.at(0);
me.viewHelpPicker.selectRecord(rec);
var rec = me.openUrl ? store.find(function(record){
return (me.openUrl.indexOf(record.get('src'))>=0);
}) : store.at(0);
if (rec) {
me.viewHelpPicker.selectRecord(rec, true);
me.viewHelpPicker.scrollToRecord(rec);
me.iFrame.src = me.urlPref + rec.get('src');
}
me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src'));
}
};
store.url = 'resources/help/' + lang + '/Contents.json';
@ -1594,15 +1598,22 @@ define([
this._scrollerInited = true;
}
if (url) {
var rec = this.viewHelpPicker.store.findWhere({
src: url
if (this.viewHelpPicker.store.length>0) {
var rec = this.viewHelpPicker.store.find(function(record){
return (url.indexOf(record.get('src'))>=0);
});
if (rec) {
this.viewHelpPicker.selectRecord(rec);
this.viewHelpPicker.selectRecord(rec, true);
this.viewHelpPicker.scrollToRecord(rec);
}
this.onSelectItem(url);
} else
this.openUrl = url;
}
},
onSelectItem: function(src) {
this.iFrame.src = this.urlPref + src;
}
});

View file

@ -603,8 +603,9 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
var val = this.props.get_Type();
if (val == Asc.c_oAscWatermarkType.Image) {
val = this.cmbScale.getValue();
val = props.put_Scale((val<0) ? val : val/100);
val = parseInt(this.cmbScale.getValue());
isNaN(val) && (val = -1);
props.put_Scale((val<0) ? val : val/100);
} else {
props.put_Text(this.cmbText.getValue());
props.put_IsDiagonal(this.radioDiag.getValue());

View file

@ -90,6 +90,12 @@
<li>To delete an <em>Accent</em>, you can right-click on it and select the <b>Remove accent character</b>, <b>Delete char</b> or <b>Remove bar</b> option from the menu (the available options differ depending on the selected accent).</li>
<li>To delete a row or a column of a <em>Matrix</em>, you can right-click on the placeholder within the row/column you need to delete, select the <b>Delete</b> option from the menu, then select <b>Delete Row/Column</b>.</li>
</ul>
<h3 id="convertequation">Convert equations</h3>
<p>If you open an existing document containing equations which were created with an old version of equation editor (for example, with MS Office versions before 2007), you need to convert these equations to the Office Math ML format to be able to edit them.</p>
<p>To convert an equation, double-click it. The warning window will appear:</p>
<p><img alt="Convert equation" src="../images/convertequation.png" /></p>
<p>To convert the selected equation only, click the <b>Yes</b> button in the warning window. To convert all equations in this document, check the <b>Apply to all equations</b> box and click <b>Yes</b>.</p>
<p>Once the equation is converted, you can edit it.</p>
</div>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -92,6 +92,12 @@
<li>Чтобы удалить <em>Диакритический знак</em>, можно щелкнуть по нему правой кнопкой мыши и выбрать из контекстного меню пункт <b>Удалить диакритический знак</b>, <b>Удалить символ</b> или <b>Удалить черту</b> (доступные опции отличаются в зависимости от выбранного диакритического знака).</li>
<li>Чтобы удалить строку или столбец <em>Матрицы</em>, можно щелкнуть правой кнопкой мыши по полю для заполнения внутри строки/столбца, который требуется удалить, выбрать из контекстного меню пункт <b>Удалить</b>, а затем - <b>Удалить строку/столбец</b>.</li>
</ul>
<h3 id="convertequation">Преобразование уравнений</h3>
<p>Если вы открываете существующий документ с уравнениями, которые были созданы с помощью старой версии редактора уравнений (например, в версиях, предшествующих MS Office 2007), эти уравнения необходимо преобразовать в формат Office Math ML, чтобы иметь возможность их редактировать.</p>
<p>Чтобы преобразовать уравнение, дважды щелкните по нему. Откроется окно с предупреждением:</p>
<p><img alt="Преобразование уравнений" src="../images/convertequation.png" /></p>
<p>Чтобы преобразовать только выбранное уравнение, нажмите кнопку <b>Да</b> в окне предупреждения. Чтобы преобразовать все уравнения в документе, поставьте галочку <b>Применить ко всем уравнениям</b> и нажмите кнопку <b>Да</b>.</p>
<p>После преобразования уравнения вы сможете его редактировать.</p>
</div>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View file

@ -1918,8 +1918,8 @@ define([
item.setDisabled(isCellLocked);
});
documentHolder.pmiCopy.setDisabled(false);
documentHolder.pmiCut.setDisabled(isCellLocked || inPivot); // can't edit pivot cells
documentHolder.pmiPaste.setDisabled(isCellLocked || inPivot);
documentHolder.pmiCut.setDisabled(isCellLocked); // can't edit pivot cells
documentHolder.pmiPaste.setDisabled(isCellLocked);
documentHolder.pmiInsertEntire.setDisabled(isCellLocked || isTableLocked);
documentHolder.pmiInsertCells.setDisabled(isCellLocked || isTableLocked || inPivot);
documentHolder.pmiInsertTable.setDisabled(isCellLocked || isTableLocked);

View file

@ -204,7 +204,7 @@ define([
}
}
if (this.args.length<1) {
this.panelArgs.text('This function has no arguments');
this.panelArgs.text(this.textNoArgs);
this.lblArgDesc.addClass('hidden');
} else {
if (this.args.length==1 && this.repeatedArg && this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments
@ -271,7 +271,7 @@ define([
lblName: div.find('#formula-wizard-lbl-name-arg'+argcount),
lblValue: div.find('#formula-wizard-lbl-val-arg'+argcount),
argInput: txt,
argName: 'Argument ' + (argcount+1),
argName: me.textArgument + ' ' + (argcount+1),
// argDesc: 'some argument description',
argType: argtype,
argTypeName: me.getArgType(argtype)
@ -314,19 +314,19 @@ define([
var str = '';
switch (type) {
case Asc.c_oAscFormulaArgumentType.number:
str = 'number';
str = this.textNumber;
break;
case Asc.c_oAscFormulaArgumentType.text:
str = 'text';
str = this.textText;
break;
case Asc.c_oAscFormulaArgumentType.reference:
str = 'reference';
str = this.textRef;
break;
case Asc.c_oAscFormulaArgumentType.any:
str = 'any';
str = this.textAny;
break;
case Asc.c_oAscFormulaArgumentType.logical:
str = 'logical';
str = this.textLogical;
break;
}
return str;
@ -434,7 +434,14 @@ define([
textValue: 'Formula result',
textFunctionRes: 'Function result',
textFunction: 'Function',
textHelp: 'Help on this function'
textHelp: 'Help on this function',
textNoArgs: 'This function has no arguments',
textArgument: 'Argument',
textNumber: 'number',
textText: 'text',
textRef: 'reference',
textAny: 'any',
textLogical: 'logical'
}, SSE.Views.FormulaWizard || {}))
});

View file

@ -264,7 +264,7 @@ define([
var me = this;
me.settings = settings;
var type = (settings.props) ? settings.props.asc_getType() : (Common.Utils.InternalSettings.get("sse-settings-link-type") ? Asc.c_oAscHyperlinkType.RangeLink : Asc.c_oAscHyperlinkType.WebLink);
var type = (settings.props) ? settings.props.asc_getType() : (Common.Utils.InternalSettings.get("sse-settings-link-type") && settings.allowInternal ? Asc.c_oAscHyperlinkType.RangeLink : Asc.c_oAscHyperlinkType.WebLink);
(type == Asc.c_oAscHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
me.ShowHideElem(type, settings.props);
me.btnInternal.setDisabled(!settings.allowInternal && (type == Asc.c_oAscHyperlinkType.WebLink));

View file

@ -1808,6 +1808,13 @@
"SSE.Views.FormulaWizard.textHelp": "Help on this function",
"SSE.Views.FormulaWizard.textTitle": "Function Argumens",
"SSE.Views.FormulaWizard.textValue": "Formula result",
"SSE.Views.FormulaWizard.textNoArgs": "This function has no arguments",
"SSE.Views.FormulaWizard.textArgument": "Argument",
"SSE.Views.FormulaWizard.textNumber": "number",
"SSE.Views.FormulaWizard.textText": "text",
"SSE.Views.FormulaWizard.textRef": "reference",
"SSE.Views.FormulaWizard.textAny": "any",
"SSE.Views.FormulaWizard.textLogical": "logical",
"SSE.Views.GroupDialog.textColumns": "Columns",
"SSE.Views.GroupDialog.textRows": "Rows",
"SSE.Views.HeaderFooterDialog.textAlign": "Align with page margins",