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

Merge pull request #1349 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-11-24 17:27:02 +03:00 committed by GitHub
parent c1a80a7f74 96cc359c08
commit 29d5328bdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/template/CommentsPanel.template
View file

@ -7,8 +7,8 @@
<div class="inner-ct"> <div class="inner-ct">
<textarea id="comment-msg-new" class="user-select textarea-control" placeholder="<%=textEnterCommentHint%>" maxlength="<%=maxCommLength%>" data-hint="1" data-hint-direction="left-top"></textarea> <textarea id="comment-msg-new" class="user-select textarea-control" placeholder="<%=textEnterCommentHint%>" maxlength="<%=maxCommLength%>" data-hint="1" data-hint-direction="left-top"></textarea>
</div> </div>
<button class="btn add normal dlg-btn primary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%=textAddComment%></button> <button class="btn add normal dlg-btn primary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big" style="width: auto;min-width: 86px;"><%=textAddComment%></button>
<button class="btn cancel normal dlg-btn" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%=textCancel%></button> <button class="btn cancel normal dlg-btn" data-hint="1" data-hint-direction="bottom" data-hint-offset="big" style="width: auto;min-width: 86px;"><%=textCancel%></button>
</div> </div>
<div id="comments-header" class=""> <div id="comments-header" class="">
<label><%=textComments%></label> <label><%=textComments%></label>

6
apps/documenteditor/main/app/template/ImageSettingsAdvanced.template
View file

@ -2,19 +2,19 @@
<div class="inner-content"> <div class="inner-content">
<table cols="4" width="100%"> <table cols="4" width="100%">
<tr> <tr>
<td width="88px"> <td width="78px">
<label class="input-label"><%= scope.textWidth %></label> <label class="input-label"><%= scope.textWidth %></label>
<div id="image-advanced-spin-width"></div> <div id="image-advanced-spin-width"></div>
</td> </td>
<td width="28px" style="vertical-align: bottom;"> <td width="28px" style="vertical-align: bottom;">
<div id="image-advanced-button-ratio"></div> <div id="image-advanced-button-ratio"></div>
</td> </td>
<td width="88px"> <td width="78px">
<label class="input-label"><%= scope.textHeight %></label> <label class="input-label"><%= scope.textHeight %></label>
<div id="image-advanced-spin-height"></div> <div id="image-advanced-spin-height"></div>
</td> </td>
<td style="vertical-align: bottom;"> <td style="vertical-align: bottom;">
<button type="button" class="btn btn-text-default" id="image-advanced-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button> <button type="button" class="btn btn-text-default auto" id="image-advanced-button-original-size" style="min-width:100px;"><%= scope.textOriginalSize %></button>
</td> </td>
</tr> </tr>
</table> </table>

4
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -117,7 +117,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.spnWidth = new Common.UI.MetricSpinner({ this.spnWidth = new Common.UI.MetricSpinner({
el: $('#image-advanced-spin-width'), el: $('#image-advanced-spin-width'),
step: .1, step: .1,
width: 80, width: 70,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -145,7 +145,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.spnHeight = new Common.UI.MetricSpinner({ this.spnHeight = new Common.UI.MetricSpinner({
el: $('#image-advanced-spin-height'), el: $('#image-advanced-spin-height'),
step: .1, step: .1,
width: 80, width: 70,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1713,7 +1713,7 @@ define([
var me = this; var me = this;
me.needToUpdateVersion = true; me.needToUpdateVersion = true;
me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
Common.UI.error({ Common.UI.warning({
msg: this.errorUpdateVersion, msg: this.errorUpdateVersion,
callback: function() { callback: function() {
_.defer(function() { _.defer(function() {

6
apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template
View file

@ -7,19 +7,19 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="88px" class="padding-large"> <td width="78px" class="padding-large">
<label class="input-label"><%= scope.textWidth %></label> <label class="input-label"><%= scope.textWidth %></label>
<div id="image-advanced-spin-width"></div> <div id="image-advanced-spin-width"></div>
</td> </td>
<td width="28px" style="vertical-align: bottom;" class="padding-large"> <td width="28px" style="vertical-align: bottom;" class="padding-large">
<div id="image-advanced-button-ratio"></div> <div id="image-advanced-button-ratio"></div>
</td> </td>
<td width="88px" class="padding-large"> <td width="78px" class="padding-large">
<label class="input-label"><%= scope.textHeight %></label> <label class="input-label"><%= scope.textHeight %></label>
<div id="image-advanced-spin-height"></div> <div id="image-advanced-spin-height"></div>
</td> </td>
<td style="vertical-align: bottom;" class="padding-large"> <td style="vertical-align: bottom;" class="padding-large">
<button type="button" class="btn btn-text-default" id="image-advanced-button-original-size" style="width:100px;"><%= scope.textOriginalSize %></button> <button type="button" class="btn btn-text-default auto" id="image-advanced-button-original-size" style="min-width:100px;"><%= scope.textOriginalSize %></button>
</td> </td>
</tr> </tr>
</table> </table>

4
apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -84,7 +84,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.spnWidth = new Common.UI.MetricSpinner({ this.spnWidth = new Common.UI.MetricSpinner({
el: $('#image-advanced-spin-width'), el: $('#image-advanced-spin-width'),
step: .1, step: .1,
width: 80, width: 70,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
@ -108,7 +108,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
this.spnHeight = new Common.UI.MetricSpinner({ this.spnHeight = new Common.UI.MetricSpinner({
el: $('#image-advanced-spin-height'), el: $('#image-advanced-spin-height'),
step: .1, step: .1,
width: 80, width: 70,
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,

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

@ -2073,7 +2073,7 @@ define([
var me = this; var me = this;
me.needToUpdateVersion = true; me.needToUpdateVersion = true;
me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
Common.UI.error({ Common.UI.warning({
msg: this.errorUpdateVersion, msg: this.errorUpdateVersion,
callback: function() { callback: function() {
_.defer(function() { _.defer(function() {

2
apps/spreadsheeteditor/main/app/view/ProtectDialog.js
View file

@ -53,7 +53,7 @@ define([
title: options.title ? options.title : (options.type=='sheet' ? this.txtSheetTitle : this.txtWBTitle), title: options.title ? options.title : (options.type=='sheet' ? this.txtSheetTitle : this.txtWBTitle),
cls: 'modal-dlg', cls: 'modal-dlg',
width: 350, width: 350,
height: options.type=='sheet' ? 447 : (options.type=='range' ? 338 : 306), height: 'auto',
buttons: options.buttons ? options.buttons : [{ buttons: options.buttons ? options.buttons : [{
value: 'ok', value: 'ok',
caption: this.txtProtect caption: this.txtProtect