code clean up

2 files changed, 8 insertions, 54 deletions

diff --git a/src/client/views/collections/CollectionCarousel3DView.scss b/src/client/views/collections/CollectionCarousel3DView.scss
index 25d1df2f4..7da007ef3 100644
--- a/src/client/views/collections/CollectionCarousel3DView.scss
+++ b/src/client/views/collections/CollectionCarousel3DView.scss
@@ -3,13 +3,6 @@
     height: 100%;
     perspective: 30em;
 
-    .test-button {
-        position: absolute;
-        top: 0;
-        left: 0;
-        z-index: 999;
-    }
-
     .collectionCarouselView-image {
         position: absolute;
         height: 100%;
@@ -41,34 +34,4 @@
         top: 25%;
         transform: rotateY(20deg)
     }
-}
-
-.carouselView-back,
-.carouselView-fwd {
-    position: absolute;
-    display: flex;
-    top: 50%;
-    width: 30;
-    height: 30;
-    align-items: center;
-    border-radius: 5px;
-    justify-content: center;
-    background: rgba(255, 255, 255, 0.46);
-}
-
-.carouselView-fwd {
-    right: 0;
-}
-
-.carouselView-back {
-    left: 0;
-}
-
-.carouselView-back:hover,
-.carouselView-fwd:hover {
-    background: lightgray;
-}
-
-.carouselView-fwd:hover~.collectionCarouselView-image {
-    transform: translateX(50px)
 }
\ No newline at end of file
diff --git a/src/client/views/collections/CollectionCarousel3DView.tsx b/src/client/views/collections/CollectionCarousel3DView.tsx
index fd1785641..649ca4eba 100644
--- a/src/client/views/collections/CollectionCarousel3DView.tsx
+++ b/src/client/views/collections/CollectionCarousel3DView.tsx
@@ -30,18 +30,17 @@ export class CollectionCarousel3DView extends CollectionSubView(Carousel3DDocume
         }
     }
 
-    addCaption = (e: React.MouseEvent) => {
-        e.stopPropagation();
-        const index = NumCast(this.layoutDoc._itemIndex);
-        if (this.childLayoutPairs[index].layout._showCaption !== "caption") {
-            this.childLayoutPairs[index].layout._showCaption = "caption";
-        }
+    @computed get changeIndexScript() {
+        return ScriptField.MakeScript(
+            "collectionLayoutDoc._itemIndex = collectionLayoutDoc[fieldKey].indexOf(self)",
+            { fieldKey: String.name, collectionLayoutDoc: Doc.name },
+            { fieldKey: this.props.fieldKey, collectionLayoutDoc: this.layoutDoc }
+        );
     }
 
     mainPanelWidth = () => this.props.PanelWidth() * 0.6;
     sidePanelWidth = () => this.props.PanelWidth() * 0.3;
     sidePanelHeight = () => this.props.PanelHeight() * 0.5;
-
     @computed get content() {
         const index = NumCast(this.layoutDoc._itemIndex);
         const prevIndex = (index - 1 + this.childLayoutPairs.length) % this.childLayoutPairs.length;
@@ -51,11 +50,7 @@ export class CollectionCarousel3DView extends CollectionSubView(Carousel3DDocume
                 <div className="collectionCarouselView-prev">
                     <ContentFittingDocumentView {...this.props}
                         onDoubleClick={ScriptCast(this.layoutDoc.onChildDoubleClick)}
-                        onClick={ScriptField.MakeScript(
-                            "collectionLayoutDoc._itemIndex = collectionLayoutDoc[fieldKey].indexOf(self)",
-                            { fieldKey: String.name, collectionLayoutDoc: Doc.name },
-                            { fieldKey: this.props.fieldKey, collectionLayoutDoc: this.layoutDoc }
-                        )}
+                        onClick={this.changeIndexScript}
                         renderDepth={this.props.renderDepth + 1}
                         LayoutTemplate={this.props.ChildLayoutTemplate}
                         LayoutTemplateString={this.props.ChildLayoutString}
@@ -71,11 +66,7 @@ export class CollectionCarousel3DView extends CollectionSubView(Carousel3DDocume
                 <div className="collectionCarouselView-next">
                     <ContentFittingDocumentView {...this.props}
                         onDoubleClick={ScriptCast(this.layoutDoc.onChildDoubleClick)}
-                        onClick={ScriptField.MakeScript(
-                            "collectionLayoutDoc._itemIndex = collectionLayoutDoc[fieldKey].indexOf(self)",
-                            { fieldKey: String.name, collectionLayoutDoc: Doc.name },
-                            { fieldKey: this.props.fieldKey, collectionLayoutDoc: this.layoutDoc }
-                        )}
+                        onClick={this.changeIndexScript}
                         renderDepth={this.props.renderDepth + 1}
                         LayoutTemplate={this.props.ChildLayoutTemplate}
                         LayoutTemplateString={this.props.ChildLayoutString}