8000 Change _.contains to _.includes for compatability with lodash 4 #1314 · sumit-jaiswal/restangular@1fb8923 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1fb8923

Browse files
author
billjohnston
committed
Change _.contains to _.includes for compatability with lodash 4 mgonto#1314 
1 parent aad3a84 commit 1fb8923

File tree

6 files changed

+28
-27
lines changed

6 files changed

+28
-27
lines changed

‎bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "restangular",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"main": "./dist/restangular.js",
55
"description": "Restful Resources service for AngularJS apps",
66
"repository": {
@@ -16,4 +16,4 @@
1616
"components",
1717
"lib"
1818
]
19-
}
19+
}

‎dist/restangular.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Restful Resources service for AngularJS apps
3-
* @version v1.4.0 - 2015-04-03 * @link https://github.com/mgonto/restangular
3+
* @version v1.5.1 - 2016-02-08 * @link https://github.com/mgonto/restangular
44
* @author Martin Gontovnikas <martin@gon.to>
55
* @license MIT License, http://www.opensource.org/licenses/MIT
66
*/(function() {
@@ -18,7 +18,7 @@ restangular.provider('Restangular', function() {
1818
*/
1919
var safeMethods= ['get', 'head', 'options', 'trace', 'getlist'];
2020
config.isSafe = function(operation) {
21-
return _.contains(safeMethods, operation.toLowerCase());
21+
return _.includes(safeMethods, operation.toLowerCase());
2222
};
2323

2424
var absolutePattern = /^https?:\/\//i;
@@ -395,7 +395,7 @@ restangular.provider('Restangular', function() {
395395
object.setParentless = function(values) {
396396
if (_.isArray(values)) {
397397
config.shouldSaveParent = function(route) {
398-
return !_.contains(values, route);
398+
return !_.includes(values, route);
399399
};
400400
} else if (_.isBoolean(values)) {
401401
config.shouldSaveParent = function() {
@@ -1165,9 +1165,9 @@ restangular.provider('Restangular', function() {
11651165
var fullParams = response.config.params;
11661166
var elem = parseResponse(resData, operation, route, fetchUrl, response, deferred);
11671167
if (elem) {
1168-
1168+
var data;
11691169
if (operation === 'post' && !__this[config.restangularFields.restangularCollection]) {
1170-
var data = restangularizeElem(
1170+
data = restangularizeElem(
11711171
__this[config.restangularFields.parentResource],
11721172
elem,
11731173
route,
@@ -1177,7 +1177,7 @@ restangular.provider('Restangular', function() {
11771177
);
11781178
resolvePromise(deferred, response, data, filledObject);
11791179
} else {
1180-
var data = restangularizeElem(
1180+
data = restangularizeElem(
11811181
__this[config.restangularFields.parentResource],
11821182
elem,
11831183
__this[config.restangularFields.route],
@@ -1312,7 +1312,7 @@ restangular.provider('Restangular', function() {
13121312
serv.getList = _.bind(collection.getList, collection);
13131313

13141314
for (var prop in collection) {
1315-
if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.contains(knownCollectionMethods, prop)) {
1315+
if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.includes(knownCollectionMethods, prop)) {
13161316
serv[prop] = _.bind(collection[prop], collection);
13171317
}
13181318
}

‎dist/restangular.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/restangular.zip

-70 Bytes
Binary file not shown.

‎package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "restangular",
33
"description": "Restful Resources service for AngularJS apps",
4-
"version": "1.5.1",
4+
"version": "1.5.2",
55
"filename": "restangular.min.js",
66
"main": "./dist/restangular.min.js",
77
"homepage": "https://github.com/mgonto/restangular",
@@ -32,24 +32,25 @@
3232
"lodash": ">=1.3.0"
3333
},
3434
"devDependencies": {
35+
"grunt": "^0.4.5",
36+
"grunt-bower": "*",
37+
"grunt-bower-task": "*",
3538
"grunt-cli": ">= 0.1.7",
3639
"grunt-contrib-concat": "*",
3740
"grunt-contrib-jshint": "*",
3841
"grunt-contrib-uglify": "*",
39-
"grunt-bower": "*",
40-
"grunt-bower-task": "*",
41-
"grunt-karma": "latest",
4242
"grunt-conventional-changelog": "0.0.12",
43+
"grunt-karma": "latest",
4344
"grunt-zip": "*",
44-
"karma": "~0.12.1",
45-
"karma-mocha-reporter": "0.2.8",
46-
"karma-jasmine": "~0.1.5",
45+
"karma": "^0.13.19",
4746
"karma-chrome-launcher": "~0.1.2",
48-
"karma-phantomjs-launcher": "~0.1.2",
49-
"karma-firefox-launcher": "~0.1.3"
47+
"karma-firefox-launcher": "~0.1.3",
48+
"karma-jasmine": "~0.1.5",
49+
"karma-mocha-reporter": "0.2.8",
50+
"karma-phantomjs-launcher": "~0.1.2"
5051
},
5152
"scripts": {
5253
"test": "grunt test --verbose"
5354
},
5455
"license": "MIT"
55-
}
56+
}

‎src/restangular.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ restangular.provider('Restangular', function() {
1313
*/
1414
var safeMethods= ['get', 'head', 'options', 'trace', 'getlist'];
1515
config.isSafe = function(operation) {
16-
return _.contains(safeMethods, operation.toLowerCase());
16+
return _.includes(safeMethods, operation.toLowerCase());
1717
};
1818

1919
var absolutePattern = /^https?:\/\//i;
@@ -390,7 +390,7 @@ restangular.provider('Restangular', function() {
390390
object.setParentless = function(values) {
391391
if (_.isArray(values)) {
392392
config.shouldSaveParent = function(route) {
393-
return !_.contains(values, route);
393+
return !_.includes(values, route);
394394
};
395395
} else if (_.isBoolean(values)) {
396396
config.shouldSaveParent = function() {
@@ -1160,9 +1160,9 @@ restangular.provider('Restangular', function() {
11601160
var fullParams = response.config.params;
11611161
var elem = parseResponse(resData, operation, route, fetchUrl, response, deferred);
11621162
if (elem) {
1163-
1163+
var data;
11641164
if (operation === 'post' && !__this[config.restangularFields.restangularCollecti C8B4 on]) {
1165-
var data = restangularizeElem(
1165+
data = restangularizeElem(
11661166
__this[config.restangularFields.parentResource],
11671167
elem,
11681168
route,
@@ -1172,7 +1172,7 @@ restangular.provider('Restangular', function() {
11721172
);
11731173
resolvePromise(deferred, response, data, filledObject);
11741174
} else {
1175-
var data = restangularizeElem(
1175+
data = restangularizeElem(
11761176
__this[config.restangularFields.parentResource],
11771177
elem,
11781178
__this[config.restangularFields.route],
@@ -1307,7 +1307,7 @@ restangular.provider('Restangular', function() {
13071307
serv.getList = _.bind(collection.getList, collection);
13081308

13091309
for (var prop in collection) {
1310-
if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.contains(knownCollectionMethods, prop)) {
1310+
if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.includes(knownCollectionMethods, prop)) {
13111311
serv[prop] = _.bind(collection[prop], collection);
13121312
}
13131313
}

0 commit comments

Comments
 (0)
0