Merge "ngReorg - Relocate filters and a validator"

horizon/static/framework/util/filters/filters.js

@@ -18,12 +18,12 @@
 
   /**
    * @ngdoc overview
-   * @name hz.filters
+   * @name horizon.framework.util.filters
    * @description
-   * hz.filters provides common filters to be used within Horizon.
+   * horizon.framework.util.filters provides common filters to be used within Horizon.
    *
    */
-  angular.module('hz.filters', ['horizon.framework.util.i18n'])
+  angular.module('horizon.framework.util.filters', ['horizon.framework.util.i18n'])
 
     /**
      * @ngdoc filter

horizon/static/framework/util/filters/filters.spec.js

@@ -1,8 +1,8 @@
-describe('hz.filters', function () {
+describe('horizon.framework.util.filters', function () {
   'use strict';
 
    beforeEach(module('horizon.framework.util.i18n'));
-   beforeEach(module('hz.filters'));
+   beforeEach(module('horizon.framework.util.filters'));
 
    describe('yesno', function() {
 

horizon/static/framework/util/util.module.js

@@ -3,6 +3,7 @@
 
   angular.module('horizon.framework.util', [
     'horizon.framework.util.bind-scope',
+    'horizon.framework.util.filters',
     'horizon.framework.util.form',
     'horizon.framework.util.i18n',
     'horizon.framework.util.workflow',

horizon/static/framework/util/validators/validators.js

@@ -137,6 +137,24 @@
           });
         }
       };
-    }]);
+    }])
+
+    .directive('notBlank', function () {
+      return {
+        require: 'ngModel',
+        link:    function (scope, elm, attrs, ctrl) {
+          ctrl.$parsers.unshift(function (viewValue) {
+            if (viewValue.length) {
+              // it is valid
+              ctrl.$setValidity('notBlank', true);
+              return viewValue;
+            }
+            // it is invalid, return undefined (no model update)
+            ctrl.$setValidity('notBlank', false);
+            return undefined;
+          });
+        }
+      };
+    });
 
 }());

horizon/static/horizon/js/angular/directives/forms.js

@@ -1,21 +0,0 @@
-(function () {
-  'use strict';
-  angular.module('hz')
-    .directive('notBlank', function () {
-      return {
-        require: 'ngModel',
-        link: function (scope, elm, attrs, ctrl) {
-          ctrl.$parsers.unshift(function (viewValue) {
-            if (viewValue.length) {
-              // it is valid
-              ctrl.$setValidity('notBlank', true);
-              return viewValue;
-            }
-            // it is invalid, return undefined (no model update)
-            ctrl.$setValidity('notBlank', false);
-            return undefined;
-          });
-        }
-      };
-    });
-}());

horizon/static/horizon/js/angular/horizon.js

@@ -2,7 +2,7 @@
 (function () {
   'use strict';
 
-  var horizon_dependencies = ['hz.conf', 'hz.utils', 'hz.api', 'ngCookies', 'horizon.framework', 'hz.filters'];
+  var horizon_dependencies = ['hz.conf', 'hz.utils', 'hz.api', 'ngCookies', 'horizon.framework'];
   var dependencies = horizon_dependencies.concat(angularModuleExtension);
   angular.module('hz', dependencies)
     .config(['$interpolateProvider', '$httpProvider',

horizon/templates/horizon/_scripts.html

@@ -17,7 +17,6 @@
 <script src='{{ STATIC_URL }}horizon/js/angular/controllers/namespace-controller.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/controllers/dummy.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/controllers/modal-form-update-metadata-ctrl.js'></script>
-<script src='{{ STATIC_URL }}horizon/js/angular/directives/forms.js'></script>
 
 <script src='{{ STATIC_URL }}horizon/js/angular/horizon.conf.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/services/horizon.utils.js'></script>
@@ -30,7 +29,6 @@
 <script src='{{ STATIC_URL }}horizon/js/angular/services/hz.api.neutron.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/services/hz.api.nova.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/services/hz.api.policy.js'></script>
-<script src='{{ STATIC_URL }}horizon/js/angular/filters/filters.js'></script>
 <script src='{{ STATIC_URL }}horizon/js/angular/services/hz.api.security-group.js'></script>
 
 <script src="{{ STATIC_URL }}horizon/lib/d3.js"></script>
@@ -39,6 +37,7 @@
 
 <script src='{{ STATIC_URL }}framework/util/util.module.js'></script>
 <script src='{{ STATIC_URL }}framework/util/bind-scope/bind-scope.js'></script>
+<script src='{{ STATIC_URL }}framework/util/filters/filters.js'></script>
 <script src='{{ STATIC_URL }}framework/util/form/form.js'></script>
 <script src='{{ STATIC_URL }}framework/util/i18n/i18n.js'></script>
 <script src='{{ STATIC_URL }}framework/util/validators/validators.js'></script>

horizon/test/jasmine/jasmine_tests.py

@@ -28,6 +28,7 @@ class ServicesTests(test.JasmineTests):
 
         'framework/util/util.module.js',
         'framework/util/bind-scope/bind-scope.js',
+        'framework/util/filters/filters.js',
         'framework/util/form/form.js',
         'framework/util/i18n/i18n.js',
         'framework/util/validators/validators.js',
@@ -59,6 +60,7 @@ class ServicesTests(test.JasmineTests):
         'horizon/tests/jasmine/utils.spec.js',
 
         'framework/util/bind-scope/bind-scope.spec.js',
+        'framework/util/filters/filters.spec.js',
         'framework/util/form/form.spec.js',
         'framework/util/i18n/i18n.spec.js',
         'framework/util/validators/validators.spec.js',