github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert services.js for safe minification, preserve license comments in javascript files, add missing recess target, remove oboe-browser.min.js from assets.

pull/2/head
Kevan Ahlquist 2015-09-14 01:06:34 -05:00
parent 13e3fed351
commit 9bdd96527c
3 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/shared/services.js
View File

@ -1,5 +1,5 @@
angular.module('dockerui.services', ['ngResource']) angular.module('dockerui.services', ['ngResource'])
.factory('Container', function ($resource, Settings) { .factory('Container', ['$resource', 'Settings', function ContainerFactory($resource, Settings) {
'use strict'; 'use strict';
// Resource for interacting with the docker containers // Resource for interacting with the docker containers
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#2-1-containers // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#2-1-containers
@ -20,8 +20,8 @@ angular.module('dockerui.services', ['ngResource'])
rename: {method: 'POST', params: {id: '@id', action: 'rename'}, isArray: false}, rename: {method: 'POST', params: {id: '@id', action: 'rename'}, isArray: false},
stats: {method: 'GET', params: {id: '@id', stream: false, action: 'stats'}, timeout: 2000} stats: {method: 'GET', params: {id: '@id', stream: false, action: 'stats'}, timeout: 2000}
}); });
}) }])
.factory('ContainerCommit', function ($resource, $http, Settings) { .factory('ContainerCommit', ['$resource', '$http', 'Settings', function ContainerCommitFactory($resource, $http, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#create-a-new-image-from-a-container-s-changes // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#create-a-new-image-from-a-container-s-changes
return { return {
@ -38,8 +38,8 @@ angular.module('dockerui.services', ['ngResource'])
}); });
} }
}; };
}) }])
.factory('ContainerLogs', function ($resource, $http, Settings) { .factory('ContainerLogs', ['$resource', '$http', 'Settings', function ContainerLogsFactory($resource, $http, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#get-container-logs // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#get-container-logs
return { return {
@ -58,8 +58,8 @@ angular.module('dockerui.services', ['ngResource'])
}); });
} }
}; };
}) }])
.factory('ContainerTop', function ($http, Settings) { .factory('ContainerTop', ['$http', 'Settings', function ($http, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#list-processes-running-inside-a-container // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#list-processes-running-inside-a-container
return { return {
@ -73,8 +73,8 @@ angular.module('dockerui.services', ['ngResource'])
}).success(callback); }).success(callback);
} }
}; };
}) }])
.factory('Image', function ($resource, Settings) { .factory('Image', ['$resource', 'Settings', function ImageFactory($resource, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#2-2-images // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#2-2-images
return $resource(Settings.url + '/images/:id/:action', {}, { return $resource(Settings.url + '/images/:id/:action', {}, {
@ -94,30 +94,30 @@ angular.module('dockerui.services', ['ngResource'])
tag: {method: 'POST', params: {id: '@id', action: 'tag', force: 0, repo: '@repo'}}, tag: {method: 'POST', params: {id: '@id', action: 'tag', force: 0, repo: '@repo'}},
remove: {method: 'DELETE', params: {id: '@id'}, isArray: true} remove: {method: 'DELETE', params: {id: '@id'}, isArray: true}
}); });
}) }])
.factory('Docker', function ($resource, Settings) { .factory('Docker', ['$resource', 'Settings', function DockerFactory($resource, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#show-the-docker-version-information // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#show-the-docker-version-information
return $resource(Settings.url + '/version', {}, { return $resource(Settings.url + '/version', {}, {
get: {method: 'GET'} get: {method: 'GET'}
}); });
}) }])
.factory('Auth', function ($resource, Settings) { .factory('Auth', ['$resource', 'Settings', function AuthFactory($resource, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#check-auth-configuration // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#check-auth-configuration
return $resource(Settings.url + '/auth', {}, { return $resource(Settings.url + '/auth', {}, {
get: {method: 'GET'}, get: {method: 'GET'},
update: {method: 'POST'} update: {method: 'POST'}
}); });
}) }])
.factory('System', function ($resource, Settings) { .factory('System', ['$resource', 'Settings', function SystemFactory($resource, Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#display-system-wide-information // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#display-system-wide-information
return $resource(Settings.url + '/info', {}, { return $resource(Settings.url + '/info', {}, {
get: {method: 'GET'} get: {method: 'GET'}
}); });
}) }])
.factory('Settings', function (DOCKER_ENDPOINT, DOCKER_PORT, DOCKER_API_VERSION, UI_VERSION) { .factory('Settings', ['DOCKER_ENDPOINT', 'DOCKER_PORT', 'DOCKER_API_VERSION', 'UI_VERSION', function SettingsFactory(DOCKER_ENDPOINT, DOCKER_PORT, DOCKER_API_VERSION, UI_VERSION) {
'use strict'; 'use strict';
var url = DOCKER_ENDPOINT; var url = DOCKER_ENDPOINT;
if (DOCKER_PORT) { if (DOCKER_PORT) {
@ -132,8 +132,8 @@ angular.module('dockerui.services', ['ngResource'])
url: url, url: url,
firstLoad: true firstLoad: true
}; };
}) }])
.factory('ViewSpinner', function () { .factory('ViewSpinner', function ViewSpinnerFactory() {
'use strict'; 'use strict';
var spinner = new Spinner(); var spinner = new Spinner();
var target = document.getElementById('view'); var target = document.getElementById('view');
@ -147,7 +147,7 @@ angular.module('dockerui.services', ['ngResource'])
} }
}; };
}) })
.factory('Messages', function ($rootScope) { .factory('Messages', ['$rootScope', function MessagesFactory($rootScope) {
'use strict'; 'use strict';
return { return {
send: function (title, text) { send: function (title, text) {
@ -175,8 +175,8 @@ angular.module('dockerui.services', ['ngResource'])
}); });
} }
}; };
}) }])
.factory('Dockerfile', function (Settings) { .factory('Dockerfile', ['Settings', function DockerfileFactory(Settings) {
'use strict'; 'use strict';
// http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#build-image-from-a-dockerfile // http://docs.docker.com/reference/api/docker_remote_api_<%= remoteApiVersion %>/#build-image-from-a-dockerfile
var url = Settings.rawUrl + '/build'; var url = Settings.rawUrl + '/build';
@ -192,8 +192,8 @@ angular.module('dockerui.services', ['ngResource'])
request.send(data); request.send(data);
} }
}; };
}) }])
.factory('LineChart', function (Settings) { .factory('LineChart', ['Settings', function LineChartFactory(Settings) {
'use strict'; 'use strict';
return { return {
build: function (id, data, getkey) { build: function (id, data, getkey) {
@ -240,4 +240,4 @@ angular.module('dockerui.services', ['ngResource'])
}); });
} }
}; };
}); }]);

