Merge pull request #1584 from ONLYOFFICE/feature/bug-fixes

Feature/bug fixes

apps/common/mobile/resources/less/common-ios.less

@@ -52,6 +52,9 @@
     --f7-subnavbar-border-color: @background-menu-divider;
     --f7-list-border-color: @background-menu-divider;
 
+    --f7-picker-item-text-color: rgba(var(--text-normal), 0.45);
+    --f7-picker-item-selected-text-color: @text-normal;
+
     // Main Toolbar
     #editor-navbar.navbar .right a + a,
     #editor-navbar.navbar .left a + a {

apps/common/mobile/resources/less/common-material.less

@@ -43,6 +43,9 @@
     --f7-dialog-title-text-color: @text-normal;
     --f7-dialog-button-text-color: @brandColor;
 
+    --f7-picker-item-text-color: rgba(var(--text-normal), 0.45);
+    --f7-picker-item-selected-text-color: @text-normal;
+
     .button {
         --f7-touch-ripple-color: transparent;
     }

apps/documenteditor/mobile/src/controller/ContextMenu.jsx

@@ -18,7 +18,8 @@ import EditorUIController from '../lib/patch';
     canFillForms: stores.storeAppOptions.canFillForms,
     users: stores.users,
     isDisconnected: stores.users.isDisconnected,
-    displayMode: stores.storeReview.displayMode
+    displayMode: stores.storeReview.displayMode,
+    dataDoc: stores.storeDocumentInfo.dataDoc
 }))
 class ContextMenu extends ContextMenuController {
     constructor(props) {
@@ -273,7 +274,7 @@ class ContextMenu extends ContextMenuController {
                     });
                 }
 
