Skip to content

Commit d8b1fb7

Browse files
committed
[Frontend] Removing glyph definitions; updating tests
Fixes #1047 Search and removal of "glyph" definitions in bundle and other JS files; updating tests accordingly;
1 parent 650fbcc commit d8b1fb7

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

example/forms/src/ExampleFormController.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,26 @@ define(
7878
items: [
7979
{
8080
control: "button",
81-
glyph: "1",
82-
description: "Button A",
81+
csslass: "icon-save",
8382
click: function () {
84-
window.alert("A");
83+
window.alert("Save");
8584
}
8685
},
8786
{
8887
control: "button",
89-
glyph: "2",
88+
csslass: "icon-x",
9089
description: "Button B",
9190
click: function () {
92-
window.alert("B");
91+
window.alert("Cancel");
9392
}
9493
},
9594
{
9695
control: "button",
97-
glyph: "3",
96+
csslass: "icon-trash",
9897
description: "Button C",
9998
disabled: true,
10099
click: function () {
101-
window.alert("C");
100+
window.alert("Delete");
102101
}
103102
}
104103
]

example/profiling/src/DigestIndicator.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,14 @@ define(
6060

6161
return {
6262
/**
63-
* Get the glyph CSS class (single character used as an icon)
64-
* to display in this indicator. This will return ".",
65-
* which should appear as a dataflow icon.
66-
* @returns {string} the character of the dataflow icon
63+
* Get the CSS class that defines the icon
64+
* to display in this indicator. This will appear
65+
* as a dataflow icon.
66+
* @returns {string} the cssclass of the dataflow icon
6767
*/
6868
getCssClass: function () {
6969
return "icon-connectivity";
7070
},
71-
getCssClass: function () {
72-
return undefined;
73-
},
7471
getText: function () {
7572
return displayed + " digests/sec";
7673
},

platform/search/test/controllers/SearchControllerSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ define([
6969
);
7070
mockSearchService.query.andReturn(mockPromise);
7171

72-
mockTypes = [{key: 'mock.type', name: 'Mock Type', glyph: '?'}];
72+
mockTypes = [{key: 'mock.type', name: 'Mock Type', cssclass: 'icon-object-unknown'}];
7373

7474
mockSearchResult = jasmine.createSpyObj(
7575
'searchResult',

platform/search/test/controllers/SearchMenuControllerSpec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ define(
3939
);
4040

4141
mockTypes = [
42-
{key: 'mock.type.1', name: 'Mock Type 1', glyph: 'a'},
43-
{key: 'mock.type.2', name: 'Mock Type 2', glyph: 'b'}
42+
{key: 'mock.type.1', name: 'Mock Type 1', cssclass: 'icon-layout'},
43+
{key: 'mock.type.2', name: 'Mock Type 2', cssclass: 'icon-telemetry'}
4444
];
4545

4646
mockScope.ngModel = {};

0 commit comments

Comments
 (0)