Skip to content

Commit 07b795e

Browse files
mchapmanmchapman
committed
chore(deps) Make fng-reports plugin work with ui-grid
1 parent abee808 commit 07b795e

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

‎js/controllers/nav.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module fng.controllers {
108108
}
109109
} catch (error) {
110110
// Check to see if error is no such controller - don't care
111-
if (!(/is not a function, got undefined/.test(error.message))) {
111+
if ((!(/is not a function, got undefined/.test(error.message))) && (!(/\[\$controller:ctrlreg\] The controller with the name/.test(error.message)))) {
112112
console.log('Unable to instantiate ' + controllerName + ' - ' + error.message);
113113
}
114114
}

‎js/services/add-all.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/services/submissions.js

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

‎package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,18 @@
3232
],
3333
"dependencies": {
3434
"async": "1.5.2",
35-
"express": "4.14.1",
36-
"kerberos":"0.0.22",
37-
"mongoose": "4.8.1",
3835
"node.extend": "1.1.6",
3936
"underscore": "1.8.3"
4037
},
38+
"peerDependencies": {
39+
"express": "4.14.1",
40+
"kerberos": "0.0.22",
41+
"mongoose": "4.8.1"
42+
},
4143
"devDependencies": {
4244
"body-parser": "1.16.0",
4345
"del": "2.2.2",
46+
"express": "4.14.1",
4447
"gulp": "3.9.1",
4548
"gulp-angular-templatecache": "2.0.0",
4649
"gulp-clean-css": "2.3.2",
@@ -58,6 +61,7 @@
5861
"karma-phantomjs-launcher": "1.0.2",
5962
"matchdep": "1.0.1",
6063
"mocha": "3.2.0",
64+
"mongoose": "4.8.1",
6165
"phantomjs-prebuilt": "2.1.14",
6266
"run-sequence": "1.2.2",
6367
"uglify-js": "2.7.5"

‎server/data_form.js

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

‎template/base-analysis.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1>{{ reportSchema.title }}</h1>
1212
<div class="container-fluid page-body report-body">
1313
<error-display></error-display>
1414
<div class="row-fluid">
15-
<div class="gridStyle" ng-grid="gridOptions"></div>
15+
<div class="gridStyle" ui-grid="gridOptions" ui-grid-selection></div>
1616
</div>
1717
</div>
1818
</div>

0 commit comments

Comments
 (0)