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

Merge pull request #533 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-10-23 10:56:26 +03:00 committed by GitHub
parent a808e2d33c a0a28260e9
commit ce99e42674
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 77 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/tabbar.less
View file

@ -26,7 +26,7 @@
padding-top: 0;
padding-bottom: 0;
white-space: pre-wrap;
white-space: pre;
text-align: center;
&::after {

7
apps/documenteditor/mobile/app/controller/add/AddImage.js
View file

@ -115,16 +115,17 @@ define([
if ((/((^https?)|(^ftp)):\/\/.+/i.test(value))) {
DE.getController('AddContainer').hideModal();
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
textEmptyImgUrl : 'You need to specify image URL.',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), DE.Controllers.AddImage || {}))
});

4
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file

@ -467,8 +467,8 @@ define([
textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel',
//textContinue: 'Continue',
textDelete: 'Delete'
textDelete: 'Delete',
notcriticalErrorTitle: 'Warning'
}
})(), DE.Controllers.AddOther || {}))
});

5
apps/documenteditor/mobile/app/controller/edit/EditHyperlink.js
View file

@ -114,7 +114,7 @@ define([
isEmail = (urltype == 2);
if (urltype < 1) {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
return;
}
@ -172,7 +172,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
};
})(), DE.Controllers.EditHyperlink || {}))
});

7
apps/documenteditor/mobile/app/controller/edit/EditImage.js
View file

@ -318,10 +318,10 @@ define([
me.api.ImgApply(image);
});
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
@ -400,7 +400,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), DE.Controllers.EditImage || {}))
});

6
apps/documenteditor/mobile/locale/en.json
View file

@ -106,6 +106,7 @@
"DE.Controllers.AddContainer.textTable": "Table",
"DE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
"DE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.AddImage.notcriticalErrorTitle": "Warning",
"DE.Controllers.AddOther.textBelowText": "Below Text",
"DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page",
"DE.Controllers.AddOther.textCancel": "Cancel",
@ -113,6 +114,7 @@
"DE.Controllers.AddOther.textDelete": "Delete",
"DE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete the draft?",
"DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.AddOther.notcriticalErrorTitle": "Warning",
"DE.Controllers.AddTable.textCancel": "Cancel",
"DE.Controllers.AddTable.textColumns": "Columns",
"DE.Controllers.AddTable.textRows": "Rows",
@ -150,8 +152,12 @@
"DE.Controllers.EditContainer.textShape": "Shape",
"DE.Controllers.EditContainer.textTable": "Table",
"DE.Controllers.EditContainer.textText": "Text",
"DE.Controllers.EditHyperlink.textEmptyImgUrl": "You need to specify image URL.",
"DE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.EditHyperlink.notcriticalErrorTitle": "Warning",
"DE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"DE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format",
"DE.Controllers.EditImage.notcriticalErrorTitle": "Warning",
"DE.Controllers.EditText.textAuto": "Auto",
"DE.Controllers.EditText.textFonts": "Fonts",
"DE.Controllers.EditText.textPt": "pt",

5
apps/presentationeditor/mobile/app/controller/Toolbar.js
View file

@ -80,6 +80,7 @@ define([
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this));
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this));
},
setMode: function (mode) {
@ -173,6 +174,10 @@ define([
}
},
onApiCountPages: function (count) {
$('#toolbar-preview').toggleClass('disabled', count<=0);
},
activateControls: function() {
$('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document, #toolbar-collaboration').removeClass('disabled');
},

7
apps/presentationeditor/mobile/app/controller/add/AddImage.js
View file

@ -112,16 +112,17 @@ define([
if ((/((^https?)|(^ftp)):\/\/.+/i.test(value))) {
PE.getController('AddContainer').hideModal();
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
textEmptyImgUrl : 'You need to specify image URL.',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), PE.Controllers.AddImage || {}))
});

4
apps/presentationeditor/mobile/app/controller/add/AddLink.js
View file

@ -209,8 +209,8 @@ define([
textLast: 'Last Slide',
textSlide: 'Slide',
textExternalLink: 'External Link',
textInternalLink: 'Slide in this Presentation'
textInternalLink: 'Slide in this Presentation',
notcriticalErrorTitle: 'Warning'
}
})(), PE.Controllers.AddLink || {}))
});

7
apps/presentationeditor/mobile/app/controller/edit/EditImage.js
View file

@ -155,10 +155,10 @@ define([
me.api.ImgApply(image);
});
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
@ -244,7 +244,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), PE.Controllers.EditImage || {}))
});

5
apps/presentationeditor/mobile/app/controller/edit/EditLink.js
View file

@ -229,7 +229,7 @@ define([
urltype = me.api.asc_getUrlType($.trim(url)),
isEmail = (urltype == 2);
if (urltype < 1) {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
return;
}
@ -352,7 +352,8 @@ define([
textLast: 'Last Slide',
textSlide: 'Slide',
textExternalLink: 'External Link',
textInternalLink: 'Slide in this Presentation'
textInternalLink: 'Slide in this Presentation',
notcriticalErrorTitle: 'Warning'
};
})(), PE.Controllers.EditLink || {}))
});

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

