diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js
index e5388c8bc..3bee84954 100644
--- a/apps/common/main/lib/view/ListSettingsDialog.js
+++ b/apps/common/main/lib/view/ListSettingsDialog.js
@@ -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 },
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index c16196ab5..a73c98c45 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -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');
})
},
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index f6652ad9b..e5c46abfe 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -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);
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 2d46a8e45..846d594e4 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -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);
- me.viewHelpPicker.scrollToRecord(rec);
- me.iFrame.src = me.urlPref + rec.get('src');
+ 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.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 (rec) {
- this.viewHelpPicker.selectRecord(rec);
- this.viewHelpPicker.scrollToRecord(rec);
+ 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, true);
+ this.viewHelpPicker.scrollToRecord(rec);
+ }
+ this.onSelectItem(url);
} else
this.openUrl = url;
}
+ },
+
+ onSelectItem: function(src) {
+ this.iFrame.src = this.urlPref + src;
}
});
diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
index dd3c195bc..9422d514f 100644
--- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -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());
diff --git a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm
index 1215cca6b..0b408110c 100644
--- a/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm
+++ b/apps/documenteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm
@@ -90,6 +90,12 @@
To delete an Accent, you can right-click on it and select the Remove accent character, Delete char or Remove bar option from the menu (the available options differ depending on the selected accent).
To delete a row or a column of a Matrix, you can right-click on the placeholder within the row/column you need to delete, select the Delete option from the menu, then select Delete Row/Column.
+ Convert equations
+ 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.
+ To convert an equation, double-click it. The warning window will appear:
+ 
+ To convert the selected equation only, click the Yes button in the warning window. To convert all equations in this document, check the Apply to all equations box and click Yes.
+ Once the equation is converted, you can edit it.