-                if ( canFillForms && canCopy && !locked ) {
+                if ( canFillForms && dataDoc.fileType !== 'oform' && !locked ) {
                     itemsIcon.push({
                         event: 'paste',
                         icon: 'icon-paste'

apps/documenteditor/mobile/src/controller/Error.jsx

@@ -4,6 +4,9 @@ import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 
 const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
+    const { t } = useTranslation();
+    const _t = t("Error", { returnObjects: true });
+
     useEffect(() => {
         const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); };
 
@@ -20,9 +23,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
     });
 
     const onError = (id, level, errData) => {
-        const {t} = useTranslation();
-        const _t = t("Error", { returnObjects: true });
-
         if (id === Asc.c_oAscError.ID.LoadingScriptError) {
             f7.notification.create({
                 title: _t.criticalErrorTitle,

apps/documenteditor/mobile/src/controller/add/AddTable.jsx

@@ -37,7 +37,7 @@ class AddTableController extends Component {
             text: '',
             content:
                 '<div class="content-block">' +
-                '<div class="row">' +
+                '<div class="row row-picker">' +
                 '<div class="col-50">' + _t.textColumns + '</div>' +
                 '<div class="col-50">' + _t.textRows + '</div>' +
                 '</div>' +

apps/documenteditor/mobile/src/less/app.less

@@ -4,6 +4,7 @@
 @import '../../../../common/mobile/resources/less/_mixins.less';
 @import '../../../../common/mobile/resources/less/colors-table.less';
 @import '../../../../common/mobile/resources/less/colors-table-dark.less';
+
 @brandColor: var(--brand-word);
 
 .device-ios {
@@ -158,4 +159,12 @@
     height: 50px;
 }
 
+// Picker 
+
+.row-picker {
+    .col-50 {
+        color: @text-secondary;
+    }
+}
+
 

apps/documenteditor/mobile/src/page/main.jsx

@@ -1,6 +1,6 @@
 
 import React, { Component } from 'react';
-import { f7 } from 'framework7-react';
+import { f7, Link } from 'framework7-react';
 import { Page, View, Navbar, Subnavbar, Icon } from 'framework7-react';
 import { observer, inject } from "mobx-react";
 
@@ -101,7 +101,9 @@ class MainPage extends Component {
           <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
               {/* Top Navbar */}
               <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
-                  {showLogo && appOptions.canBranding !== undefined && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
+                  {showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={() => {
+                      window.open(`${__PUBLISHER_URL__}`, "_blank");
+                  }}><Icon icon="icon-logo"></Icon></div>}
                   <Subnavbar>
                       <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
                       <Search useSuspense={false}/>

apps/presentationeditor/mobile/src/controller/Error.jsx

@@ -4,6 +4,9 @@ import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 
 const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
+    const { t } = useTranslation();
+    const _t = t("Error", { returnObjects: true });
+
     useEffect(() => {
         const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); };
 
@@ -20,9 +23,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
     });
 
     const onError = (id, level, errData) => {
-        const {t} = useTranslation();
-        const _t = t("Error", { returnObjects: true });
-
         if (id === Asc.c_oAscError.ID.LoadingScriptError) {
             f7.notification.create({
                 title: _t.criticalErrorTitle,

apps/presentationeditor/mobile/src/page/main.jsx

@@ -1,5 +1,5 @@
 import React, { Component, Fragment } from 'react';
-import { f7, Page, View, Navbar, Subnavbar, Icon } from 'framework7-react';
+import { f7, Page, View, Navbar, Subnavbar, Icon, Link} from 'framework7-react';
 import { observer, inject } from "mobx-react";
 import { Device } from '../../../../common/mobile/utils/device';
 
@@ -110,7 +110,9 @@ class MainPage extends Component {
                 <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
                     {/* Top Navbar */}
                     <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
-                        {showLogo && appOptions.canBranding !== undefined && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
+                        {showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={() => {
+                            window.open(`${__PUBLISHER_URL__}`, "_blank");
+                        }}><Icon icon="icon-logo"></Icon></div>}
                         <Subnavbar>
                             <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
                             <Search useSuspense={false}/>

apps/spreadsheeteditor/mobile/src/controller/Error.jsx

@@ -4,6 +4,9 @@ import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 
 const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
+    const { t } = useTranslation();
+    const _t = t("Error", { returnObjects: true });
+
     useEffect(() => {
         const on_engine_created = k => { k.asc_registerCallback('asc_onError', onError); };
 
@@ -20,8 +23,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
     });
 
     const onError = (id, level, errData) => {
-        const {t} = useTranslation();
-        const _t = t("Error", { returnObjects: true });
         const api = Common.EditorApi.get();
         
         if (id === Asc.c_oAscError.ID.LoadingScriptError) {

apps/spreadsheeteditor/mobile/src/page/main.jsx

@@ -11,7 +11,7 @@ import FilterOptionsController from '../controller/FilterOptions.jsx'
 import AddOptions from "../view/add/Add";
 import EditOptions from "../view/edit/Edit";
 import { Search, SearchSettings } from '../controller/Search';
-import { f7 } from 'framework7-react';
+import { f7, Link } from 'framework7-react';
 
 import {FunctionGroups} from "../controller/add/AddFunction";
 import ContextMenu from '../controller/ContextMenu';
@@ -107,7 +107,10 @@ class MainPage extends Component {
             <Page name="home" className={`editor${ showLogo ? ' page-with-logo' : ''}`}>
               {/* Top Navbar */}
                 <Navbar id='editor-navbar' className={`main-navbar${showLogo ? ' navbar-with-logo' : ''}`}>
-                    {showLogo && appOptions.canBranding !== undefined && <div className="main-logo"><Icon icon="icon-logo"></Icon></div>}
+                    {showLogo && appOptions.canBranding !== undefined && <div className="main-logo" onClick={
+                    () => {
+                        window.open(`${__PUBLISHER_URL__}`, "_blank");
+                    }}><Icon icon="icon-logo"></Icon></div>}
                     <Subnavbar>
                         <Toolbar openOptions={this.handleClickToOpenOptions} closeOptions={this.handleOptionsViewClosed}/>
                         <Search useSuspense={false}/>