fix(#471): refactoring object references

deckgo · Nov 25, 2019 · a83c3cf · a83c3cf
1 parent 9f99e29
commit a83c3cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.tsx b/webcomponents/slides/poll/src/components/slide/deckdeckgo-slide-poll.tsx
@@ -94,7 +94,7 @@ export class DeckdeckgoSlidePoll implements DeckdeckgoSlideResize {
       await this.updateChartAnswersData();
 
       if (this.chartData && this.chartData.length >= 1) {
-        await updateCurrentBar(this.el);
+        await updateCurrentBar(this.el, this.chartData[0].values);
 
         await this.updatePoll();
       }
@@ -111,7 +111,7 @@ export class DeckdeckgoSlidePoll implements DeckdeckgoSlideResize {
         this.oldPollKey = this.pollKey;
         this.pollKey = key;
 
-        await initHowTo(this.el);
+        await initHowTo(this.el, this.pollKey);
       }
     });
 
@@ -297,7 +297,7 @@ export class DeckdeckgoSlidePoll implements DeckdeckgoSlideResize {
 
         await drawChart(this.el, this.chartWidth, this.chartHeight);
 
-        await initHowTo(this.el);
+        await initHowTo(this.el, this.pollKey);
       }
 
       this.pollConnected.emit();

diff --git a/webcomponents/slides/poll/src/utils/deckdeckgo-slide-poll.chart.utils.tsx b/webcomponents/slides/poll/src/utils/deckdeckgo-slide-poll.chart.utils.tsx
@@ -45,10 +45,10 @@ export function initChartDataBar(el: HTMLElement, answerSlotName: string, index:
   });
 }
 
-export async function updateCurrentBar(el: HTMLElement) {
+export async function updateCurrentBar(el: HTMLElement, values: DeckdeckgoBarChartDataValue[]) {
   const element: HTMLElement = el.shadowRoot.querySelector('deckgo-bar-chart');
 
   if (element) {
-    await (element as any).updateCurrentBar(this.chartData[0].values);
+    await (element as any).updateCurrentBar(values);
   }
 }
diff --git a/webcomponents/slides/poll/src/utils/deckdeckgo-slide-poll.howto.utils.tsx b/webcomponents/slides/poll/src/utils/deckdeckgo-slide-poll.howto.utils.tsx
@@ -1,4 +1,4 @@
-export function initHowTo(el: HTMLElement): Promise<void> {
+export function initHowTo(el: HTMLElement, pollKey: string): Promise<void> {
   return new Promise<void>(async (resolve) => {
     const howToSlotElement: HTMLElement = el.querySelector(':scope > [slot=\'how-to\']');
 
@@ -20,14 +20,14 @@ export function initHowTo(el: HTMLElement): Promise<void> {
       container.removeChild(howTo);
     }
 
-    const element: HTMLElement = await cloneHowTo(howToSlotElement);
+    const element: HTMLElement = await cloneHowTo(howToSlotElement, pollKey);
     container.appendChild(element);
 
     resolve();
   });
 }
 
-function cloneHowTo(howToSlotElement: HTMLElement): Promise<HTMLElement> {
+function cloneHowTo(howToSlotElement: HTMLElement, pollKey: string): Promise<HTMLElement> {
   return new Promise<HTMLElement>((resolve) => {
     const element: HTMLElement = howToSlotElement.cloneNode(true) as HTMLElement;
     element.removeAttribute('slot');
@@ -38,7 +38,7 @@ function cloneHowTo(howToSlotElement: HTMLElement): Promise<HTMLElement> {
       return;
     }
 
-    const replaceWith: string = this.pollKey ? this.pollKey.toString().replace(/\B(?=(\d{2})+(?!\d))/g, ' ') : '{0}';
+    const replaceWith: string = pollKey ? pollKey.toString().replace(/\B(?=(\d{2})+(?!\d))/g, ' ') : '{0}';
 
     element.innerHTML = element.innerHTML.replace(/\{0\}/g, replaceWith);