From 5683a5f344dd1c91a339c38061b3788701af0eb8 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Sun, 30 Aug 2020 13:43:24 -0400
Subject: re-enabled google docs buttons in document decorations.

---
 src/client/views/DocumentButtonBar.tsx | 10 +++++-----
 src/client/views/PropertiesButtons.tsx | 10 +++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/client/views/DocumentButtonBar.tsx b/src/client/views/DocumentButtonBar.tsx
index 45336129a..32434490b 100644
--- a/src/client/views/DocumentButtonBar.tsx
+++ b/src/client/views/DocumentButtonBar.tsx
@@ -317,15 +317,15 @@ export class DocumentButtonBar extends React.Component<{ views: () => (DocumentV
             {![DocumentType.VID, DocumentType.WEB].includes(StrCast(this.view0.props.Document.type) as DocumentType) ? (null) : <div className="documentButtonBar-button">
                 {this.annotateButton}
             </div>}
-            <div className="documentButtonBar-button">
-                {this.moreButton}
-            </div>
-            {/* <div className="documentButtonBar-button" style={{ display: !considerPush ? "none" : "" }}>
+            <div className="documentButtonBar-button" style={{ display: !considerPush ? "none" : "" }}>
                 {this.considerGoogleDocsPush}
             </div>
             <div className="documentButtonBar-button" style={{ display: !considerPull ? "none" : "" }}>
                 {this.considerGoogleDocsPull}
-            </div> */}
+            </div>
+            <div className="documentButtonBar-button">
+                {this.moreButton}
+            </div>
         </div>;
     }
 }
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index dcd3d47cf..921822539 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -143,11 +143,8 @@ export class PropertiesButtons extends React.Component<{}, {}> {
                 <div className="propertiesButtons-linker"
                     style={{ backgroundColor: this.pullColor }}
                     onPointerEnter={action(e => {
-                        if (e.altKey) {
-                            this.openHover = UtilityButtonState.OpenExternally;
-                        } else if (e.shiftKey) {
-                            this.openHover = UtilityButtonState.OpenRight;
-                        }
+                        e.altKey && (this.openHover = UtilityButtonState.OpenExternally);
+                        e.shiftKey && (this.openHover = UtilityButtonState.OpenRight);
                     })}
                     onPointerLeave={action(() => this.openHover = UtilityButtonState.Default)}
                     onClick={async e => {
@@ -171,8 +168,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
                             dataDoc.unchanged && runInAction(() => this.isAnimatingFetch = true);
                         }
                     }}>
-                    <FontAwesomeIcon className="documentdecorations-icon" size="lg"
-                        color="black"
+                    <FontAwesomeIcon className="documentdecorations-icon" size="lg" color="black"
                         style={{ WebkitAnimation: animation, MozAnimation: animation }}
                         icon={(() => {
                             switch (this.openHover) {
-- 
cgit v1.2.3-70-g09d2