From 6465e7492a06a9be5f6c698614151d01e96ae654 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie@coreos.com>
Date: Mon, 6 Apr 2015 15:10:03 -0400
Subject: [PATCH] trigger service: trimsubdir helper method

---
 static/directives/trigger-description.html | 4 ++--
 static/js/services/trigger-service.js      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/static/directives/trigger-description.html b/static/directives/trigger-description.html
index b0a5da331..4e7521760 100644
--- a/static/directives/trigger-description.html
+++ b/static/directives/trigger-description.html
@@ -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>
diff --git a/static/js/services/trigger-service.js b/static/js/services/trigger-service.js
index 9793fa980..66675cce1 100644
--- a/static/js/services/trigger-service.js
+++ b/static/js/services/trigger-service.js
@@ -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) {