Skip to content
This repository was archived by the owner on Jan 15, 2022. It is now read-only.

Commit f822715

Browse files
committed
add missing parameter that make the plugin crash with angular since 1.3.6 - fix #2
1 parent cc687d5 commit f822715

7 files changed

+16
-13
lines changed

demo/app/test-angular-1.2.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ul>
3535

3636
<!-- Add your site or application content here -->
37-
<div class="container" ng-view=""></div>
37+
<div class="container" ng-view></div>
3838

3939
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular.min.js"></script>
4040
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.26/angular-route.min.js"></script>

demo/app/test-angular-1.3.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
</ul>
3434

3535
<!-- Add your site or application content here -->
36-
<div class="container" ng-view=""></div>
36+
<div class="container" ng-view></div>
3737

38-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.1/angular.min.js"></script>
39-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.1/angular-route.min.js"></script>
38+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.7/angular.min.js"></script>
39+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.7/angular-route.min.js"></script>
4040
<script src="angular-combine/dist/angular-combine.js"></script>
4141

4242
<!-- build:js({.tmp,app}) scripts/scripts.js -->

dist/angular-combine-without-console.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-combine - v0.1.3 - 2014-11-05 */
1+
/*! angular-combine - v0.1.3 - 2014-12-19 */
22
'use strict';
33

44
angular.module('angularCombine', []);
@@ -41,7 +41,8 @@ angular.module('angularCombine').config(["$provide", function ($provide) {
4141
return combinedTplPromise.then(function (response) {
4242
return {
4343
status : response.status,
44-
data : origGetMethod(url)
44+
data : origGetMethod(url),
45+
headers: response.headers
4546
};
4647
});
4748
};

dist/angular-combine-without-console.min.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.

dist/angular-combine.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-combine - v0.1.3 - 2014-11-05 */
1+
/*! angular-combine - v0.1.3 - 2014-12-19 */
22
'use strict';
33

44
angular.module('angularCombine', []);
@@ -41,7 +41,8 @@ angular.module('angularCombine').config(["$provide", function ($provide) {
4141
return combinedTplPromise.then(function (response) {
4242
return {
4343
status : response.status,
44-
data : origGetMethod(url)
44+
data : origGetMethod(url),
45+
headers: response.headers
4546
};
4647
});
4748
};

dist/angular-combine.min.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.

src/angular-combine-decorator.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ angular.module('angularCombine').config(function ($provide) {
1919
return combinedTplPromise.then(function (response) {
2020
return {
2121
status : response.status,
22-
data : origGetMethod(url)
22+
data : origGetMethod(url),
23+
headers: response.headers
2324
};
2425
});
2526
};

0 commit comments

Comments
 (0)