vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

trigger service: trimsubdir helper method

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-04-06 15:10:03 -04:00
parent c8b931609e
commit 6465e7492a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/directives/trigger-description.html
View file

@ -14,7 +14,7 @@
<div>
<span class="trigger-description-subtitle">Dockerfile:</span>
<span ng-if="trigger.config.subdir">//{{ trigger.config.subdir }}/Dockerfile</span>
<span ng-if="trigger.config.subdir">//{{ TriggerService.trimSubdir(trigger.config.subdir) }}/Dockerfile</span>
<span ng-if="!trigger.config.subdir">//Dockerfile</span>
</div>
</div>
@ -25,7 +25,7 @@
<div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
<div>
<span class="trigger-description-subtitle">Dockerfile:</span>
<span ng-if="trigger.config.subdir">//{{ trigger.config.subdir }}/Dockerfile</span>
<span ng-if="trigger.config.subdir">//{{ TriggerService.trimSubdir(trigger.config.subdir) }}/Dockerfile</span>
<span ng-if="!trigger.config.subdir">//Dockerfile</span>
</div>
</div>

5
static/js/services/trigger-service.js
View file

@ -95,6 +95,11 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
return type['get_redirect_url'](namespace, repository);
};
// Helper to remove the prefix and suffix /s on subdir paths.
triggerService.trimSubdir = function(subdir) {
return subdir.replace(new RegExp('(^\/+|\/+$)'), '');
};
triggerService.getTitle = function(name) {
var type = triggerTypes[name];
if (!type) {