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

Merge pull request #576 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] Fix Bug 47565
This commit is contained in:
Julia Radzhabova 2020-11-19 20:12:32 +03:00 committed by GitHub
parent 34f323a672 8011754298
commit bcc30ecca1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/mobile/app/template/EditText.template
View file

@ -16,10 +16,10 @@
<div class="item-content buttons">
<div class="item-inner">
<div class="row">
<a id="font-bold" class="button"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
<a id="font-strikethrough" class="button" style="text-decoration: line-through"><%= scope.textCharacterStrikethrough %></a>
<a id="font-bold" class="button no-fastclick"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button no-fastclick"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button no-fastclick" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
<a id="font-strikethrough" class="button no-fastclick" style="text-decoration: line-through"><%= scope.textCharacterStrikethrough %></a>
</div>
</div>
</div>

16
apps/documenteditor/mobile/app/template/Settings.template
View file

@ -828,9 +828,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>
@ -843,9 +843,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>
@ -858,9 +858,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>
@ -873,9 +873,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>

8
apps/presentationeditor/mobile/app/template/EditText.template
View file

@ -12,10 +12,10 @@
<li><div class="item-content buttons">
<div class="item-inner">
<div class="row">
<a id="font-bold" class="button"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
<a id="font-strikethrough" class="button" style="text-decoration: line-through"><%= scope.textCharacterStrikethrough %></a>
<a id="font-bold" class="button no-fastclick"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button no-fastclick"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button no-fastclick" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
<a id="font-strikethrough" class="button no-fastclick" style="text-decoration: line-through"><%= scope.textCharacterStrikethrough %></a>
</div>
</div>
</div></li>

14
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View file

@ -379,17 +379,11 @@ define([
},
onAddSeries: function() {
var rec = (this.seriesList.store.length>0) ? this.seriesList.store.at(this.seriesList.store.length-1) : null,
isScatter = false,
me = this;
rec && (isScatter = rec.get('series').asc_IsScatter());
var me = this;
me.chartSettings.startEditData();
var series;
if (isScatter) {
series = me.chartSettings.addScatterSeries();
} else {
series = me.chartSettings.addSeries();
}
var series = me.chartSettings.addSeries(),
isScatter = series.asc_IsScatter();
var handlerDlg = function(dlg, result) {
if (result == 'ok') {
me.updateRange();

6
apps/spreadsheeteditor/mobile/app/template/EditCell.template
View file

@ -16,9 +16,9 @@
<div class="item-content buttons">
<div class="item-inner">
<div class="row">
<a id="font-bold" class="button"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
<a id="font-bold" class="button no-fastclick"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button no-fastclick"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button no-fastclick" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
</div>
</div>
</div>

6
apps/spreadsheeteditor/mobile/app/template/EditText.template
View file

@ -16,9 +16,9 @@
<div class="item-content buttons">
<div class="item-inner">
<div class="row">
<a id="font-bold" class="button"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
<a id="font-bold" class="button no-fastclick"><b><%= scope.textCharacterBold %></b></a>
<a id="font-italic" class="button no-fastclick"><i><%= scope.textCharacterItalic %></i></a>
<a id="font-underline" class="button no-fastclick" style="text-decoration: underline;"><%= scope.textCharacterUnderline %></a>
</div>
</div>
</div>

16
apps/spreadsheeteditor/mobile/app/template/Settings.template
View file

@ -759,9 +759,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>
@ -774,9 +774,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>
@ -789,9 +789,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>
@ -804,9 +804,9 @@
<div class="item-after splitter">
<% if (!android) { %><label></label><% } %>
<p class="buttons-row">
<span class="button decrement"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<span class="button decrement no-fastclick"><% if (android) { %><i class="icon icon-expand-down"></i><% } else { %>-<% } %></span>
<% if (android) { %><label></label><% } %>
<span class="button increment"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
<span class="button increment no-fastclick"><% if (android) { %><i class="icon icon-expand-up"></i><% } else { %>+<% } %></span>
</p>
</div>
</div>