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

Merge pull request #543 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-10-28 19:29:23 +03:00 committed by GitHub
parent 14cc5e0eb4 e69c7968ad
commit 444db6f38f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/component/ThemeColorPalette.js
View file

@ -185,7 +185,7 @@ define([
el.find('.color-palette a').removeClass('active');
$target.addClass('active');
me.currentColor = color;
if (effectId) {
if (effectId!==undefined) {
me.currentColor = {color: color, effectId: effectId};
}
me.trigger('select', me, me.currentColor);

5
apps/common/mobile/resources/less/ios/_color-palette.less
View file

@ -164,3 +164,8 @@
}
}
}
#font-color-auto.active .color-auto {
box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
border-radius: 1px;
}

6
apps/common/mobile/resources/less/material/_color-palette.less
View file

@ -168,4 +168,8 @@
}
}
}
}
}
#font-color-auto.active .color-auto {
box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
border-radius: 1px;
}

15
apps/documenteditor/mobile/app/controller/edit/EditText.js
View file

@ -370,7 +370,9 @@ define([
}
if (this.api) {
this.api.put_TextColor(Common.Utils.ThemeColor.getRgbColor("000000"));
var color = new Asc.asc_CColor();
color.put_auto(true);
this.api.put_TextColor(color);
}
},
@ -480,12 +482,17 @@ define([
onApiTextColor: function (color) {
var me = this;
var palette = this.getView('EditText').paletteTextColor;
if (color.get_auto()) {
if (palette) {
palette.clearSelection();
}
$('#font-color .color-preview').css('background-color', '#000');
$('#font-color-auto').addClass('active');
} else {
var palette = me.getView('EditText').paletteTextColor,
clr;
var clr;
if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@ -499,7 +506,7 @@ define([
$('#font-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr));
}
$('#font-color-auto').removeClass('active');
if (palette) {
palette.select(clr);
}

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

@ -158,7 +158,7 @@
<a id="font-color-auto" class="item-link no-indicator">
<div class="item-content">
<div class="item-media">
<div style="width:22px; height: 22px; background-color: #000;"></div>
<div class="color-auto" style="width:22px; height: 22px; background-color: #000;"></div>
</div>
<div class="item-inner">
<div class="item-title"><%= scope.textAutomatic %></div>

4
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6354,6 +6354,10 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after {
transform: scale(1.5) translate(-33.333%, -33.333%);
}
#font-color-auto.active .color-auto {
box-shadow: 0 0 0 1px white, 0 0 0 4px #446995;
border-radius: 1px;
}
.about .page-content {
text-align: center;
}

4
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -5929,6 +5929,10 @@ html.phone .document-menu .list-block .item-link {
.custom-colors .color-picker-wheel .color-picker-sb-spectrum-handle.color-picker-sb-spectrum-handle-pressed:after {
transform: scale(1.5) translate(-33.333%, -33.333%);
}
#font-color-auto.active .color-auto {
box-shadow: 0 0 0 1px white, 0 0 0 4px #446995;
border-radius: 1px;
}
.about .page-content {
text-align: center;
}

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

@ -916,7 +916,7 @@
<div class="list-block">
<ul>
<li>
<a data-type="SEg6bW0=" class="item-link no-indicator">
<a data-type="aCUzQW1tJTNCJTQw" class="item-link no-indicator">
<div class="item-content">
<div class="item-inner">
<div class="item-title">10:56</div>
@ -926,7 +926,7 @@
</a>
</li>
<li>
<a data-type="SEg6TU06c3M=" class="item-link no-indicator">
<a data-type="aCUzQW1tJTNBc3MlM0IlNDA=" class="item-link no-indicator">
<div class="item-content">
<div class="item-inner">
<div class="item-title">21:56:00</div>
@ -936,7 +936,7 @@
</a>
</li>
<li>
<a data-type="aGg6bW0gdHQ=" class="item-link no-indicator">
<a data-type="aCUzQW1tJTIwQU0lMkZQTSUzQiU0MA==" class="item-link no-indicator">
<div class="item-content">
<div class="item-inner">
<div class="item-title">05:56 AM</div>
@ -946,7 +946,7 @@
</a>
</li>
<li>
<a data-type="aGg6bW06c3MgdHQ=" class="item-link no-indicator">
<a data-type="aCUzQW1tJTNBc3MlMjBBTSUyRlBNJTNCJTQw" class="item-link no-indicator">
<div class="item-content">
<div class="item-inner">
<div class="item-title">05:56:00 AM</div>
@ -956,7 +956,7 @@
</a>
</li>
<li>
<a data-type="W2hdOm1tOnNz" class="item-link no-indicator">
<a data-type="JTVCaCU1RCUzQW1tJTNBc3MlM0IlNDA=" class="item-link no-indicator">
<div class="item-content">
<div class="item-inner">
<div class="item-title">38:56:00</div>