Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
This commit is contained in:
commit
e40929ef5a
@ -109,7 +109,8 @@ class MediaViewer extends React.Component {
|
||||
_this.hammer.on("swiperight", _this.prevMedia);
|
||||
}
|
||||
} catch (ex) {
|
||||
console.error("MediaViewer updateHammer", ex);
|
||||
//console.error("MediaViewer updateHammer", ex);
|
||||
this.hammer = null;
|
||||
}
|
||||
}, 500);
|
||||
}
|
||||
@ -190,33 +191,15 @@ class MediaViewer extends React.Component {
|
||||
if (ext === ".tiff" || ext === ".tif") {
|
||||
this.getTiffDataURL(src);
|
||||
}
|
||||
var _this = this;
|
||||
setTimeout(function () {
|
||||
if (document.getElementsByClassName("react-viewer-canvas").length > 0) {
|
||||
_this.hammer = Hammer(
|
||||
document.getElementsByClassName("react-viewer-canvas")[0]
|
||||
);
|
||||
var pinch = new Hammer.Pinch();
|
||||
_this.hammer.add([pinch]);
|
||||
_this.hammer.on("pinchout", _this.handleZoomOut);
|
||||
_this.hammer.on("pinchin", _this.handleZoomIn);
|
||||
_this.hammer.on("pinchend", _this.handleZoomEnd);
|
||||
_this.hammer.on("doubletap", _this.doubleTap);
|
||||
} else {
|
||||
_this.hammer = Hammer(
|
||||
document.getElementsByClassName("videoViewerOverlay")[0]
|
||||
);
|
||||
}
|
||||
if (_this.hammer) {
|
||||
_this.hammer.on("swipeleft", _this.nextMedia);
|
||||
_this.hammer.on("swiperight", _this.prevMedia);
|
||||
}
|
||||
}, 500);
|
||||
|
||||
this.updateHammer();
|
||||
|
||||
document.addEventListener("keydown", this.onKeydown, false);
|
||||
document.addEventListener("keyup", this.onKeyup, false);
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
console.log("unmount mediaviewer");
|
||||
if (this.hammer) {
|
||||
this.hammer.off("swipeleft", this.nextMedia);
|
||||
this.hammer.off("swiperight", this.prevMedia);
|
||||
@ -227,6 +210,7 @@ class MediaViewer extends React.Component {
|
||||
}
|
||||
document.removeEventListener("keydown", this.onKeydown, false);
|
||||
document.removeEventListener("keyup", this.onKeyup, false);
|
||||
this.onClose();
|
||||
}
|
||||
|
||||
mapSupplied = {
|
||||
|
@ -3,7 +3,7 @@ import PropTypes from "prop-types";
|
||||
import Backdrop from "@appserver/components/backdrop";
|
||||
import { size } from "@appserver/components/utils/device";
|
||||
import { Provider } from "@appserver/components/utils/context";
|
||||
import { isMobile } from "react-device-detect";
|
||||
import { isMobile, isFirefox, isMobileOnly } from "react-device-detect";
|
||||
import Article from "./sub-components/article";
|
||||
import SubArticleHeader from "./sub-components/article-header";
|
||||
import SubArticleMainButton from "./sub-components/article-main-button";
|
||||
@ -114,8 +114,12 @@ class PageLayout extends React.Component {
|
||||
orientationChangeHandler = () => {
|
||||
const isValueExist = !!this.props.isArticlePinned;
|
||||
const isEnoughWidth = screen.availWidth > size.smallTablet;
|
||||
const isPortrait =
|
||||
isFirefox &&
|
||||
isMobileOnly &&
|
||||
screen.orientation.type === "landscape-primary";
|
||||
|
||||
if (!isEnoughWidth && isValueExist) {
|
||||
if ((!isEnoughWidth && isValueExist) || isPortrait) {
|
||||
this.backdropClick();
|
||||
}
|
||||
if (isEnoughWidth && isValueExist) {
|
||||
|
@ -35,7 +35,9 @@ class TableHeader extends React.Component {
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
this.onResize();
|
||||
if (this.props.sectionWidth >= size.tablet + 24) {
|
||||
this.onResize();
|
||||
}
|
||||
}
|
||||
|
||||
getSubstring = (str) => +str.substring(0, str.length - 2);
|
||||
@ -201,23 +203,15 @@ class TableHeader extends React.Component {
|
||||
columnStorageName,
|
||||
checkboxSize,
|
||||
resetColumnsSize,
|
||||
sectionWidth,
|
||||
} = this.props;
|
||||
|
||||
const minSize = size.tablet + 24;
|
||||
|
||||
let activeColumnIndex = null;
|
||||
|
||||
const container = containerRef.current
|
||||
? containerRef.current
|
||||
: document.getElementById("table-container");
|
||||
|
||||
if (
|
||||
!container ||
|
||||
+container.clientWidth <= minSize ||
|
||||
sectionWidth <= minSize
|
||||
)
|
||||
return;
|
||||
if (!container) return;
|
||||
|
||||
const storageSize =
|
||||
!resetColumnsSize && localStorage.getItem(columnStorageName);
|
||||
|
@ -44,7 +44,7 @@ import i18n from "./i18n";
|
||||
import Text from "@appserver/components/text";
|
||||
import TextInput from "@appserver/components/text-input";
|
||||
import Checkbox from "@appserver/components/checkbox";
|
||||
|
||||
import { isMobile } from "react-device-detect";
|
||||
import store from "studio/store";
|
||||
|
||||
const { auth: authStore } = store;
|
||||
@ -381,7 +381,7 @@ const Editor = () => {
|
||||
setFavicon(config.documentType);
|
||||
setDocumentTitle(docTitle);
|
||||
|
||||
if (window.innerWidth < 720) {
|
||||
if (isMobile) {
|
||||
config.type = "mobile";
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user