@ -44,16 +44,16 @@
<ul>
<li>
<% if (android) { %>
<a id="slide-duplicate" class="button button-raised button-fill" style="margin: 20px 16px;"><%= scope.textDuplicateSlide %></a>
<a id="slide-duplicate" class="button button-raised button-fill no-ripple" style="margin: 20px 16px;"><%= scope.textDuplicateSlide %></a>
<% } else { %>
<a id="slide-duplicate" class="item-link list-button" style="text-align: center;"><%= scope.textDuplicateSlide %></a>
<a id="slide-duplicate" class="item-link list-button no-ripple" style="text-align: center;"><%= scope.textDuplicateSlide %></a>
<% } %>
</li>
<li>
<% if (android) { %>
<a id="slide-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemoveSlide %></a>
<a id="slide-remove" class="button button-raised button-fill no-ripple" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemoveSlide %></a>
<% } else { %>
<a id="slide-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemoveSlide %></a>
<a id="slide-remove" class="item-link list-button no-ripple" style="text-align: center; color: #f00"><%= scope.textRemoveSlide %></a>
<% } %>
</li>
</ul>

4
apps/presentationeditor/mobile/locale/en.json
View file

@ -34,6 +34,7 @@
"PE.Controllers.AddContainer.textTable": "Table",
"PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
"PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.AddImage.notcriticalErrorTitle": "Warning",
"PE.Controllers.AddLink.textDefault": "Selected text",
"PE.Controllers.AddLink.textExternalLink": "External Link",
"PE.Controllers.AddLink.textFirst": "First Slide",
@ -43,6 +44,7 @@
"PE.Controllers.AddLink.textPrev": "Previous Slide",
"PE.Controllers.AddLink.textSlide": "Slide",
"PE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.AddLink.notcriticalErrorTitle": "Warning",
"PE.Controllers.AddOther.textCancel": "Cancel",
"PE.Controllers.AddOther.textContinue": "Continue",
"PE.Controllers.AddOther.textDelete": "Delete",
@ -76,6 +78,7 @@
"PE.Controllers.EditContainer.textText": "Text",
"PE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"PE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.EditImage.notcriticalErrorTitle": "Warning",
"PE.Controllers.EditLink.textDefault": "Selected text",
"PE.Controllers.EditLink.textExternalLink": "External Link",
"PE.Controllers.EditLink.textFirst": "First Slide",
@ -85,6 +88,7 @@
"PE.Controllers.EditLink.textPrev": "Previous Slide",
"PE.Controllers.EditLink.textSlide": "Slide",
"PE.Controllers.EditLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.EditLink.notcriticalErrorTitle": "Warning",
"PE.Controllers.EditSlide.textSec": "s",
"PE.Controllers.EditText.textAuto": "Auto",
"PE.Controllers.EditText.textFonts": "Fonts",

1
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

