ampersand-state
Advanced tools
Comparing version 4.5.1 to 4.5.2
/*$AMPERSAND_VERSION*/ | ||
var uniqueId = require("lodash.uniqueid"); | ||
var assign = require("lodash.assign"); | ||
var omit = require("lodash.omit"); | ||
var contains = require("lodash.contains"); | ||
var escape = require("lodash.escape"); | ||
var forEach = require("lodash.foreach"); | ||
var isString = require("lodash.isstring"); | ||
var isObject = require("lodash.isobject"); | ||
var isArray = require("lodash.isarray"); | ||
var isDate = require("lodash.isdate"); | ||
var isUndefined = require("lodash.isundefined"); | ||
var isFunction = require("lodash.isfunction"); | ||
var isNull = require("lodash.isnull"); | ||
var isEmpty = require("lodash.isempty"); | ||
var isEqual = require("lodash.isequal"); | ||
var clone = require("lodash.clone"); | ||
var has = require("lodash.has"); | ||
var result = require("lodash.result"); | ||
var keys = require("lodash.keys"); | ||
var bind = require("lodash.bind"); | ||
var defaults = require("lodash.defaults"); | ||
var union = require("lodash.union"); | ||
var BBEvents = require('backbone-events-standalone'); | ||
var uniqueId = require('lodash.uniqueid'); | ||
var assign = require('lodash.assign'); | ||
var omit = require('lodash.omit'); | ||
var escape = require('lodash.escape'); | ||
var forEach = require('lodash.foreach'); | ||
var includes = require('lodash.includes'); | ||
var isString = require('lodash.isstring'); | ||
var isObject = require('lodash.isobject'); | ||
var isArray = require('lodash.isarray'); | ||
var isDate = require('lodash.isdate'); | ||
var isUndefined = require('lodash.isundefined'); | ||
var isFunction = require('lodash.isfunction'); | ||
var isNull = require('lodash.isnull'); | ||
var isEmpty = require('lodash.isempty'); | ||
var isEqual = require('lodash.isequal'); | ||
var clone = require('lodash.clone'); | ||
var has = require('lodash.has'); | ||
var result = require('lodash.result'); | ||
var keys = require('lodash.keys'); | ||
var bind = require('lodash.bind'); | ||
var defaults = require('lodash.defaults'); | ||
var union = require('lodash.union'); | ||
var Events = require('ampersand-events'); | ||
var KeyTree = require('key-tree-store'); | ||
@@ -50,3 +50,3 @@ var arrayNext = require('array-next'); | ||
assign(Base.prototype, BBEvents, { | ||
assign(Base.prototype, Events, { | ||
// can be allow, ignore, reject | ||
@@ -102,2 +102,3 @@ extraProperties: 'ignore', | ||
parse: function (resp, options) { | ||
//jshint unused:false | ||
return resp; | ||
@@ -125,3 +126,2 @@ }, | ||
var extraProperties = this.extraProperties; | ||
var triggers = []; | ||
var changing, changes, newType, newVal, def, cast, err, attr, | ||
@@ -213,3 +213,3 @@ attrs, dataType, silent, unset, currentVal, initial, hasChanged, isEqual; | ||
} | ||
if (def.values && !contains(def.values, newVal)) { | ||
if (def.values && !includes(def.values, newVal)) { | ||
throw new TypeError('Property \'' + attr + '\' must be one of values: ' + def.values.join(', ') + '. Tried to set ' + newVal); | ||
@@ -329,3 +329,2 @@ } | ||
var def = this._definition[key]; | ||
var type = def.type; | ||
var val; | ||
@@ -385,3 +384,3 @@ if (def.required) { | ||
_ensureValidType: function (type) { | ||
return contains(['string', 'number', 'boolean', 'array', 'object', 'date', 'any'].concat(keys(this._dataTypes)), type) ? type : undefined; | ||
return includes(['string', 'number', 'boolean', 'array', 'object', 'date', 'any'].concat(keys(this._dataTypes)), type) ? type : undefined; | ||
}, | ||
@@ -726,3 +725,2 @@ | ||
var args = [].slice.call(arguments); | ||
var prop, item; | ||
@@ -759,6 +757,6 @@ // The constructor function for the new subclass is either defined by you | ||
if (protoProps) { | ||
var omitFromExtend = [ | ||
'dataTypes', 'props', 'session', 'derived', 'collections', 'children' | ||
]; | ||
args.forEach(function processArg(def) { | ||
var omitFromExtend = [ | ||
'dataTypes', 'props', 'session', 'derived', 'collections', 'children' | ||
]; | ||
if (def.dataTypes) { | ||
@@ -798,4 +796,2 @@ forEach(def.dataTypes, function (def, name) { | ||
var toString = Object.prototype.toString; | ||
// Set a convenience property in case the parent's prototype is needed | ||
@@ -802,0 +798,0 @@ // later. |
{ | ||
"name": "ampersand-state", | ||
"description": "An observable, extensible state object with derived watchable properties.", | ||
"version": "4.5.1", | ||
"version": "4.5.2", | ||
"author": "Henrik Joreteg <henrik@andyet.net>", | ||
@@ -18,5 +18,5 @@ "files": [ | ||
"dependencies": { | ||
"ampersand-events": "^1.1.1", | ||
"ampersand-version": "^1.0.0", | ||
"array-next": "~0.0.1", | ||
"backbone-events-standalone": "0.2.2", | ||
"key-tree-store": "^1.2.0", | ||
@@ -26,3 +26,2 @@ "lodash.assign": "^3.0.0", | ||
"lodash.clone": "^3.0.1", | ||
"lodash.contains": "^2.4.1", | ||
"lodash.defaults": "^3.1.0", | ||
@@ -32,2 +31,3 @@ "lodash.escape": "^3.0.0", | ||
"lodash.has": "^3.0.0", | ||
"lodash.includes": "^3.1.0", | ||
"lodash.isarray": "^3.0.1", | ||
@@ -34,0 +34,0 @@ "lodash.isdate": "^3.0.1", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
55534
707
+ Addedampersand-events@^1.1.1
+ Addedlodash.includes@^3.1.0
+ Addedampersand-events@1.1.1(transitive)
+ Addedlodash._basevalues@3.0.0(transitive)
+ Addedlodash.before@3.0.3(transitive)
+ Addedlodash.includes@3.1.3(transitive)
+ Addedlodash.once@3.0.1(transitive)
- Removedbackbone-events-standalone@0.2.2
- Removedlodash.contains@^2.4.1
- Removedbackbone-events-standalone@0.2.2(transitive)
- Removedlodash._basebind@2.4.1(transitive)
- Removedlodash._basecreate@2.4.1(transitive)
- Removedlodash._basecreatecallback@2.4.1(transitive)
- Removedlodash._basecreatewrapper@2.4.1(transitive)
- Removedlodash._baseindexof@2.4.1(transitive)
- Removedlodash._createwrapper@2.4.1(transitive)
- Removedlodash._isnative@2.4.1(transitive)
- Removedlodash._objecttypes@2.4.1(transitive)
- Removedlodash._setbinddata@2.4.1(transitive)
- Removedlodash._shimkeys@2.4.1(transitive)
- Removedlodash._slice@2.4.1(transitive)
- Removedlodash.bind@2.4.1(transitive)
- Removedlodash.contains@2.4.3(transitive)
- Removedlodash.forown@2.4.1(transitive)
- Removedlodash.identity@2.4.1(transitive)
- Removedlodash.isarray@2.4.1(transitive)
- Removedlodash.isfunction@2.4.1(transitive)
- Removedlodash.isobject@2.4.1(transitive)
- Removedlodash.isstring@2.4.1(transitive)
- Removedlodash.keys@2.4.1(transitive)
- Removedlodash.noop@2.4.1(transitive)
- Removedlodash.support@2.4.1(transitive)