1
assets/js/oboe-browser.min.js vendored
View File

File diff suppressed because one or more lines are too long

19
gruntFile.js
View File

@ -127,15 +127,21 @@ module.exports = function (grunt) {
dest: '<%= distdir %>/<%= pkg.name %>.js' dest: '<%= distdir %>/<%= pkg.name %>.js'
}, },
vendor: { vendor: {
options: {
preserveComments: 'some' // Preserve license comments
},
src: ['<%= src.jsVendor %>'], src: ['<%= src.jsVendor %>'],
dest: '<%= distdir %>/vendor.js' dest: '<%= distdir %>/vendor.js'
}, },
angular: { angular: {
options: {
preserveComments: 'some' // Preserve license comments
},
src: ['<%= concat.angular.src %>'], src: ['<%= concat.angular.src %>'],
dest: '<%= distdir %>/angular.js' dest: '<%= distdir %>/angular.js'
} }
}, },
recess: { recess: { // TODO: not maintained, unable to preserve license comments, switch out for something better.
build: { build: {
files: { files: {
'<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'], '<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'],
@ -145,6 +151,17 @@ module.exports = function (grunt) {
compile: true, compile: true,
noOverqualifying: false // TODO: Added because of .nav class, rename noOverqualifying: false // TODO: Added because of .nav class, rename
} }
},
min: {
files: {
'<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'],
'<%= distdir %>/vendor.css': ['<%= src.cssVendor %>']
},
options: {
compile: true,
compress: true,
noOverqualifying: false // TODO: Added because of .nav class, rename
}
} }
}, },
watch: { watch: {