@ -183,7 +183,6 @@
border-left: 1px solid @gray-dark;
border-right: 1px solid @gray-dark;
border-top: 1px solid @gray-dark;
white-space: nowrap;
&:hover {
border-top-color: @gray-dark;

5
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -207,7 +207,7 @@ define([
case 'merge':
if (me.api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
_.defer(function () {
uiApp.confirm(me.warnMergeLostData, undefined, function(){
uiApp.confirm(me.warnMergeLostData, me.notcriticalErrorTitle, function(){
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
});
});
@ -521,7 +521,8 @@ define([
menuAddComment: 'Add Comment',
textCopyCutPasteActions: 'Copy, Cut and Paste Actions',
errorCopyCutPaste: 'Copy, cut and paste actions using the context menu will be performed within the current file only.',
textDoNotShowAgain: 'Don\'t show again'
textDoNotShowAgain: 'Don\'t show again',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.DocumentHolder || {}))
});

8
apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
View file

@ -254,12 +254,12 @@ define([
var me = this;
if (me.sheets.length == 1) {
uiApp.alert(me.errorLastSheet);
uiApp.alert(me.errorLastSheet, me.notcriticalErrorTitle);
} else {
uiApp.confirm(me.warnDeleteSheet, undefined, _.buffered(function() {
uiApp.confirm(me.warnDeleteSheet, me.notcriticalErrorTitle, _.buffered(function() {
if ( !me.api.asc_deleteWorksheet() ) {
_.defer(function(){
uiApp.alert(me.errorRemoveSheet);
uiApp.alert(me.errorRemoveSheet, me.notcriticalErrorTitle);
});
}
}, 300));
@ -269,7 +269,7 @@ define([
hideWorksheet: function(hide, index) {
if ( hide ) {
this.sheets.length == 1 ?
uiApp.alert(this.errorLastSheet) :
uiApp.alert(this.errorLastSheet, this.notcriticalErrorTitle) :
this.api['asc_hideWorksheet']([index]);
} else {
this.api['asc_showWorksheet'](index);

3
apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
View file

@ -175,7 +175,8 @@ define([
},
textInvalidRange : 'ERROR! Invalid cells range',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.AddLink || {}))
});

7
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
View file

@ -174,10 +174,10 @@ define([
if ((/((^https?)|(^ftp)):\/\/.+/i.test(url))) {
SSE.getController('AddContainer').hideModal();
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
} else {
SSE.getController('AddContainer').hideModal();
@ -202,7 +202,8 @@ define([
textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel',
//textContinue: 'Continue',
textDelete: 'Delete'
textDelete: 'Delete',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.AddOther || {}))
});

7
apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
View file

@ -200,7 +200,7 @@ define([
isValidRange = /^[A-Z]+[1-9]\d*$/.test(range);
if (!isValidRange) {
uiApp.alert(me.textInvalidRange);
uiApp.alert(me.textInvalidRange, me.notcriticalErrorTitle);
return;
}
@ -214,7 +214,7 @@ define([
var urlType = me.api.asc_getUrlType($.trim(url));
if (urlType < 1) {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
return;
}
@ -253,7 +253,8 @@ define([
textDefault: 'Selected range',
textInvalidRange: 'Invalid cells range',
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.EditHyperlink || {}))
});

7
apps/spreadsheeteditor/mobile/app/controller/edit/EditImage.js
View file

@ -191,10 +191,10 @@ define([
me.api.asc_setGraphicObjectProps(image);
});
} else {
uiApp.alert(me.txtNotUrl);
uiApp.alert(me.txtNotUrl, me.notcriticalErrorTitle);
}
} else {
uiApp.alert(me.textEmptyImgUrl);
uiApp.alert(me.textEmptyImgUrl, me.notcriticalErrorTitle);
}
}
},
@ -262,7 +262,8 @@ define([
},
textEmptyImgUrl: 'You need to specify image URL.',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"'
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
notcriticalErrorTitle: 'Warning'
}
})(), SSE.Controllers.EditImage || {}))
});

7
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -37,12 +37,14 @@
"SSE.Controllers.AddContainer.textShape": "Shape",
"SSE.Controllers.AddLink.textInvalidRange": "ERROR! Invalid cells range",
"SSE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.AddLink.notcriticalErrorTitle": "Warning",
"SSE.Controllers.AddOther.textCancel": "Cancel",
"SSE.Controllers.AddOther.textContinue": "Continue",
"SSE.Controllers.AddOther.textDelete": "Delete",
"SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete the draft?",
"SSE.Controllers.AddOther.textEmptyImgUrl": "You need to specify image URL.",
"SSE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.AddOther.notcriticalErrorTitle": "Warning",
"SSE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
"SSE.Controllers.DocumentHolder.menuAddComment": "Add Comment",
"SSE.Controllers.DocumentHolder.menuAddLink": "Add Link",
@ -67,6 +69,7 @@
"SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Do not show again",
"SSE.Controllers.DocumentHolder.warnMergeLostData": "Operation can destroy data in the selected cells.<br>Continue?",
"SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
"SSE.Controllers.EditCell.textAuto": "Auto",
"SSE.Controllers.EditCell.textFonts": "Fonts",
"SSE.Controllers.EditCell.textPt": "pt",
@ -126,6 +129,10 @@
"SSE.Controllers.EditHyperlink.textInternalLink": "Internal Data Range",
"SSE.Controllers.EditHyperlink.textInvalidRange": "Invalid cells range",
"SSE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
"SSE.Controllers.EditHyperlink.notcriticalErrorTitle": "Warning",
"SSE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"SSE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"SSE.Controllers.EditImage.notcriticalErrorTitle": "Warning",
"SSE.Controllers.FilterOptions.textEmptyItem": "{Blanks}",
"SSE.Controllers.FilterOptions.textErrorMsg": "You must choose at least one value",
"SSE.Controllers.FilterOptions.textErrorTitle": "Warning",

2
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -7876,7 +7876,7 @@ html.pixel-ratio-3 .statusbar .button:after {
.box-tabs ul {
margin: 0;
padding: 0;
white-space: nowrap;
white-space: pre;
overflow: hidden;
}
.box-tabs ul > li {

2
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -7863,7 +7863,7 @@ html.pixel-ratio-3 .statusbar .button:after {
.box-tabs ul {
margin: 0;
padding: 0;
white-space: nowrap;
white-space: pre;
overflow: hidden;
}
.box-tabs ul > li {

2
apps/spreadsheeteditor/mobile/resources/less/statusbar.less
View file

@ -47,7 +47,7 @@
ul {
margin: 0;
padding: 0;
white-space: nowrap;
white-space: pre;
overflow: hidden;
> li {