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

Merge pull request #573 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-11-18 17:55:44 +03:00 committed by GitHub
parent 2ceeaf34a5 6e0a533fca
commit 1a897081f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/documenteditor/main/app/view/CrossReferenceDialog.js
View file

@ -203,8 +203,7 @@ define([
var me = this; var me = this;
var onApiEndCalculate = function() { var onApiEndCalculate = function() {
var rec = me.cmbType.getSelectedRecord(); me.refreshReferences(me.cmbType.getSelectedRecord());
rec && me.refreshReferences(rec.value);
}; };
this.api.asc_registerCallback('asc_onEndCalculate', onApiEndCalculate); this.api.asc_registerCallback('asc_onEndCalculate', onApiEndCalculate);
this.on('close', function(obj){ this.on('close', function(obj){
@ -288,7 +287,7 @@ define([
refreshReferenceTypes: function(record, currentRef) { refreshReferenceTypes: function(record, currentRef) {
var arr = [], var arr = [],
str = this.textWhich, type = 5; str = this.textWhich;
if (record.type==1 || record.value > 4) { if (record.type==1 || record.value > 4) {
// custom labels from caption dialog and Equation, Figure, Table // custom labels from caption dialog and Equation, Figure, Table
arr = [ arr = [
@ -299,7 +298,6 @@ define([
{ value: Asc.c_oAscDocumentRefenceToType.AboveBelow, displayValue: this.textAboveBelow } { value: Asc.c_oAscDocumentRefenceToType.AboveBelow, displayValue: this.textAboveBelow }
]; ];
} else { } else {
type = record.value;
switch (record.value) { switch (record.value) {
case 0: // paragraph case 0: // paragraph
arr = [ arr = [
@ -360,11 +358,14 @@ define([
this.cmbReference.setValue(rec ? currentRef : arr[0].value); this.cmbReference.setValue(rec ? currentRef : arr[0].value);
this.onReferenceSelected(this.cmbReference, this.cmbReference.getSelectedRecord()); this.onReferenceSelected(this.cmbReference, this.cmbReference.getSelectedRecord());
this.lblWhich.text(str); this.lblWhich.text(str);
this.refreshReferences(type); this.refreshReferences(record);
}, },
refreshReferences: function(type) { refreshReferences: function(record) {
if (!record) return;
var store = this.refList.store, var store = this.refList.store,
type = (record.type==1 || record.value > 4) ? 5 : record.value,
arr = [], arr = [],
props; props;
switch (type) { switch (type) {

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1085,7 +1085,7 @@ define([
if (linkstr) { if (linkstr) {
linkstr = Common.Utils.String.htmlEncode(linkstr) + '<br><b>' + me.textCtrlClick + '</b>'; linkstr = Common.Utils.String.htmlEncode(linkstr) + '<br><b>' + me.textCtrlClick + '</b>';
} else { } else {
linkstr = props.asc_getHyperlinkUrl() + '<br><b>' + me.textCtrlClick + '</b>'; linkstr = Common.Utils.String.htmlEncode(props.asc_getHyperlinkUrl()) + '<br><b>' + me.textCtrlClick + '</b>';
} }
} else { } else {
linkstr = Common.Utils.String.htmlEncode(props.asc_getTooltip() || (props.asc_getLocation())); linkstr = Common.Utils.String.htmlEncode(props.asc_getTooltip() || (props.asc_getLocation()));