Skip to content

Commit 8143965

Browse files
committed
Fixes #204.
Stable Version 1.0.1.
1 parent 7ae1170 commit 8143965

File tree

9 files changed

+19
-14
lines changed

9 files changed

+19
-14
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 1.0.1 - 10 October 2014
2+
3+
###### Backwards compatible bug fixes
4+
- #204 - pending query isn't deleted properly in DS.find
5+
16
##### 1.0.0 - 04 October 2014
27

38
Stable Version 1.0.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Unlike Backbone and Ember Models, angular-data does not require the use of gette
88

99
Supporting relations, computed properties, model lifecycle control and a slew of other features, angular-data is the tool for giving your data the respect it deserves.
1010

11-
__Latest Release:__ [1.0.0](https://github.com/jmdobry/angular-data/releases/tag/1.0.0)
11+
__Latest Release:__ [1.0.1](https://github.com/jmdobry/angular-data/releases/tag/1.0.1)
1212

13-
Angular-data is finally 1.0.0!
13+
Angular-data is finally 1.0.!
1414

1515
Angular-data 1.x will continue to see bug fixes, but all new development will be on [js-data](https://github.com/js-data/js-data) and [js-data-angular](https://github.com/jmdobry/angular-data/pull/198) (Angular-data 2.0).
1616

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Jason Dobry",
33
"name": "angular-data",
44
"description": "Data store for Angular.js.",
5-
"version": "1.0.0",
5+
"version": "1.0.1",
66
"homepage": "http://angular-data.pseudobry.com/",
77
"repository": {
88
"type": "git",

dist/angular-data.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @author Jason Dobry <[email protected]>
33
* @file angular-data.js
4-
* @version 1.0.0 - Homepage <http://angular-data.pseudobry.com/>
4+
* @version 1.0.1 - Homepage <http://angular-data.pseudobry.com/>
55
* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>
66
* @license MIT <https://github.com/jmdobry/angular-data/blob/master/LICENSE>
77
*
@@ -3096,9 +3096,9 @@ function find(resourceName, id, options) {
30963096
promise = resource.pendingQueries[id] = DS.adapters[options.adapter || definition.defaultAdapter].find(definition, id, options)
30973097
.then(function (res) {
30983098
var data = options.deserialize ? options.deserialize(resourceName, res) : definition.deserialize(resourceName, res);
3099+
// Query is no longer pending
3100+
delete resource.pendingQueries[id];
30993101
if (options.cacheResponse) {
3100-
// Query is no longer pending
3101-
delete resource.pendingQueries[id];
31023102
resource.completedQueries[id] = new Date().getTime();
31033103
return DS.inject(resourceName, data, options);
31043104
} else {
@@ -7412,7 +7412,7 @@ module.exports = [function () {
74127412
* @id angular-data
74137413
* @name angular-data
74147414
* @description
7415-
* __Version:__ 1.0.0
7415+
* __Version:__ 1.0.1
74167416
*
74177417
* ## Install
74187418
*

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

guide/nav.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<i class="icon-wrench icon-white"></i> API <b class="caret"></b>
8383
</a>
8484
<ul class="dropdown-menu">
85-
<li class="nav-header">Angular-data - 1.0.0</li>
85+
<li class="nav-header">Angular-data - 1.0.1</li>
8686
<li>
8787
<a href="/documentation/api/angular-data/angular-data">Overview</a>
8888
</li>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-data",
33
"description": "Data store for Angular.js.",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"homepage": "http://angular-data.pseudobry.com",
66
"repository": {
77
"type": "git",

src/datastore/async_methods/find.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ function find(resourceName, id, options) {
7979
promise = resource.pendingQueries[id] = DS.adapters[options.adapter || definition.defaultAdapter].find(definition, id, options)
8080
.then(function (res) {
8181
var data = options.deserialize ? options.deserialize(resourceName, res) : definition.deserialize(resourceName, res);
82+
// Query is no longer pending
83+
delete resource.pendingQueries[id];
8284
if (options.cacheResponse) {
83-
// Query is no longer pending
84-
delete resource.pendingQueries[id];
8585
resource.completedQueries[id] = new Date().getTime();
8686
return DS.inject(resourceName, data, options);
8787
} else {

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @id angular-data
77
* @name angular-data
88
* @description
9-
* __Version:__ 1.0.0
9+
* __Version:__ 1.0.1
1010
*
1111
* ## Install
1212
*

0 commit comments

Comments
 (0)