Skip to content

Commit 0054f13

Browse files
tobiutobiu
committed
app/*: use text over html for vdom #6886 
1 parent 8b176d5 commit 0054f13

42 files changed

Lines changed: 167 additions & 167 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/covid/view/AttributionComponent.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AttributionComponent extends Component {
2121
*/
2222
vdom:
2323
{style: {margin: '20px'}, cn: [
24-
{tag: 'h2', html: 'Attribution'},
24+
{tag: 'h2', text: 'Attribution'},
2525
{tag: 'ul', cn: [
2626
{tag: 'li', html: 'The logos were created by <a target="_blank" href="https://www.driefmeier.com/">Sebastian Driefmeier</a>. Thank you!'},
2727
{tag: 'li', html: ['The logos are based on the image from <a target="_blank" href="https://phil.cdc.gov/Details.aspx?pid=23312">CDC Public Health Image Library (PHIL)</a>,</br>',

‎apps/covid/view/HeaderContainer.mjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ class HeaderContainer extends Container {
5555
items: [{
5656
cls : ['covid-numberbox'],
5757
vdom: {cn: [
58-
{cls: ['covid-numberbox-title', 'cases'], html:'Cases'},
58+
{cls: ['covid-numberbox-title', 'cases'], text:'Cases'},
5959
{cls: ['covid-numberbox-number', 'cases']}
6060
]}
6161
}, {
6262
cls : ['covid-numberbox'],
6363
vdom: {cn: [
64-
{cls: ['covid-numberbox-title', 'active'], html:'Active'},
64+
{cls: ['covid-numberbox-title', 'active'], text:'Active'},
6565
{cls: ['covid-numberbox-number', 'active']}
6666
]}
6767
}, {
6868
cls : ['covid-numberbox'],
6969
vdom: {cn: [
70-
{cls: ['covid-numberbox-title', 'recovered'], html:'Recovered'},
70+
{cls: ['covid-numberbox-title', 'recovered'], text:'Recovered'},
7171
{cls: ['covid-numberbox-number', 'recovered']}
7272
]}
7373
}, {
7474
cls : ['covid-numberbox'],
7575
vdom: {cn: [
76-
{cls: ['covid-numberbox-title', 'deaths'], html:'Deaths'},
76+
{cls: ['covid-numberbox-title', 'deaths'], text:'Deaths'},
7777
{cls: ['covid-numberbox-number', 'deaths']}
7878
]}
7979
}, {
@@ -89,7 +89,7 @@ class HeaderContainer extends Container {
8989
'data-show-count': 'true',
9090
'data-size' : 'large',
9191
href : 'https://github.com/neomjs/neo',
92-
html : 'Star'
92+
text : 'Star'
9393
}]
9494
}
9595
}, {
@@ -103,7 +103,7 @@ class HeaderContainer extends Container {
103103
'data-icon' : 'octicon-heart',
104104
'data-size' : 'large',
105105
href : 'https://github.com/sponsors/tobiu',
106-
html : 'Sponsor'
106+
text : 'Sponsor'
107107
}]
108108
}
109109
}]

‎apps/covid/view/MainContainerController.mjs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,18 @@ class MainContainerController extends ComponentController {
131131

132132
me.summaryData = data;
133133

134-
container.items[0].vdom.cn[1].html = Util.formatNumber({value: data.cases});
135-
container.items[1].vdom.cn[1].html = Util.formatNumber({value: data.active});
136-
container.items[2].vdom.cn[1].html = Util.formatNumber({value: data.recovered});
137-
container.items[3].vdom.cn[1].html = Util.formatNumber({value: data.deaths});
134+
container.items[0].vdom.cn[1].text = Util.formatNumber({value: data.cases});
135+
container.items[1].vdom.cn[1].text = Util.formatNumber({value: data.active});
136+
container.items[2].vdom.cn[1].text = Util.formatNumber({value: data.recovered});
137+
container.items[3].vdom.cn[1].text = Util.formatNumber({value: data.deaths});
138138

139139
container.updateDepth = 2;
140140
container.update();
141141

142142
container = me.getReference('last-update');
143143
vdom = container.vdom;
144144

145-
vdom.html = 'Last Update: ' + new Intl.DateTimeFormat('default', {
145+
vdom.text = 'Last Update: ' + new Intl.DateTimeFormat('default', {
146146
hour : 'numeric',
147147
minute: 'numeric',
148148
second: 'numeric'

‎apps/covid/view/TableContainerController.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class TableContainerController extends ComponentController {
224224

225225
me.loadHistoricalData(record?.countryInfo?.iso2 || 'all');
226226

227-
me.getReference('historical-data-label').html = 'Historical Data (' + (record?.country || 'World') + ')';
227+
me.getReference('historical-data-label').text = 'Historical Data (' + (record?.country || 'World') + ')';
228228
}
229229

230230
/**

‎apps/covid/view/country/Gallery.mjs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,24 @@ class CountryGallery extends Gallery {
4545
]},
4646
{tag: 'table', cls: ['neo-content-table'], cn: [
4747
{tag: 'tr', cn: [
48-
{tag: 'td', html: 'Cases'},
48+
{tag: 'td', text: 'Cases'},
4949
{tag: 'td', cls: ['neo-align-right']},
5050
{tag: 'td', style: {width: '100%'}},
51-
{tag: 'td', html: 'Cases today'},
51+
{tag: 'td', text: 'Cases today'},
5252
{tag: 'td', cls: ['neo-align-right']}
5353
]},
5454
{tag: 'tr', cn: [
55-
{tag: 'td', html: 'Deaths'},
55+
{tag: 'td', text: 'Deaths'},
5656
{tag: 'td', cls: ['neo-align-right', 'neo-content-deaths']},
5757
{tag: 'td', style: {width: '100%'}},
58-
{tag: 'td', html: 'Deaths today'},
58+
{tag: 'td', text: 'Deaths today'},
5959
{tag: 'td', cls: ['neo-align-right', 'neo-content-deaths']}
6060
]},
6161
{tag: 'tr', cn: [
62-
{tag: 'td', html: 'Recovered'},
62+
{tag: 'td', text: 'Recovered'},
6363
{tag: 'td', cls: ['neo-align-right', 'neo-content-recovered']},
6464
{tag: 'td', style: {width: '100%'}},
65-
{tag: 'td', html: 'Critical'},
65+
{tag: 'td', text: 'Critical'},
6666
{tag: 'td', cls: ['neo-align-right', 'neo-content-critical']}
6767
]}
6868
]}
@@ -127,15 +127,15 @@ class CountryGallery extends Gallery {
127127
firstChild.style.width = me.itemWidth + 'px';
128128

129129
firstChild.cn[0].cn[0].src = Util.getCountryFlagUrl(record.country);
130-
firstChild.cn[0].cn[1].html = record.country;
130+
firstChild.cn[0].cn[1].text = record.country;
131131

132-
table.cn[0].cn[1].html = fN({value: record.cases});
133-
table.cn[1].cn[1].html = fN({value: record.deaths});
134-
table.cn[2].cn[1].html = fN({value: record.recovered});
132+
table.cn[0].cn[1].text = fN({value: record.cases});
133+
table.cn[1].cn[1].text = fN({value: record.deaths});
134+
table.cn[2].cn[1].text = fN({value: record.recovered});
135135

136-
table.cn[0].cn[4].html = fN({value: record.todayCases});
137-
table.cn[1].cn[4].html = fN({value: record.todayDeaths});
138-
table.cn[2].cn[4].html = fN({value: record.critical});
136+
table.cn[0].cn[4].text = fN({value: record.todayCases});
137+
table.cn[1].cn[4].text = fN({value: record.todayDeaths});
138+
table.cn[2].cn[4].text = fN({value: record.critical});
139139

140140
return vdomItem;
141141
}

‎apps/covid/view/country/Helix.mjs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,24 @@ class CountryHelix extends Helix {
4545
]},
4646
{tag: 'table', cls: ['neo-content-table'], cn: [
4747
{tag: 'tr', cn: [
48-
{tag: 'td', html: 'Cases'},
48+
{tag: 'td', text: 'Cases'},
4949
{tag: 'td', cls: ['neo-align-right']},
5050
{tag: 'td', style: {width: '100%'}},
51-
{tag: 'td', html: 'Cases today'},
51+
{tag: 'td', text: 'Cases today'},
5252
{tag: 'td', cls: ['neo-align-right']}
5353
]},
5454
{tag: 'tr', cn: [
55-
{tag: 'td', html: 'Deaths'},
55+
{tag: 'td', text: 'Deaths'},
5656
{tag: 'td', cls: ['neo-align-right', 'neo-content-deaths']},
5757
{tag: 'td', style: {width: '100%'}},
58-
{tag: 'td', html: 'Deaths today'},
58+
{tag: 'td', text: 'Deaths today'},
5959
{tag: 'td', cls: ['neo-align-right', 'neo-content-deaths']}
6060
]},
6161
{tag: 'tr', cn: [
62-
{tag: 'td', html: 'Recovered'},
62+
{tag: 'td', text: 'Recovered'},
6363
{tag: 'td', cls: ['neo-align-right', 'neo-content-recovered']},
6464
{tag: 'td', style: {width: '100%'}},
65-
{tag: 'td', html: 'Critical'},
65+
{tag: 'td', text: 'Critical'},
6666
{tag: 'td', cls: ['neo-align-right', 'neo-content-critical']}
6767
]}
6868
]}
@@ -138,15 +138,15 @@ class CountryHelix extends Helix {
138138
vdomItem.id = me.getItemVnodeId(record[me.keyProperty]);
139139

140140
firstChild.cn[0].cn[0].src = Util.getCountryFlagUrl(record.country);
141-
firstChild.cn[0].cn[1].html = record.country;
141+
firstChild.cn[0].cn[1].text = record.country;
142142

143-
table.cn[0].cn[1].html = fN({value: record.cases});
144-
table.cn[1].cn[1].html = fN({value: record.deaths});
145-
table.cn[2].cn[1].html = fN({value: record.recovered});
143+
table.cn[0].cn[1].text = fN({value: record.cases});
144+
table.cn[1].cn[1].text = fN({value: record.deaths});
145+
table.cn[2].cn[1].text = fN({value: record.recovered});
146146

147-
table.cn[0].cn[4].html = fN({value: record.todayCases});
148-
table.cn[1].cn[4].html = fN({value: record.todayDeaths});
149-
table.cn[2].cn[4].html = fN({value: record.critical});
147+
table.cn[0].cn[4].text = fN({value: record.todayCases});
148+
table.cn[1].cn[4].text = fN({value: record.todayDeaths});
149+
table.cn[2].cn[4].text = fN({value: record.critical});
150150

151151
return vdomItem;
152152
}

‎apps/covid/view/country/HistoricalDataTable.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class HistoricalDataTable extends Container {
3838
renderer : function(data) {
3939
return {
4040
cls : ['neo-date-column', 'neo-table-cell'],
41-
html: new Intl.DateTimeFormat('default', {
41+
text: new Intl.DateTimeFormat('default', {
4242
day : 'numeric',
4343
month: 'numeric',
4444
year : 'numeric'

‎apps/email/view/Viewport.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ class Viewport extends BaseViewport {
4242
iconCls: 'fa fa-home',
4343
text : 'Tab 1'
4444
},
45-
vdom: {html: 'Welcome to your new Neo App.'}
45+
text: 'Welcome to your new Neo App.'
4646
}, {
4747
header: {
4848
iconCls: 'fa fa-play-circle',
4949
text : 'Tab 2'
5050
},
51-
vdom: {html: 'Have fun creating something awesome!'}
51+
text: 'Have fun creating something awesome!'
5252
}]
5353
}]
5454
}

‎apps/realworld/view/FooterComponent.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FooterComponent extends Component {
1717
_vdom:
1818
{tag: 'footer', cn: [
1919
{cls: ['container'], cn: [
20-
{tag: 'a', cls: ['logo-font'], href: '#/', html: 'conduit'},
20+
{tag: 'a', cls: ['logo-font'], href: '#/', text: 'conduit'},
2121
{tag: 'span', cls: 'attribution', html: 'An interactive learning project from <a href="https://thinkster.io">Thinkster</a>. Code &amp; design licensed under MIT.'}
2222
]}
2323
]}

‎apps/realworld/view/HeaderComponent.mjs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,34 @@ class HeaderComponent extends Component {
3838
_vdom:
3939
{tag: 'nav', cls: ['navbar navbar-light'], cn: [
4040
{cls: ['container'], cn: [
41-
{tag: 'a', cls: ['navbar-brand'], href: '#/', html: 'conduit'},
41+
{tag: 'a', cls: ['navbar-brand'], href: '#/', text: 'conduit'},
4242
{tag: 'ul', cls: ['nav navbar-nav', 'pull-xs-right'], cn: [
4343
{tag: 'li', cls: ['nav-item'], cn: [
44-
{tag: 'a', cls: ['nav-link'], href: '#/', html: 'Home'}
44+
{tag: 'a', cls: ['nav-link'], href: '#/', text: 'Home'}
4545
]},
4646
{tag: 'li', cls: ['nav-item'], removeDom: true, cn: [
4747
{tag: 'a', cls: ['nav-link'], href: '#/editor', cn: [
4848
{tag: 'i', cls: 'ion-compose'},
49-
{vtype: 'text', html: '&nbsp;New Article'}
49+
{vtype: 'text', text: '&nbsp;New Article'}
5050
]}
5151
]},
5252
{tag: 'li', cls: ['nav-item'], removeDom: true, cn: [
5353
{tag: 'a', cls: ['nav-link'], href: '#/settings', cn: [
5454
{tag: 'i', cls: 'ion-gear-a'},
55-
{vtype: 'text', html: '&nbsp;Settings'}
55+
{vtype: 'text', text: '&nbsp;Settings'}
5656
]}
5757
]},
5858
{tag: 'li', cls: ['nav-item'], removeDom: true, cn: [
5959
{tag: 'a', cls : ['nav-link'], href: '#/profile', cn: [
6060
{tag: 'img', cls: ['user-pic']},
61-
{vtype: 'text', html: '&nbsp;Profile'}
61+
{vtype: 'text', text: ' Profile'}
6262
]}
6363
]},
6464
{tag: 'li', cls: ['nav-item'], cn: [
65-
{tag : 'a', cls : ['nav-link'], href: '#/login', html: 'Sign in'}
65+
{tag : 'a', cls : ['nav-link'], href: '#/login', text: 'Sign in'}
6666
]},
6767
{tag: 'li', cls: ['nav-item'], cn: [
68-
{tag: 'a', cls : ['nav-link'], href: '#/register', html: 'Sign up'}
68+
{tag: 'a', cls : ['nav-link'], href: '#/register', text: 'Sign up'}
6969
]}
7070
]}
7171
]}
@@ -140,7 +140,7 @@ class HeaderComponent extends Component {
140140
profileLink = me.vdom.cn[0].cn[1].cn[3].cn[0];
141141

142142
profileLink.href = '#/profile/' + value;
143-
profileLink.cn[1].html = '&nbsp;' + value;
143+
profileLink.cn[1].text = ' ' + value;
144144

145145
me.update();
146146
}

0 commit comments

Comments
 (0)