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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2019-10-30 11:35:23 +03:00
parent bae614c6f3 50e93373c3
commit f53ee83740
10 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,7 +365,7 @@ define([
if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs ||
(this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) {
$('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
$('#editor-container').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
}
Common.Controllers.Desktop.init(this.appOptions);

2
apps/documenteditor/main/app/template/Viewport.template
View file

@ -9,7 +9,7 @@
<div id="viewport-hbox-layout" class="layout-ct hbox">
<div id="left-menu" class="layout-item" style="width: 40px;"></div>
<div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
<div id="editor_sdk" class="layout-item"></div>
<div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
<div id="right-menu" class="layout-item"></div>
<div id="left-panel-history" class="layout-item" />
</div>

7
apps/documenteditor/main/resources/less/app.less
View file

@ -150,12 +150,17 @@
.doc-placeholder {
background: #fbfbfb;
width: 100%;
max-width: 796px;
margin: 40px auto;
height: 100%;
border: 1px solid #dfdfdf;
padding-top: 50px;
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
z-index: 1;
-webkit-animation: flickerAnimation 2s infinite ease-in-out;
-moz-animation: flickerAnimation 2s infinite ease-in-out;

5
apps/documenteditor/main/resources/less/layout.less
View file

@ -75,4 +75,9 @@ label {
width: 300px;
height: 100%;
display: none;
}
#editor_sdk {
width: 100%;
height: 100%;
}

2
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -221,7 +221,7 @@ define([
me.api.asc_setLocale(me.editorConfig.lang);
if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))
$('#editor_sdk').append('<div class="doc-placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div>');
$('#editor-container').append('<div class="doc-placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div>');
// if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
// Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);

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

@ -2,7 +2,7 @@
<div class="view view-main">
<div class="pages navbar-through">
<div data-page="index" class="page">
<div id="editor_sdk" class="page-content no-fastclick"></div>
<div id="editor-container" class="page-content no-fastclick"><div id="editor_sdk" class="no-fastclick"></div></div>
</div>
</div>
</div>

2
build/common.json
View file

@ -1,7 +1,7 @@
{
"name": "common",
"version": "4.3.0",
"build": 37,
"build": 39,
"homepage": "http://www.onlyoffice.com",
"private": true,
"sdk": {

2
build/documenteditor.json
View file

@ -1,7 +1,7 @@
{
"name": "documenteditor",
"version": "4.3.0",
"build": 1146,
"build": 1148,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {

2
build/presentationeditor.json
View file

@ -1,7 +1,7 @@
{
"name": "presentationeditor",
"version": "4.3.0",
"build": 780,
"build": 782,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {

2
build/spreadsheeteditor.json
View file

@ -1,7 +1,7 @@
{
"name": "spreadsheeteditor",
"version": "4.3.0",
"build": 884,
"build": 886,
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {