diff --git a/app/shared/responseHandlers.js b/app/shared/responseHandlers.js index 958f8661b..4625ba1fc 100644 --- a/app/shared/responseHandlers.js +++ b/app/shared/responseHandlers.js @@ -1,20 +1,7 @@ -// Events query API return a list of JSON object. +// The Docker API often returns a list of JSON object. // This handler wrap the JSON objects in an array. -function queryEventsHandler(data) { - var str = "[" + data.replace(/\n/g, " ").replace(/\}\s*\{/g, "}, {") + "]"; - return angular.fromJson(str); -} - -// Image create API return a list of JSON object. -// This handler wrap the JSON objects in an array. -function createImageHandler(data) { - var str = "[" + data.replace(/\n/g, " ").replace(/\}\s*\{/g, "}, {") + "]"; - return angular.fromJson(str); -} - -// Image push API return a list of JSON object. -// This handler wrap the JSON objects in an array. -function pushImageHandler(data) { +// Used by the API in: Image push, Image create, Events query. +function jsonObjectsToArrayHandler(data) { var str = "[" + data.replace(/\n/g, " ").replace(/\}\s*\{/g, "}, {") + "]"; return angular.fromJson(str); } diff --git a/app/shared/services.js b/app/shared/services.js index 8d7ed6bd7..7f7cd59f6 100644 --- a/app/shared/services.js +++ b/app/shared/services.js @@ -97,11 +97,11 @@ angular.module('uifordocker.services', ['ngResource', 'ngSanitize']) inspect: {method: 'GET', params: {id: '@id', action: 'json'}}, push: { method: 'POST', params: {action: 'push', id: '@tag'}, - isArray: true, transformResponse: pushImageHandler + isArray: true, transformResponse: jsonObjectsToArrayHandler }, create: { method: 'POST', params: {action: 'create', fromImage: '@fromImage', tag: '@tag'}, - isArray: true, transformResponse: createImageHandler + isArray: true, transformResponse: jsonObjectsToArrayHandler }, remove: { method: 'DELETE', params: {id: '@id'}, @@ -115,7 +115,7 @@ angular.module('uifordocker.services', ['ngResource', 'ngSanitize']) return $resource(Settings.url + '/events', {}, { query: { method: 'GET', params: {since: '@since', until: '@until'}, - isArray: true, transformResponse: queryEventsHandler + isArray: true, transformResponse: jsonObjectsToArrayHandler } }); }])