Merged PR 20854: Merge omarmstr/iframe_size_and_save_bugs to master

somriar · somriar · commit c87e8a1fec3f · 2017-05-22T06:32:13.000Z
bug fix for enterEdit mode, tile click event and dashboard embed not always loading
diff --git a/demo/v2-demo/scripts/codesamples.js b/demo/v2-demo/scripts/codesamples.js
@@ -884,6 +884,6 @@ function _DashboardEvents_TileClicked() {
 
     // dashboard.on will add an event listener.
     dashboard.on("tileClicked", function(event) {
-        Log.log(event);
+        Log.log(event.detail);
     });
 }
diff --git a/demo/v2-demo/scripts/function_mapping.js b/demo/v2-demo/scripts/function_mapping.js
@@ -47,10 +47,14 @@ function IsNotSupported(funcName) {
         return false
     }
 
-    // Get a reference to the embedded element
     const dashboardRegEx = /Dashboard/
     const dashboardMatch = funcName.match(dashboardRegEx)
-    var container = dashboardMatch ? '#dashboardContainer' : '#embedContainer';
+    if (dashboardMatch) {
+      return false;
+    }
+
+     // Get a reference to the embedded element
+    var container = '#embedContainer';
     var embed = powerbi.get($(container)[0]);
     if (embed.config.type !== 'create') {
         return false;
diff --git a/demo/v2-demo/scripts/report.js b/demo/v2-demo/scripts/report.js
@@ -156,11 +156,13 @@ function OpenEmbedMode(mode, entityType)
             {
                 LoadSampleDatasetIntoSession().then(function (response) {
                     SetTextBoxesFromSessionOrUrlParam("#txtCreateAccessToken", "#txtCreateReportEmbed", "#txtEmbedDatasetId");
+                    setCodeAndShowEmbedSettings(mode, entityType);
                 });
             }
             else
             {
                 SetTextBoxesFromSessionOrUrlParam("#txtCreateAccessToken", "#txtCreateReportEmbed", "#txtEmbedDatasetId");
+                setCodeAndShowEmbedSettings(mode, entityType);
             }
         }
         else
@@ -169,11 +171,13 @@ function OpenEmbedMode(mode, entityType)
             {
                 LoadSampleReportIntoSession().then(function (response) {
                     SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtReportEmbed", "#txtEmbedReportId");
+                    setCodeAndShowEmbedSettings(mode, entityType);
                 });
             }
             else
             {
                 SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtReportEmbed", "#txtEmbedReportId");
+                setCodeAndShowEmbedSettings(mode, entityType);
             }
         }
     }
@@ -183,15 +187,18 @@ function OpenEmbedMode(mode, entityType)
         {
             LoadSampleDashboardIntoSession().then(function (response) {
                 SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtDashboardEmbed", "#txtEmbedDashboardId");
+                setCodeAndShowEmbedSettings(mode, entityType);
             });
         }
         else
         {
             SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtDashboardEmbed", "#txtEmbedDashboardId");
+            setCodeAndShowEmbedSettings(mode, entityType);
         }
     }
-    
+}
 
+function setCodeAndShowEmbedSettings(mode, entityType) {
     setCodeArea(mode, entityType);
     showEmbedSettings(mode, entityType);
 }
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "http-post-message": "^0.2",
-    "powerbi-models": "^0.11",
+    "powerbi-models": "^0.11.2",
     "powerbi-router": "^0.1",
     "window-post-message-proxy": "^0.2"
   },

Original file line number	Diff line number	Diff line change
`@@ -884,6 +884,6 @@ function _DashboardEvents_TileClicked() {`
`884`	`884`
`885`	`885`	`// dashboard.on will add an event listener.`
`886`	`886`	`dashboard.on("tileClicked", function(event) {`
`887`		`- Log.log(event);`
	`887`	`+ Log.log(event.detail);`
`888`	`888`	`});`
`889`	`889`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,11 +156,13 @@ function OpenEmbedMode(mode, entityType)`
`156`	`156`	`{`
`157`	`157`	`LoadSampleDatasetIntoSession().then(function (response) {`
`158`	`158`	`SetTextBoxesFromSessionOrUrlParam("#txtCreateAccessToken", "#txtCreateReportEmbed", "#txtEmbedDatasetId");`
	`159`	`+ setCodeAndShowEmbedSettings(mode, entityType);`
`159`	`160`	`});`
`160`	`161`	`}`
`161`	`162`	`else`
`162`	`163`	`{`
`163`	`164`	`SetTextBoxesFromSessionOrUrlParam("#txtCreateAccessToken", "#txtCreateReportEmbed", "#txtEmbedDatasetId");`
	`165`	`+ setCodeAndShowEmbedSettings(mode, entityType);`
`164`	`166`	`}`
`165`	`167`	`}`
`166`	`168`	`else`
`@@ -169,11 +171,13 @@ function OpenEmbedMode(mode, entityType)`
`169`	`171`	`{`
`170`	`172`	`LoadSampleReportIntoSession().then(function (response) {`
`171`	`173`	`SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtReportEmbed", "#txtEmbedReportId");`
	`174`	`+ setCodeAndShowEmbedSettings(mode, entityType);`
`172`	`175`	`});`
`173`	`176`	`}`
`174`	`177`	`else`
`175`	`178`	`{`
`176`	`179`	`SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtReportEmbed", "#txtEmbedReportId");`
	`180`	`+ setCodeAndShowEmbedSettings(mode, entityType);`
`177`	`181`	`}`
`178`	`182`	`}`
`179`	`183`	`}`
`@@ -183,15 +187,18 @@ function OpenEmbedMode(mode, entityType)`
`183`	`187`	`{`
`184`	`188`	`LoadSampleDashboardIntoSession().then(function (response) {`
`185`	`189`	`SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtDashboardEmbed", "#txtEmbedDashboardId");`
	`190`	`+ setCodeAndShowEmbedSettings(mode, entityType);`
`186`	`191`	`});`
`187`	`192`	`}`
`188`	`193`	`else`
`189`	`194`	`{`
`190`	`195`	`SetTextBoxesFromSessionOrUrlParam("#txtAccessToken", "#txtDashboardEmbed", "#txtEmbedDashboardId");`
	`196`	`+ setCodeAndShowEmbedSettings(mode, entityType);`
`191`	`197`	`}`
`192`	`198`	`}`
`193`		`-`
	`199`	`+}`
`194`	`200`
	`201`	`+function setCodeAndShowEmbedSettings(mode, entityType) {`
`195`	`202`	`setCodeArea(mode, entityType);`
`196`	`203`	`showEmbedSettings(mode, entityType);`
`197`	`204`	`}`