Rename component 'name' variable to 'type' to avoid conflicts with function.name which is undefined in some browsers but read-only in others causing issues with both not assigning a value or assigning a value.

Matt Mazzola · Matt Mazzola · commit a0c9d767e196 · 2016-06-08T15:12:51.000-07:00
diff --git a/src/core.ts b/src/core.ts
@@ -100,13 +100,13 @@ export class PowerBi {
     private embedNew(element: IPowerBiElement, config: IEmbedOptions): Embed {
         const componentType = config.type || element.getAttribute(Embed.typeAttribute);
         if (!componentType) {
-            throw new Error(`Attempted to embed using config ${JSON.stringify(config)} on element ${element.outerHTML}, but could not determine what type of component to embed. You must specify a type in the configuration or as an attribute such as '${Embed.typeAttribute}="${Report.name.toLowerCase()}"'.`);
+            throw new Error(`Attempted to embed using config ${JSON.stringify(config)} on element ${element.outerHTML}, but could not determine what type of component to embed. You must specify a type in the configuration or as an attribute such as '${Embed.typeAttribute}="${Report.type.toLowerCase()}"'.`);
         }
         
         // Save type on configuration so it can be referenced later at known location
         config.type = componentType;
         
-        const Component = Utils.find(component => componentType === component.name.toLowerCase(), PowerBi.components);
+        const Component = Utils.find(component => componentType === component.type.toLowerCase(), PowerBi.components);
         if (!Component) {
             throw new Error(`Attempted to embed component of type: ${componentType} but did not find any matching component.  Please verify the type you specified is intended.`);
         }
diff --git a/src/embed.ts b/src/embed.ts
@@ -47,7 +47,7 @@ export abstract class Embed {
      * Attribute used to specify type of visual.
      * Example: `<div powerbi-type="report"></div>`
      */
-    public static name: string;
+    public static type: string;
     /**
      * Default options for embeddable component.
      */
diff --git a/src/report.ts b/src/report.ts
@@ -5,7 +5,7 @@ export interface IReportLoadMessage extends ILoadMessage {
 }
 
 export class Report extends Embed {
-    static name = "Report";
+    static type = "Report";
     
     getEmbedUrl(): string {
         let embedUrl = super.getEmbedUrl();
diff --git a/src/tile.ts b/src/tile.ts
@@ -5,7 +5,7 @@ export interface ITileLoadMessage extends ILoadMessage {
 }
 
 export class Tile extends Embed {
-    static name = "Tile";
+    static type = "Tile";
     
     getEmbedUrl(): string {
         const embedUrl = super.getEmbedUrl();

Original file line number	Diff line number	Diff line change
`@@ -100,13 +100,13 @@ export class PowerBi {`
`100`	`100`	`private embedNew(element: IPowerBiElement, config: IEmbedOptions): Embed {`
`101`	`101`	`const componentType = config.type \|\| element.getAttribute(Embed.typeAttribute);`
`102`	`102`	`if (!componentType) {`
`103`		- throw new Error(`Attempted to embed using config ${JSON.stringify(config)} on element ${element.outerHTML}, but could not determine what type of component to embed. You must specify a type in the configuration or as an attribute such as '${Embed.typeAttribute}="${Report.name.toLowerCase()}"'.`);
	`103`	+ throw new Error(`Attempted to embed using config ${JSON.stringify(config)} on element ${element.outerHTML}, but could not determine what type of component to embed. You must specify a type in the configuration or as an attribute such as '${Embed.typeAttribute}="${Report.type.toLowerCase()}"'.`);
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Save type on configuration so it can be referenced later at known location`
`107`	`107`	`config.type = componentType;`
`108`	`108`
`109`		`- const Component = Utils.find(component => componentType === component.name.toLowerCase(), PowerBi.components);`
	`109`	`+ const Component = Utils.find(component => componentType === component.type.toLowerCase(), PowerBi.components);`
`110`	`110`	`if (!Component) {`
`111`	`111`	throw new Error(`Attempted to embed component of type: ${componentType} but did not find any matching component. Please verify the type you specified is intended.`);
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export interface IReportLoadMessage extends ILoadMessage {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`export class Report extends Embed {`
`8`		`- static name = "Report";`
	`8`	`+ static type = "Report";`
`9`	`9`
`10`	`10`	`getEmbedUrl(): string {`
`11`	`11`	`let embedUrl = super.getEmbedUrl();`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export interface ITileLoadMessage extends ILoadMessage {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`export class Tile extends Embed {`
`8`		`- static name = "Tile";`
	`8`	`+ static type = "Tile";`
`9`	`9`
`10`	`10`	`getEmbedUrl(): string {`
`11`	`11`	`const embedUrl = super.getEmbedUrl();`