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

Merge pull request #365 from ONLYOFFICE/feature/bugfix

Browse source 
[SSE] Bug 44812
This commit is contained in:
Julia Radzhabova 2020-03-13 16:39:54 +03:00 committed by GitHub
parent ebbbbdcb7f 13704362ad
commit 6c5f2b39d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/ComboBox.js
View file

@ -644,7 +644,7 @@ define([
} else {
$(this.el).find('ul').html(_.template([
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<li id="<%= item.id %>" data-value="<%- item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>'
].join(''))({
items: this.store.toJSON(),

4
apps/common/main/lib/component/Tab.js
View file

@ -51,8 +51,8 @@ define([
this.active = false;
this.label = 'Tab';
this.cls = '';
this.template = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%= label %>">',
'<a title="<%= label %>"><%- label %></a>',
this.template = _.template(['<li class="<% if(active){ %>active selected<% } %> <% if(cls.length){%><%= cls %><%}%>" data-label="<%- label %>">',
'<a title="<%- label %>"><%- label %></a>',
'</li>'].join(''));
this.initialize.call(this, opts);

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

@ -266,7 +266,7 @@ define([
(new SSE.Views.NameManagerDlg({
api: this.api,
handler: function(result) {
Common.NotificationCenter.trigger('edit:complete', this.editor);
Common.NotificationCenter.trigger('edit:complete', me.editor);
},
locked: this.namedrange_locked,
sheets: items,

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

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