feat(#408): clean only in case of split and load vertical from db in …

…case of split
deckgo · Oct 21, 2019 · 71d2514 · 71d2514
1 parent c1e57bc
commit 71d2514
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx b/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx
@@ -542,21 +542,35 @@ export class DeckEventsHandler {
             if ((slide as any).imgAlt) {
                 attributes.imgAlt = (slide as any).imgAlt;
             }
-
+
+            const qrCodeAttributes: SlideAttributes = await this.getSlideAttributesQRCode(slide, cleanFields);
+            const chartAttributes: SlideAttributes = await this.getSlideAttributesChart(slide, cleanFields);
+            const splitAttributes: SlideAttributes = await this.getSlideAttributesSplit(slide, cleanFields);
+
+            attributes = {...attributes, ...qrCodeAttributes, ...chartAttributes, ...splitAttributes};
+
+            resolve(attributes);
+        })
+    }
+
+    private getSlideAttributesSplit(slide: HTMLElement, cleanFields: boolean): Promise<SlideAttributes> {
+        return new Promise<SlideAttributes>((resolve) => {
+            if (!slide || !slide.nodeName || slide.nodeName.toLowerCase() !== 'deckgo-slide-split') {
+                resolve({});
+                return;
+            }
+
+            let attributes: SlideAttributes = {};
+
             if ((slide as any).vertical) {
                 attributes.vertical = true;
             } else if (cleanFields) {
                 // @ts-ignore
                 attributes.vertical = firebase.firestore.FieldValue.delete();
             }
 
-            const qrCodeAttributes: SlideAttributes = await this.getSlideAttributesQRCode(slide, cleanFields);
-            const chartAttributes: SlideAttributes = await this.getSlideAttributesChart(slide, cleanFields);
-
-            attributes = {...attributes, ...qrCodeAttributes, ...chartAttributes};
-
             resolve(attributes);
-        })
+        });
     }
 
     private getSlideAttributesQRCode(slide: HTMLElement, cleanFields: boolean): Promise<SlideAttributes> {

diff --git a/studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx b/studio/src/app/popovers/editor/app-create-slide/app-create-slide.tsx
@@ -115,7 +115,7 @@ export class AppCreateSlide {
 
     private async addSlideSplit(template: SlideTemplate, attributes: SlideAttributes = undefined) {
         const slide: JSX.IntrinsicElements = await CreateSlidesUtils.createSlideSplit(attributes);
-        await this.closePopover(template, slide, attributes);
+        await this.closePopover(template, slide);
     }
 
     private addSlideQRCode() {

diff --git a/studio/src/app/utils/editor/parse-slides.utils.tsx b/studio/src/app/utils/editor/parse-slides.utils.tsx
@@ -64,6 +64,9 @@ export class ParseSlidesUtils {
                 attributes['ticks'] = slide.data.attributes && slide.data.attributes.ticks ? slide.data.attributes.ticks : undefined;
                 attributes['grid'] = slide.data.attributes && slide.data.attributes.grid ? 'true' : undefined;
                 attributes['separator'] = slide.data.attributes && slide.data.attributes.separator ? slide.data.attributes.separator : undefined;
+            }
+
+            if (slide.data.template === SlideTemplate.SPLIT) {
                 attributes['vertical'] = slide.data.attributes && slide.data.attributes.vertical ? 'true' : undefined;
             }