Skip to content

2.0.0 #198

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

Merged
merged 6 commits into from
Feb 4, 2015
Merged

2.0.0 #198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72bdf4f
Merge pull request #274 from kentcdodds/v2
jmdobry Dec 11, 2014
2be0a11
Fixes #278.
jmdobry Jan 2, 2015
8875d98
Fixes #278.
jmdobry Jan 2, 2015
f989749
Fixed possible performance issue
jmdobry Jan 8, 2015
9983639
Now in beta.
jmdobry Jan 10, 2015
53b2dee
Build.
jmdobry Feb 4, 2015
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
Prev Previous commit
Next Next commit
Fixes #278.
  • Loading branch information
@jmdobry
jmdobry committed Jan 2, 2015
commit 2be0a1126054bb447cdba12b3901c43af0ea9f68
1 change: 0 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"author": "Jason Dobry",
"name": "js-data-angular",
"description": "Angular wrapper for js-data (originally angular-data).",
"version": "2.0.0-alpha.3-3",
"homepage": "http://www.js-data.io/docs/js-data-angular",
"repository": {
"type": "git",
Expand Down
21 changes: 13 additions & 8 deletions dist/js-data-angular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @author Jason Dobry <[email protected]>
* @file js-data-angular.js
* @version 2.0.0-alpha.3-3 - Homepage <http://www.js-data.io/js-data-angular/>
* @version 2.0.0-alpha.3-4 - Homepage <http://www.js-data.io/js-data-angular/>
* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>
* @license MIT <https://github.com/js-data/js-data-angular/blob/master/LICENSE>
*
Expand Down Expand Up @@ -216,16 +216,21 @@
DSUtils.Promise = QPromise;

// Register any adapters that have been loaded
for (var i = 0; i < adapters.length; i++) {
if (adapters[i].loaded) {
store.registerAdapter(adapters[i].name, arguments[i]);
if (args.length) {
for (var i = 0; i < args.length; i++) {
for (var j = 0; j < adapters.length; j++) {
if (adapters[i].loaded && !adapters[i].registered) {
adapters[i].registered = true;
store.registerAdapter(adapters[i].name, arguments[i]);
}
}
}
}

// Wrap certain sync functions with $apply
for (i = 0; i < functionsToWrap.length; i++) {
originals[functionsToWrap[i]] = store[functionsToWrap[i]];
store[functionsToWrap[i]] = (function (name) {
for (var k = 0; k < functionsToWrap.length; k++) {
originals[functionsToWrap[k]] = store[functionsToWrap[k]];
store[functionsToWrap[k]] = (function (name) {
return function () {
var args = arguments;
if (!$rootScope.$$phase) {
Expand All @@ -235,7 +240,7 @@
}
return originals[name].apply(store, args);
};
})(functionsToWrap[i]);
})(functionsToWrap[k]);
}

// Hook into the digest loop (throttled)
Expand Down
4 changes: 2 additions & 2 deletions dist/js-data-angular.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "js-data-angular",
"description": "Angular wrapper for js-data.",
"version": "2.0.0-alpha.3-3",
"version": "2.0.0-alpha.3-4",
"homepage": "http://www.js-data.io/docs/js-data-angular",
"repository": {
"type": "git",
Expand All @@ -23,20 +23,20 @@
"grunt-browserify": "3.2.1",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-jshint": "0.10.0",
"grunt-contrib-uglify": "0.6.0",
"grunt-contrib-uglify": "0.7.0",
"grunt-contrib-watch": "0.6.1",
"grunt-karma": "0.9.0",
"grunt-karma-coveralls": "2.5.3",
"karma": "0.12.28",
"karma": "0.12.30",
"karma-chai": "0.1.0",
"karma-chrome-launcher": "0.1.7",
"karma-coverage": "0.2.7",
"karma-script-launcher": "0.1.0",
"karma-firefox-launcher": "0.1.3",
"karma-firefox-launcher": "0.1.4",
"karma-phantomjs-launcher": "0.1.4",
"karma-mocha": "0.1.10",
"karma-sinon": "1.0.4",
"karma-spec-reporter": "0.0.13",
"karma-spec-reporter": "0.0.16",
"time-grunt": "1.0.0",
"jit-grunt": "0.9.0"
},
Expand Down
19 changes: 12 additions & 7 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,21 @@
DSUtils.Promise = QPromise;

// Register any adapters that have been loaded
for (var i = 0; i < adapters.length; i++) {
if (adapters[i].loaded) {
store.registerAdapter(adapters[i].name, arguments[i]);
if (args.length) {
for (var i = 0; i < args.length; i++) {
for (var j = 0; j < adapters.length; j++) {
if (adapters[i].loaded && !adapters[i].registered) {
adapters[i].registered = true;
store.registerAdapter(adapters[i].name, arguments[i]);
}
}
}
}

// Wrap certain sync functions with $apply
for (i = 0; i < functionsToWrap.length; i++) {
originals[functionsToWrap[i]] = store[functionsToWrap[i]];
store[functionsToWrap[i]] = (function (name) {
for (var k = 0; k < functionsToWrap.length; k++) {
originals[functionsToWrap[k]] = store[functionsToWrap[k]];
store[functionsToWrap[k]] = (function (name) {
return function () {
var args = arguments;
if (!$rootScope.$$phase) {
Expand All @@ -225,7 +230,7 @@
}
return originals[name].apply(store, args);
};
})(functionsToWrap[i]);
})(functionsToWrap[k]);
}

// Hook into the digest loop (throttled)
Expand Down