Merge branch 'master' into nolurk

static/js/core-config-setup.js

@@ -78,6 +78,19 @@ angular.module("core-config-setup", ['angularFileUpload'])
             {'name': 'secret_key', 'title': 'Secret Key', 'placeholder': 'secretkeyhere', 'kind': 'text'},
             {'name': 'bucket_name', 'title': 'Bucket Name',  'placeholder': 'my-cool-bucket', 'kind': 'text'},
             {'name': 'storage_path', 'title': 'Storage Directory', 'placeholder': '/path/inside/bucket', 'kind': 'text'}
+          ],
+
+          'SwiftStorage': [
+            {'name': 'auth_url', 'title': 'Swift Auth URL', 'placeholder': '', 'kind': 'text'},
+            {'name': 'swift_container', 'title': 'Swift Container Name', 'placeholder': 'mycontainer', 'kind': 'text'},
+            {'name': 'storage_path', 'title': 'Storage Path', 'placeholder': '/path/inside/container', 'kind': 'text'},
+
+            {'name': 'swift_user', 'title': 'Username', 'placeholder': 'accesskeyhere', 'kind': 'text'},
+            {'name': 'swift_password', 'title': 'Password/Key', 'placeholder': 'secretkeyhere', 'kind': 'text'},
+
+            {'name': 'ca_cert_path', 'title': 'CA Cert Filename', 'placeholder': 'conf/stack/swift.cert', 'kind': 'text', 'optional': true},
+            {'name': 'os_options', 'title': 'OS Options', 'kind': 'map',
+             'keys': ['tenant_id', 'auth_token', 'service_type', 'endpoint_type', 'tenant_name', 'object_storage_url', 'region_name']}
           ]
         };
 
@@ -760,6 +773,42 @@ angular.module("core-config-setup", ['angularFileUpload'])
     return directiveDefinitionObject;
   })
 
