Skip to content

Commit e34e1af

Browse files
committed
Merge remote-tracking branch 'powerbi/master'
2 parents 35f0d29 + 6e6af9b commit e34e1af

File tree

10 files changed

+28
-33
lines changed

10 files changed

+28
-33
lines changed
-44.1 KB
Loading

demo/v2-demo/live_showcases/insight_to_action/showcase_insight_to_action.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="startTooltip">
2-
<div class="btnCloseTooltip" onclick="onTootipClicked('startTooltip');">
2+
<div class="btnCloseTooltip" onclick="onTootipClicked('closeTooltip');">
33
<img src="images\closeWhite.png"/>
44
</div>
55
<div class="showcaseTooltipText">Start a campaign with these customers</div>

demo/v2-demo/live_showcases/insight_to_action/showcase_insight_to_action.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@ function filterTable(filterValues, table) {
205205

206206
// Handles tooltip click action
207207
function onTootipClicked(tooltipId) {
208-
if (!InsightToActionShowcaseState.tooltipNextPressed && tooltipId === "startTooltip") {
208+
if ( tooltipId === "closeTooltip"){
209+
$('#startTooltip').hide();
210+
} else if (!InsightToActionShowcaseState.tooltipNextPressed && tooltipId === "startTooltip") {
209211
let newText = document.createTextNode("Then, click `Start campaign` menu command.");
210212
let startTooltipSubText = $('#startTooltip .showcaseTooltipSubText');
211213
const textOldHeight = startTooltipSubText[0].offsetHeight;

dist/powerbi-client.d.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
/*! powerbi-client v2.10.2 | (c) 2016 Microsoft Corporation MIT */
1+
/*! powerbi-client v2.10.3 | (c) 2016 Microsoft Corporation MIT */
22
declare module "util" {
33
import { HttpPostMessage } from 'http-post-message';
4-
global {
5-
interface Window {
6-
msCrypto: Crypto;
7-
}
8-
}
94
/**
105
* Raises a custom event with event data on the specified HTML element.
116
*

dist/powerbi.js

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/powerbi.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ gulp.task('compile:spec', 'Compile spec tests', function () {
201201
});
202202

203203
gulp.task('test:js', 'Run js tests', function (done) {
204-
new karma.Server.start({
204+
new karma.Server({
205205
configFile: __dirname + '/karma.conf.js',
206206
singleRun: argv.watch ? false : true,
207207
captureTimeout: argv.timeout || 60000
208-
}, done);
208+
}, done).start();
209209
});

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "powerbi-client",
3-
"version": "2.10.2",
3+
"version": "2.10.3",
44
"description": "JavaScript library for embedding Power BI into your apps. Provides service which makes it easy to embed different types of components and an object model which allows easy interaction with these components such as changing pages, applying filters, and responding to data selection.",
55
"main": "dist/powerbi.js",
66
"typings": "dist/powerbi-client.d.ts",
@@ -51,17 +51,16 @@
5151
"gulp4-run-sequence": "^1.0.0",
5252
"http-server": "^0.11.1",
5353
"ignore-loader": "^0.1.1",
54-
"jasmine": "^2.4.1",
5554
"jasmine-core": "^2.4.1",
5655
"jquery": "^3.3.1",
5756
"json-loader": "^0.5.4",
58-
"karma": "^0.13.19",
59-
"karma-chrome-launcher": "^0.2.3",
60-
"karma-coverage": "^0.5.5",
61-
"karma-firefox-launcher": "^1.0.0",
57+
"karma": "^4.4.1",
58+
"karma-chrome-launcher": "^3.1.0",
59+
"karma-coverage": "^2.0.1",
60+
"karma-firefox-launcher": "^1.2.0",
6261
"karma-jasmine": "^0.3.8",
63-
"karma-phantomjs-launcher": "^1.0.2",
64-
"karma-spec-reporter": "0.0.23",
62+
"karma-phantomjs-launcher": "^1.0.4",
63+
"karma-spec-reporter": "0.0.32",
6564
"moment": "^2.14.1",
6665
"phantomjs-prebuilt": "^2.1.3",
6766
"ts-loader": "^0.8.1",
@@ -75,7 +74,7 @@
7574
},
7675
"dependencies": {
7776
"http-post-message": "^0.2",
78-
"powerbi-models": "^1.3.0",
77+
"powerbi-models": "^1.3.1",
7978
"powerbi-router": "^0.1",
8079
"window-post-message-proxy": "^0.2"
8180
},

src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const config = {
2-
version: '2.10.2',
2+
version: '2.10.3',
33
type: 'js'
44
};
55

src/util.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
import { HttpPostMessage } from 'http-post-message';
2-
declare global {
3-
interface Window {
4-
msCrypto: Crypto;
5-
}
6-
}
72

83
/**
94
* Raises a custom event with event data on the specified HTML element.

0 commit comments

Comments
 (0)