Merge branch 'release/1.0.0' into bugfix/tile-view

packages/asc-web-common/components/MediaViewer/MediaViewer.js

@@ -13,6 +13,7 @@ import equal from "fast-deep-equal/react";
 import Hammer from "hammerjs";
 import IconButton from "@appserver/components/icon-button";
 import commonIconsStyles from "@appserver/components/utils/common-icons-style";
+import { isDesktop } from "react-device-detect";
 
 const StyledVideoViewer = styled(VideoViewer)`
   z-index: 301;
@@ -104,7 +105,7 @@ class MediaViewer extends React.Component {
             document.getElementsByClassName("videoViewerOverlay")[0]
           );
         }
-        if (_this.hammer) {
+        if (_this.hammer && !isDesktop) {
           _this.hammer.on("swipeleft", _this.nextMedia);
           _this.hammer.on("swiperight", _this.prevMedia);
         }

products/ASC.Files/Client/src/HOCs/withContent.js

@@ -109,14 +109,14 @@ export default function withContent(WrappedContent) {
       return this.completeAction(e);
     };
 
-    onClickUpdateItem = (e) => {
+    onClickUpdateItem = (e, open = true) => {
       const { fileActionType } = this.props;
       fileActionType === FileAction.Create
-        ? this.createItem(e)
+        ? this.createItem(e, open)
         : this.updateItem(e);
     };
 
-    createItem = (e) => {
+    createItem = (e, open) => {
       const {
         createFile,
         item,
@@ -144,7 +144,7 @@ export default function withContent(WrappedContent) {
       }
 
       let tab =
-        !isDesktop && item.fileExst
+        !isDesktop && item.fileExst && open
           ? window.open(
               combineUrl(
                 AppServerConfig.proxyURL,
@@ -173,10 +173,12 @@ export default function withContent(WrappedContent) {
                     encryptedFile,
                     true,
                     false
-                  ).then(() => openDocEditor(file.id, file.providerKey, tab));
+                  ).then(
+                    () => open && openDocEditor(file.id, file.providerKey, tab)
+                  );
                 });
               }
-              return openDocEditor(file.id, file.providerKey, tab);
+              return open && openDocEditor(file.id, file.providerKey, tab);
             })
             .then(() => this.completeAction(itemId))
             .catch((e) => toastr.error(e))

products/ASC.Files/Client/src/components/EditingWrapperComponent.js

@@ -151,6 +151,7 @@ const EditingWrapperComponent = (props) => {
   };
 
   const onFocus = (e) => e.target.select();
+  const onBlur = (e) => onClickUpdateItem(e, false);
 
   return (
     <EditingWrapper viewAs={viewAs}>
@@ -166,6 +167,7 @@ const EditingWrapperComponent = (props) => {
         onKeyUp={onKeyUpUpdateItem}
         onKeyDown={onEscapeKeyPress}
         onFocus={onFocus}
+        onBlur={onBlur}
         isDisabled={isLoading}
         data-itemid={itemId}
         withBorder={!isTable}

products/ASC.Files/Client/src/components/panels/StyledPanels.js

@@ -92,11 +92,11 @@ const StyledVersionHistoryPanel = styled.div`
   ${PanelStyles}
   .version-history-modal-dialog {
     transform: translateX(${(props) => (props.visible ? "0" : "720px")});
-    width: 720px;
+    width: 500px;
   }
   .version-history-aside-panel {
     transform: translateX(${(props) => (props.visible ? "0" : "720px")});
-    width: 720px;
+    width: 500px;
   }
   .version-history-panel-header {
     height: 53px;

products/ASC.Files/Client/src/store/UploadDataStore.js

@@ -389,7 +389,7 @@ class UploadDataStore {
       this.uploadToFolder = null;
       this.percent = 0;
     }
-    if (this.converted) {
+    if (this.uploaded && this.converted) {
       this.files = [];
       this.filesToConversion = [];
     }