+ .directive('configMapField', function () {
+    var directiveDefinitionObject = {
+      priority: 0,
+      templateUrl: '/static/directives/config/config-map-field.html',
+      replace: false,
+      transclude: false,
+      restrict: 'C',
+      scope: {
+        'binding': '=binding',
+        'keys': '=keys'
+      },
+      controller: function($scope, $element) {
+        $scope.newKey = null;
+        $scope.newValue = null;
+
+        $scope.hasValues = function(binding) {
+          return binding && Object.keys(binding).length;
+        };
+
+        $scope.removeKey = function(key) {
+          delete $scope.binding[key];
+        };
+
+        $scope.addEntry = function() {
+          if (!$scope.newKey || !$scope.newValue) { return; }
+
+          $scope.binding = $scope.binding || {};
+          $scope.binding[$scope.newKey] = $scope.newValue;
+          $scope.newKey = null;
+          $scope.newValue = null;
+        }
+      }
+    };
+    return directiveDefinitionObject;
+  })
+
   .directive('configStringField', function () {
     var directiveDefinitionObject = {
       priority: 0,
@@ -772,7 +821,8 @@ angular.module("core-config-setup", ['angularFileUpload'])
         'placeholder': '@placeholder',
         'pattern': '@pattern',
         'defaultValue': '@defaultValue',
-        'validator': '&validator'
+        'validator': '&validator',
+        'isOptional': '=isOptional'
       },
       controller: function($scope, $element) {
         $scope.getRegexp = function(pattern) {

static/js/directives/repo-view/repo-panel-builds.js

@@ -260,7 +260,7 @@ angular.module('quay').directive('repoPanelBuilds', function () {
       };
 
       $scope.handleBuildStarted = function(build) {
-        if (!$scope.allBuilds) {
+        if ($scope.allBuilds) {
           $scope.allBuilds.push(build);
         }
         updateBuilds();

static/js/directives/ui/trigger-setup-githost.js

@@ -123,6 +123,7 @@ angular.module('quay').directive('triggerSetupGithost', function () {
 
         ApiService.listBuildTriggerSubdirs($scope.trigger['config'], params).then(function(resp) {
           if (resp['status'] == 'error') {
+            $scope.locations = [];
             callback(resp['message'] || 'Could not load Dockerfile locations');
             return;
           }

static/js/pages/new-organization.js

@@ -45,6 +45,7 @@
     $scope.signinStarted = function() {
       if (Features.BILLING) {
         PlanService.getMinimumPlan(1, true, function(plan) {
+          if (!plan) { return; }
           PlanService.notePlan(plan.stripeId);
         });
       }

static/js/pages/user-view.js

@@ -94,7 +94,7 @@
         }, ApiService.errorDisplay('Could not generate token'));
       };
 
-      UIService.showPasswordDialog('Enter your password to generated an encrypted version:', generateToken);
+      UIService.showPasswordDialog('Enter your password to generate an encrypted version:', generateToken);
     };
 
     $scope.changeEmail = function() {

static/js/services/angular-poll-channel.js

@@ -1,7 +1,8 @@
 /**
  * Specialized class for conducting an HTTP poll, while properly preventing multiple calls.
  */
-angular.module('quay').factory('AngularPollChannel', ['ApiService', '$timeout', function(ApiService, $timeout) {
+angular.module('quay').factory('AngularPollChannel', ['ApiService', '$timeout', 'DocumentVisibilityService',
+    function(ApiService, $timeout, DocumentVisibilityService) {
   var _PollChannel = function(scope, requester, opt_sleeptime) {
     this.scope_ = scope;
     this.requester_ = requester;
@@ -50,6 +51,12 @@ angular.module('quay').factory('AngularPollChannel', ['ApiService', '$timeout',
   _PollChannel.prototype.call_ = function() {
     if (this.working) { return; }
 
+    // If the document is currently hidden, skip the call.
+    if (DocumentVisibilityService.isHidden()) {
+      this.setupTimer_();
+      return;
+    }
+
     var that = this;
     this.working = true;
     this.scope_.$apply(function() {

static/js/services/document-visibility-service.js

@@ -0,0 +1,60 @@
+/**
+ * Helper service which fires off events when the document's visibility changes, as well as allowing
+ * other Angular code to query the state of the document's visibility directly.
+ */
+angular.module('quay').constant('CORE_EVENT', {
+  DOC_VISIBILITY_CHANGE: 'core.event.doc_visibility_change'
+});
+
+angular.module('quay').factory('DocumentVisibilityService', ['$rootScope', '$document', 'CORE_EVENT',
+    function($rootScope, $document, CORE_EVENT) {
+  var document = $document[0],
+  features,
+  detectedFeature;
+
+  function broadcastChangeEvent() {
+    $rootScope.$broadcast(CORE_EVENT.DOC_VISIBILITY_CHANGE,
+                          document[detectedFeature.propertyName]);
+  }
+
+  features = {
+    standard: {
+      eventName: 'visibilitychange',
+      propertyName: 'hidden'
+    },
+    moz: {
+      eventName: 'mozvisibilitychange',
+      propertyName: 'mozHidden'
+    },
+    ms: {
+      eventName: 'msvisibilitychange',
+      propertyName: 'msHidden'
+    },
+    webkit: {
+      eventName: 'webkitvisibilitychange',
+      propertyName: 'webkitHidden'
+    }
+  };
+
+  Object.keys(features).some(function(feature) {
+    if (document[features[feature].propertyName] !== undefined) {
+      detectedFeature = features[feature];
+      return true;
+    }
+  });
+
+  if (detectedFeature) {
+    $document.on(detectedFeature.eventName, broadcastChangeEvent);
+  }
+
+  return {
+    /**
+     * Is the window currently hidden or not.
+     */
+    isHidden: function() {
+      if (detectedFeature) {
+        return document[detectedFeature.propertyName];
+      }
+    }
+  };
+}]);

static/js/services/notification-service.js

@@ -196,6 +196,10 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P
   };
 
   notificationService.getClasses = function(notifications) {
+    if (!notifications.length) {
+      return '';
+    }
+
     var classes = [];
     for (var i = 0; i < notifications.length; ++i) {
       var notification = notifications[i];

static/js/services/trigger-service.js

@@ -122,7 +122,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
           'title': 'Commit',
           'type': 'regex',
           'name': 'commit_sha',
-          'regex': '^([A-Fa-f0-9]{7})$',
+          'regex': '^([A-Fa-f0-9]{7,})$',
           'placeholder': '1c002dd'
         }
       ],