Skip to content

Commit babab76

Browse files
torkelotorkelo
committed
tech(lib upgrade): fixed issue with angular 1.5.8, so can revert revert of upgrade, that is we are no on latest angularjs, grafana#6022 
1 parent c594f9f commit babab76

30 files changed

+2831
-1442
lines changed

‎bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"dependencies": {
1616
"jquery": "3.1.0",
1717
"lodash": "4.15.0",
18-
"angular": "1.5.3",
19-
"angular-route": "1.5.3",
20-
"angular-mocks": "1.5.3",
21-
"angular-sanitize": "1.5.3",
18+
"angular": "1.5.8",
19+
"angular-route": "1.5.8",
20+
"angular-mocks": "1.5.8",
21+
"angular-sanitize": "1.5.8",
2222
"angular-native-dragdrop": "1.2.2",
2323
"angular-bindonce": "0.3.3"
2424
}

‎public/app/core/routes/bundle_loader.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22

33
export class BundleLoader {
44
lazy: any;
5-
loadingDefer: any;
65

76
constructor(bundleName) {
7+
var defer = null;
8+
89
this.lazy = ["$q", "$route", "$rootScope", ($q, $route, $rootScope) => {
9-
if (this.loadingDefer) {
10-
return this.loadingDefer.promise;
10+
if (defer) {
11+
return defer.promise;
1112
}
1213

13-
this.loadingDefer = $q.defer();
14+
defer = $q.defer();
1415

1516
System.import(bundleName).then(() => {
16-
this.loadingDefer.resolve();
17+
defer.resolve();
1718
});
1819

19-
return this.loadingDefer.promise;
20+
return defer.promise;
2021
}];
2122

2223
}

‎public/vendor/angular-mocks/.bower.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"name": "angular-mocks",
3-
"version": "1.5.3",
3+
"version": "1.5.8",
44
"license": "MIT",
55
"main": "./angular-mocks.js",
66
"ignore": [],
77
"dependencies": {
8-
"angular": "1.5.3"
8+
"angular": "1.5.8"
99
},
1010
"homepage": "https://github.com/angular/bower-angular-mocks",
11-
"_release": "1.5.3",
11+
"_release": "1.5.8",
1212
"_resolution": {
1313
"type": "version",
14-
"tag": "v1.5.3",
15-
"commit": "319557fe710cecc11e12c772cc1abb8098d29ccb"
14+
"tag": "v1.5.8",
15+
"commit": "482eefcf6b03057c5fcddb9750e460f458ee3487"
1616
},
1717
"_source": "https://github.com/angular/bower-angular-mocks.git",
18-
"_target": "1.5.3",
18+
"_target": "1.5.8",
1919
"_originalSource": "angular-mocks"
2020
}

‎public/vendor/angular-mocks/LICENSE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2016 Angular
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎public/vendor/angular-mocks/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ You can `require` ngMock modules:
2020
var angular = require('angular');
2121
angular.module('myMod', [
2222
require('angular-animate'),
23-
require('angular-mocks/ngMock')
23+
require('angular-mocks/ngMock'),
2424
require('angular-mocks/ngAnimateMock')
2525
]);
2626
```

0 commit comments

Comments
 (0)