don't defer Organizations view twice testacular
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 5 Feb 2013 15:01:09 +0000 (16:01 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 5 Feb 2013 15:01:09 +0000 (16:01 +0100)
app/js/services.js.ep

index 62578ed..06be6f1 100644 (file)
@@ -47,19 +47,20 @@ angular.module('myApp.services', [ 'ngResource' ]).
        factory('Organizations', function($q, $http, $log) {
                var url = '/<%= $couchdb_database %>/_design/registration/_view/organizations?group=true;format=key_array;callback=JSON_CALLBACK';
 
-               return {
-                       getArrayPromise: function() {
-                               var deferred = $q.defer();
+               var deferred = $q.defer();
+
+               $log.info('defer', url);
 
-                               $log.info('defer', url);
+               $http.jsonp(url).success(function(json) {
+                       $log.info('success', url);
+                       deferred.resolve(json.rows);
+               }).error(function(error) {
+                       $log.error('error', url, error );
+                       deferred.reject(error);
+               });
 
-                               $http.jsonp(url).success(function(json) {
-                                       $log.info('success', url);
-                                       deferred.resolve(json.rows);
-                               }).error(function(error) {
-                                       $log.error('error', url, error );
-                                       deferred.reject(error);
-                               });
+               return {
+                       getArrayPromise: function() {
                                return deferred.promise;
                        }
                };