|
1 | 1 | /** |
2 | 2 | * @author Jason Dobry <jason.dobry@gmail.com> |
3 | 3 | * @file js-data-angular.js |
4 | | -* @version 2.0.0-alpha.3-3 - Homepage <http://www.js-data.io/js-data-angular/> |
| 4 | +* @version 2.0.0-alpha.3-4 - Homepage <http://www.js-data.io/js-data-angular/> |
5 | 5 | * @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/> |
6 | 6 | * @license MIT <https://github.com/js-data/js-data-angular/blob/master/LICENSE> |
7 | 7 | * |
|
216 | 216 | DSUtils.Promise = QPromise; |
217 | 217 |
|
218 | 218 | // Register any adapters that have been loaded |
219 | | - for (var i = 0; i < adapters.length; i++) { |
220 | | - if (adapters[i].loaded) { |
221 | | - store.registerAdapter(adapters[i].name, arguments[i]); |
| 219 | + if (args.length) { |
| 220 | + for (var i = 0; i < args.length; i++) { |
| 221 | + for (var j = 0; j < adapters.length; j++) { |
| 222 | + if (adapters[i].loaded && !adapters[i].registered) { |
| 223 | + adapters[i].registered = true; |
| 224 | + store.registerAdapter(adapters[i].name, arguments[i]); |
| 225 | + } |
| 226 | + } |
222 | 227 | } |
223 | 228 | } |
224 | 229 |
|
225 | 230 | // Wrap certain sync functions with $apply |
226 | | - for (i = 0; i < functionsToWrap.length; i++) { |
227 | | - originals[functionsToWrap[i]] = store[functionsToWrap[i]]; |
228 | | - store[functionsToWrap[i]] = (function (name) { |
| 231 | + for (var k = 0; k < functionsToWrap.length; k++) { |
| 232 | + originals[functionsToWrap[k]] = store[functionsToWrap[k]]; |
| 233 | + store[functionsToWrap[k]] = (function (name) { |
229 | 234 | return function () { |
230 | 235 | var args = arguments; |
231 | 236 | if (!$rootScope.$$phase) { |
|
235 | 240 | } |
236 | 241 | return originals[name].apply(store, args); |
237 | 242 | }; |
238 | | - })(functionsToWrap[i]); |
| 243 | + })(functionsToWrap[k]); |
239 | 244 | } |
240 | 245 |
|
241 | 246 | // Hook into the digest loop (throttled) |
|
0 commit comments