GUI -- Moved cap() utility function into FnService.

Change-Id: I0afdb38e5b37e085ffebaedc74d3cb2857472b12

@@ -63,16 +63,9 @@
     // ===========================================
     // ===========================================
     // === Function Definitions ===
     // === Function Definitions ===
 
 
-
-    // TODO: move this to FnService.
-    function cap(s) {
-        return s.replace(/^[a-z]/, function (m) { return m.toUpperCase(); });
-    }
-
-
     function mkKeyDisp(id) {
     function mkKeyDisp(id) {
         var v = keyDisp[id] || id;
         var v = keyDisp[id] || id;
-        return cap(v);
+        return fs.cap(v);
     }
     }
 
 
     function addSeparator(el, i) {
     function addSeparator(el, i) {

@@ -143,6 +143,13 @@
         return found;
         return found;
     }
     }
 
 
+    // return the given string with the first character capitalized.
+    function cap(s) {
+        return s.replace(/^[a-z]/, function (m) {
+            return m.toUpperCase();
+        });
+    }
+
     angular.module('onosUtil')
     angular.module('onosUtil')
         .factory('FnService', ['$window', function (_$window_) {
         .factory('FnService', ['$window', function (_$window_) {
             $window = _$window_;
             $window = _$window_;
@@ -158,7 +165,8 @@
                 windowSize: windowSize,
                 windowSize: windowSize,
                 find: find,
                 find: find,
                 inArray: inArray,
                 inArray: inArray,
-                removeFromArray: removeFromArray
+                removeFromArray: removeFromArray,
+                cap: cap
             };
             };
     }]);
     }]);
 
 

@@ -202,7 +202,7 @@ describe('factory: fw/util/fn.js', function() {
         expect(fs.areFunctions(fs, [
         expect(fs.areFunctions(fs, [
             'isF', 'isA', 'isS', 'isO', 'contains',
             'isF', 'isA', 'isS', 'isO', 'contains',
             'areFunctions', 'areFunctionsNonStrict', 'windowSize', 'find',
             'areFunctions', 'areFunctionsNonStrict', 'windowSize', 'find',
-            'inArray', 'removeFromArray'
+            'inArray', 'removeFromArray', 'cap'
         ])).toBeTruthy();
         ])).toBeTruthy();
     });
     });
 
 
@@ -325,4 +325,14 @@ describe('factory: fw/util/fn.js', function() {
         expect(array).toEqual(['z', 'z', 'y']);
         expect(array).toEqual(['z', 'z', 'y']);
     });
     });
 
 
+    // === Tests for cap()
+    it('should ignore non-alpha', function () {
+        expect(fs.cap('123')).toEqual('123');
+    });
+    it('should capitalize first char', function () {
+        expect(fs.cap('Foo')).toEqual('Foo');
+        expect(fs.cap('foo')).toEqual('Foo');
+        expect(fs.cap('foo bar')).toEqual('Foo bar');
+    });
+
 });
 });