mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 05:11:04 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I0afdb38e5b37e085ffebaedc74d3cb2857472b12
This commit is contained in:
Simon Hunt 2015-02-19 14:49:55 -08:00
parent 337bb44579
commit 27a5cc8b45
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/gui/src/main/webapp/app/fw/layer/quickhelp.js
View File

@ -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) {

10
web/gui/src/main/webapp/app/fw/util/fn.js
View File

@ -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
}; };
}]); }]);

12
web/gui/src/main/webapp/tests/app/fw/util/fn-spec.js
View File

@ -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');
});
}); });