Skip to content

Commit 6b46a89

Browse files
authored
Merge pull request #30 from eapearson/master
fix click trapping (to close hamburger menu); also update some deps
2 parents ff5e7b1 + 6db576c commit 6b46a89

File tree

20 files changed

+1978
-480
lines changed

20 files changed

+1978
-480
lines changed

build/bower.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,15 @@
2323
}
2424
},
2525
"dependencies": {
26-
"bluebird": "3.5.3",
26+
"bluebird": "3.5.5",
2727
"bootstrap": "3.4.1",
28-
"nunjucks": "^3.0.0",
2928
"jquery": "^2.1.0",
30-
"kbase-service-clients-js": "^3.3.5",
3129
"requirejs": "2.3.6",
3230
"require-css": "0.1.10",
3331
"kbase-common-js": "2.18.1",
34-
"kbase-common-es6": "0.10.15",
35-
"js-yaml": "3.12.1",
36-
"requirejs-text": "2.0.15",
32+
"kbase-common-es6": "0.10.20",
33+
"js-yaml": "3.13.1",
34+
"requirejs-text": "2.0.16",
3735
"requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",
3836
"pure-uuid": "eapearson/pure-uuid#1.1.1",
3937
"kbase-service-clients-js": "3.3.5",

build/package-lock.json

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

build/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"homepage": "https://github.com/kbase/kbase-ui-plugin-dashboard#readme",
1919
"dependencies": {},
2020
"devDependencies": {
21-
"bluebird": "3.5.3",
21+
"bluebird": "3.5.5",
2222
"bower-installer": "1.3.6",
2323
"chalk": "2.4.2",
24-
"fs-extra": "7.0.1",
25-
"glob": "7.1.3",
26-
"grunt": "1.0.3",
24+
"fs-extra": "8.1.0",
25+
"glob": "7.1.4",
26+
"grunt": "1.0.4",
2727
"grunt-contrib-copy": "1.0.0",
2828
"grunt-cli": "1.3.2",
29-
"js-yaml": "3.12.2",
29+
"js-yaml": "3.13.1",
3030
"numeral": "2.0.6",
3131
"pure-uuid": "1.5.7"
3232
}

src/plugin/iframe_root/main.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,16 @@
4545
const integration = new Integration({
4646
rootWindow: window
4747
});
48-
// try {
49-
// integration.start();
50-
// } catch (ex) {
51-
// console.error('Error starting main: ', ex.message);
52-
// }
48+
try {
49+
integration.start();
50+
} catch (ex) {
51+
console.error('Error starting main: ', ex.message);
52+
}
5353

5454
const {
5555
params: { config, token, username }
5656
} = integration.getParamsFromIFrame();
5757

58-
// console.log('config?', pluginConfig);
59-
6058
const runtime = new Runtime({
6159
config,
6260
token,

0 commit comments

Comments
 (0)