angular-wakanda
Advanced tools
Comparing version 1.0.3 to 1.0.4
{ | ||
"name": "angular-wakanda", | ||
"version": "1.0.3", | ||
"version": "1.0.4", | ||
"keywords": [ | ||
@@ -19,4 +19,4 @@ "angular", | ||
"dependencies": { | ||
"angular": "1.2.6" | ||
"angular": "^1.2.6" | ||
} | ||
} |
{ | ||
"name": "angular-wakanda", | ||
"version": "1.0.3", | ||
"version": "1.0.4", | ||
"description": "Connector between Wakanda Server and Angular Framework", | ||
@@ -5,0 +5,0 @@ "main": "angular-wakanda.js", |
angular-wakanda.js - release notes | ||
=================================================== | ||
##V1.0.4 | ||
* Fix a bug when calling `$create` without argument | ||
* Collection user defined methods are now available on every collections (queried, fetched and expanded) | ||
* Correct `angular` dependency on `bower.json` to avoid conflict on angular version | ||
* Update dataProvider to latest version | ||
* Wakanda Solution: correct authentication issue when stopping/reloading server | ||
* Example application, page `test8` correct invalid calls to `$transform` methods | ||
##V1.0.3 | ||
@@ -5,0 +13,0 @@ * $serverRefresh is now deprecated, a warning is displayed on console at each call |
@@ -396,6 +396,13 @@ var wakanda = angular.module('wakanda', []); | ||
else{ | ||
if(!this.$_collection) { | ||
var applyTo = this[mode]; | ||
if (this instanceof WAF.EntityCollection) { | ||
applyTo = this; | ||
this._callWithEm = true; | ||
} | ||
if(!this.$_collection && !(this instanceof WAF.EntityCollection)) { | ||
throw new Error("Couldn't call user defined method on collection because no pointer on this collection"); | ||
} | ||
method.apply(this[mode], thatArguments);//@todo maybe not on this[mode] ?... | ||
method.apply(applyTo, thatArguments); | ||
} | ||
@@ -447,5 +454,11 @@ return deferred.promise; | ||
} | ||
else if(root === false) { | ||
else if(root === false && result.$_collection.relEntityCollection !== null) { | ||
if(typeof result.$_collection !== 'undefined' && result.$_collection.relEntityCollection !== 'undefined') { | ||
dataClass = result.$_collection.relEntityCollection; | ||
dataClass._private.entityCollectionMethods = {}; | ||
for (var m in dataClass._private.methods) { | ||
if (dataClass._private.methods.hasOwnProperty(m)) { | ||
dataClass._private.entityCollectionMethods[m] = dataClass[m]; | ||
} | ||
} | ||
} | ||
@@ -461,3 +474,8 @@ } | ||
if(userDefinedEntityCollectionMethods.hasOwnProperty(methodName)) { | ||
result[methodName] = userDefinedEntityCollectionMethods[methodName]; | ||
if (root === true) { | ||
result[methodName] = userDefinedEntityCollectionMethods[methodName]; | ||
} | ||
else { | ||
result[methodName] = userDefinedEntityCollectionMethods[methodName].bind(result.$_collection.relEntityCollection); | ||
} | ||
} | ||
@@ -515,2 +533,3 @@ } | ||
var relatedAttributes = {}; | ||
pojo = pojo || {}; | ||
@@ -940,3 +959,8 @@ for (i = 0; i < this.$_relatedAttributes.length; i++) { | ||
transform.addFrameworkMethodsToNestedCollection(result); | ||
transform.addUserDefinedMethodsToCollection(result, false); | ||
if (this.$_entity[attr.name].relEntityCollection && this.$_entity[attr.name].value.__ENTITYSET) { | ||
this.$_entity[attr.name].relEntityCollection._private.dataURI = this.$_entity[attr.name].value.__ENTITYSET; | ||
} | ||
if(this.$_entity[attr.name].value.__ENTITIES) { | ||
@@ -1415,2 +1439,5 @@ result.$fetch(); | ||
that.$fetching = false; | ||
transform.addUserDefinedMethodsToCollection(that, false); | ||
deferred.resolve(that); | ||
@@ -1417,0 +1444,0 @@ }); |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
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
549372
10032