Skip to content

Add fix to Collection filter method. Build for dist #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keshavos wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add fix to Collection filter method. Build for dist #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de67177
Add fix for collection filter method. Build for dist
Sep 16, 2015
a1b7dbc
Fix for Singleton create and change methods not sending correct data
Sep 22, 2015
6c969ce
Update to 2.2.1
Feb 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions angular-m.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,7 +2013,7 @@ function CollectionFactory(Base, Singleton) {
self.length = self.$$data.length;
self.$$modeled = null;
} else if (m_isObject(_filter) === true) {
if (keys(_filter).length > 0) {
if (objectKeys(_filter).length > 0) {
self.$$filter = _filter;
self.$$origData = self.$$origData || m_copy(self.$$data);
filter(self.get(), function (val) {
Expand Down Expand Up @@ -2207,7 +2207,19 @@ function CollectionFactory(Base, Singleton) {
ret.$allSelected = self.$allSelected;
ret.$noneSelected = self.$noneSelected;
return ret;
},
},
resolve: function() {
var self = this;
self.$loaded = true;
delete self.$busy;
return self._super.apply(self, arguments);
},
reject: function() {
var self = this;
self.$loaded = true;
delete self.$busy;
return self._super.apply(self, arguments);
},

/**
Re-runs the last `read` call or, if never called, calls `read`.
Expand Down Expand Up @@ -2338,7 +2350,7 @@ function CollectionFactory(Base, Singleton) {
},
}
);

/**
* Return the constructor function
*/
Expand Down
2 changes: 1 addition & 1 deletion angular-m.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions doc/Base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ <h1 class="page-title">Class: Base</h1>

<header>

<h2>
Base
</h2>
<h2>Base</h2>


</header>
Expand Down Expand Up @@ -3689,7 +3687,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
36 changes: 17 additions & 19 deletions doc/Collection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ <h1 class="page-title">Class: Collection</h1>

<header>

<h2>
Collection
</h2>
<h2>Collection</h2>


</header>
Expand Down Expand Up @@ -477,7 +475,7 @@ <h4 class="name" id="readService"><span class="type-signature">(abstract) </span

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line508">line 508</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line520">line 520</a>
</li></ul></dd>


Expand Down Expand Up @@ -539,7 +537,7 @@ <h4 class="name" id="updateService"><span class="type-signature">(abstract) </sp

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line558">line 558</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line570">line 570</a>
</li></ul></dd>


Expand Down Expand Up @@ -2561,7 +2559,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line514">line 514</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line526">line 526</a>
</li></ul></dd>


Expand Down Expand Up @@ -2665,7 +2663,7 @@ <h4 class="name" id="refresh"><span class="type-signature"></span>refresh<span c

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line482">line 482</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line494">line 494</a>
</li></ul></dd>


Expand Down Expand Up @@ -2843,8 +2841,10 @@ <h5>Parameters:</h5>



<dt class="inherited-from">Inherited From:</dt>
<dd class="inherited-from"><ul class="dummy"><li>


<dt class="tag-overrides">Overrides:</dt>
<dd class="tag-overrides"><ul class="dummy"><li>
<a href="Base.html#reject">Base#reject</a>
</li></ul></dd>

Expand All @@ -2865,8 +2865,6 @@ <h5>Parameters:</h5>






<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
Expand Down Expand Up @@ -3055,8 +3053,10 @@ <h5>Parameters:</h5>



<dt class="inherited-from">Inherited From:</dt>
<dd class="inherited-from"><ul class="dummy"><li>


<dt class="tag-overrides">Overrides:</dt>
<dd class="tag-overrides"><ul class="dummy"><li>
<a href="Base.html#resolve">Base#resolve</a>
</li></ul></dd>

Expand All @@ -3077,8 +3077,6 @@ <h5>Parameters:</h5>






<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
Expand Down Expand Up @@ -4083,7 +4081,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line564">line 564</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line576">line 576</a>
</li></ul></dd>


Expand Down Expand Up @@ -4389,7 +4387,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line495">line 495</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line507">line 507</a>
</li></ul></dd>


Expand Down Expand Up @@ -4667,7 +4665,7 @@ <h5>Parameters:</h5>

<dt class="tag-source">Source:</dt>
<dd class="tag-source"><ul class="dummy"><li>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line490">line 490</a>
<a href="collection.js.html">collection.js</a>, <a href="collection.js.html#line502">line 502</a>
</li></ul></dd>


Expand Down Expand Up @@ -5291,7 +5289,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
6 changes: 2 additions & 4 deletions doc/Singleton.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ <h1 class="page-title">Class: Singleton</h1>

<header>

<h2>
Singleton
</h2>
<h2>Singleton</h2>


</header>
Expand Down Expand Up @@ -5874,7 +5872,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion doc/base.js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
20 changes: 16 additions & 4 deletions doc/collection.js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ <h1 class="page-title">Source: collection.js</h1>
self.length = self.$$data.length;
self.$$modeled = null;
} else if (m_isObject(_filter) === true) {
if (keys(_filter).length > 0) {
if (objectKeys(_filter).length > 0) {
self.$$filter = _filter;
self.$$origData = self.$$origData || m_copy(self.$$data);
filter(self.get(), function (val) {
Expand Down Expand Up @@ -501,7 +501,19 @@ <h1 class="page-title">Source: collection.js</h1>
ret.$allSelected = self.$allSelected;
ret.$noneSelected = self.$noneSelected;
return ret;
},
},
resolve: function() {
var self = this;
self.$loaded = true;
delete self.$busy;
return self._super.apply(self, arguments);
},
reject: function() {
var self = this;
self.$loaded = true;
delete self.$busy;
return self._super.apply(self, arguments);
},

/**
Re-runs the last `read` call or, if never called, calls `read`.
Expand Down Expand Up @@ -632,7 +644,7 @@ <h1 class="page-title">Source: collection.js</h1>
},
}
);

/**
* Return the constructor function
*/
Expand All @@ -657,7 +669,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
6 changes: 2 additions & 4 deletions doc/global.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ <h1 class="page-title">Global</h1>

<header>

<h2>

</h2>
<h2></h2>


</header>
Expand Down Expand Up @@ -594,7 +592,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion doc/singleton.js.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Base.html
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.2</a> on Tue Jan 26 2016 12:59:51 GMT-0800 (PST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Feb 04 2016 21:31:02 GMT+0000 (GMT)
</footer>

<script> prettyPrint(); </script>
Expand Down
18 changes: 15 additions & 3 deletions src/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ function CollectionFactory(Base, Singleton) {
self.length = self.$$data.length;
self.$$modeled = null;
} else if (m_isObject(_filter) === true) {
if (keys(_filter).length > 0) {
if (objectKeys(_filter).length > 0) {
self.$$filter = _filter;
self.$$origData = self.$$origData || m_copy(self.$$data);
filter(self.get(), function (val) {
Expand Down Expand Up @@ -473,7 +473,19 @@ function CollectionFactory(Base, Singleton) {
ret.$allSelected = self.$allSelected;
ret.$noneSelected = self.$noneSelected;
return ret;
},
},
resolve: function() {
var self = this;
self.$loaded = true;
delete self.$busy;
return self._super.apply(self, arguments);
},
reject: function() {
var self = this;
self.$loaded = true;
delete self.$busy;
return self._super.apply(self, arguments);
},

/**
Re-runs the last `read` call or, if never called, calls `read`.
Expand Down Expand Up @@ -604,7 +616,7 @@ function CollectionFactory(Base, Singleton) {
},
}
);

/**
* Return the constructor function
*/
Expand Down