Skip to content

Commit a295206

Browse files
tobiutobiu
committed
controller.Component, model.Component: component config #1763 
1 parent 136473d commit a295206

13 files changed

Lines changed: 95 additions & 117 deletions

File tree

‎apps/covid/view/MainContainerController.mjs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class MainContainerController extends ComponentController {
7272
me.loadData();
7373
me.loadSummaryData();
7474

75-
me.view.on('mounted', me.onMainViewMounted, me);
75+
me.component.on('mounted', me.onMainViewMounted, me);
7676
}
7777

7878
/**
@@ -396,7 +396,7 @@ class MainContainerController extends ComponentController {
396396
const me = this,
397397
activeTab = me.getReference('tab-container').getActiveCard();
398398

399-
me.view.remove(me.getReference('footer'), true);
399+
me.component.remove(me.getReference('footer'), true);
400400

401401
if (activeTab.ntype === 'covid-mapboxgl-container') {
402402
me.getReference('mapboxglmap').autoResize();
@@ -407,13 +407,13 @@ class MainContainerController extends ComponentController {
407407
* @param {Object} data
408408
*/
409409
onSwitchThemeButtonClick(data) {
410-
let me = this,
411-
button = data.component,
412-
logo = me.getReference('logo'),
413-
logoPath = 'https://raw.githubusercontent.com/neomjs/pages/master/resources/images/apps/covid/',
414-
mapView = me.getReference('mapboxglmap'),
415-
vdom = logo.vdom,
416-
view = me.view,
410+
let me = this,
411+
button = data.component,
412+
component = me.component,
413+
logo = me.getReference('logo'),
414+
logoPath = 'https://raw.githubusercontent.com/neomjs/pages/master/resources/images/apps/covid/',
415+
mapView = me.getReference('mapboxglmap'),
416+
vdom = logo.vdom,
417417
buttonText, cls, href, iconCls, mapViewStyle, theme;
418418

419419
if (button.text === 'Theme Light') {
@@ -435,16 +435,16 @@ class MainContainerController extends ComponentController {
435435

436436

437437
if (Neo.config.useCssVars) {
438-
cls = [...view.cls];
438+
cls = [...component.cls];
439439

440-
view.cls.forEach(item => {
440+
component.cls.forEach(item => {
441441
if (item.includes('neo-theme')) {
442442
NeoArray.remove(cls, item);
443443
}
444444
});
445445

446446
NeoArray.add(cls, theme);
447-
view.cls = cls;
447+
component.cls = cls;
448448

449449
button.set({
450450
iconCls: iconCls,

‎apps/covid/view/TableContainerController.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TableContainerController extends ComponentController {
4949

5050
const me = this;
5151

52-
me.view.on('countrySelect', me.onTableSelect, me);
52+
me.component.on('countrySelect', me.onTableSelect, me);
5353
}
5454

5555
/**
@@ -199,7 +199,7 @@ class TableContainerController extends ComponentController {
199199
const panel = this.getReference('controls-panel'),
200200
expand = panel.width === 40;
201201

202-
panel.width = expand ? this.view.historyPanelWidth : 40;
202+
panel.width = expand ? this.component.historyPanelWidth : 40;
203203

204204
data.component.text = expand ? 'X' : '+';
205205
}

‎apps/realworld/view/MainContainerController.mjs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class MainContainerController extends ComponentController {
254254
if (!me[key]) {
255255
me[key] = Neo.create({
256256
module : module,
257-
parentId : me.view.id,
257+
parentId : me.component.id,
258258
reference: reference
259259
});
260260
}
@@ -306,22 +306,20 @@ class MainContainerController extends ComponentController {
306306
*/
307307
onHashChange(value, oldValue) {
308308
let me = this,
309+
component = me.component,
309310
hash = value.hash,
310311
hashString = value.hashString,
311-
view = me.view,
312312
newView, slug;
313313

314-
if (!view.mounted) { // the initial hash change gets triggered before the vnode got back from the vdom worker (using autoMount)
315-
view.on('mounted', () => {
314+
if (!component.mounted) { // the initial hash change gets triggered before the vnode got back from the vdom worker (using autoMount)
315+
component.on('mounted', () => {
316316
me.onHashChange(value, oldValue);
317317
});
318318
} else {
319-
console.log('onHashChange', value, oldValue);
320-
321319
me.hashString = hashString;
322320

323321
// adjust the active header link
324-
view.items[0].activeItem = Object.keys(hash)[0];
322+
component.items[0].activeItem = Object.keys(hash)[0];
325323

326324
if (hashString === '/') {newView = me.getView('homeComponent', HomeComponent, 'home');}
327325
else if (hashString.includes('/article/')) {newView = me.getView('articleComponent', ArticleComponent, 'article');}
@@ -335,12 +333,12 @@ class MainContainerController extends ComponentController {
335333
oldValue.hash.hasOwnProperty('/login') && hash.hasOwnProperty('/register') ||
336334
oldValue.hash.hasOwnProperty('/register') && hash.hasOwnProperty('/login')))
337335
) {
338-
if (view.items.length > 2) {
339-
view.removeAt(1, false, true);
336+
if (component.items.length > 2) {
337+
component.removeAt(1, false, true);
340338
}
341339

342340
if (newView) {
343-
view.insert(1, newView);
341+
component.insert(1, newView);
344342
}
345343
}
346344

‎apps/realworld2/view/MainContainerController.mjs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,13 @@ class MainContainerController extends ComponentController {
270270
*/
271271
onHashChange(value, oldValue) {
272272
let me = this,
273+
component = me.component,
273274
hash = value.hash,
274275
hashString = value.hashString,
275-
view = me.view,
276276
cards, newView, slug;
277277

278-
if (!view.mounted) { // the initial hash change gets triggered before the vnode got back from the vdom worker (using autoMount)
279-
view.on('mounted', () => {
278+
if (!component.mounted) { // the initial hash change gets triggered before the vnode got back from the vdom worker (using autoMount)
279+
component.on('mounted', () => {
280280
me.onHashChange(value, oldValue, hashString);
281281
});
282282
} else {
@@ -303,8 +303,8 @@ class MainContainerController extends ComponentController {
303303
oldValue.hasOwnProperty('/login') && value.hasOwnProperty('/register') ||
304304
oldValue.hasOwnProperty('/register') && value.hasOwnProperty('/login')))
305305
) {
306-
if (view.items.length > 2) {
307-
view.removeAt(1, false, true);
306+
if (component.items.length > 2) {
307+
component.removeAt(1, false, true);
308308
}
309309
310310
if (newView) {

‎apps/sharedcovid/view/MainContainerController.mjs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class MainContainerController extends ComponentController {
9191
scope : me
9292
});
9393

94-
me.view.on({
94+
me.component.on({
9595
mounted: me.onMainViewMounted,
9696
scope : me
9797
});
@@ -229,7 +229,7 @@ class MainContainerController extends ComponentController {
229229
*/
230230
getMainView(appName) {
231231
if (!appName || appName === 'Covid') {
232-
return this.view;
232+
return this.component;
233233
}
234234

235235
return Neo.apps[appName].mainViewInstance;
@@ -591,7 +591,7 @@ class MainContainerController extends ComponentController {
591591
const me = this,
592592
activeTab = me.getReference('tab-container').getActiveCard();
593593

594-
me.view.remove(me.getReference('footer'), true);
594+
me.component.remove(me.getReference('footer'), true);
595595

596596
if (activeTab.ntype === 'covid-mapboxgl-container') {
597597
me.getReference('mapboxglmap').autoResize();
@@ -602,12 +602,12 @@ class MainContainerController extends ComponentController {
602602
* @param {Object} data
603603
*/
604604
onSwitchThemeButtonClick(data) {
605-
let me = this,
606-
button = data.component,
607-
logo = me.getReference('logo'),
608-
logoPath = 'https://raw.githubusercontent.com/neomjs/pages/master/resources/images/apps/covid/',
609-
vdom = logo.vdom,
610-
view = me.view,
605+
let me = this,
606+
button = data.component,
607+
component = me.component,
608+
logo = me.getReference('logo'),
609+
logoPath = 'https://raw.githubusercontent.com/neomjs/pages/master/resources/images/apps/covid/',
610+
vdom = logo.vdom,
611611
buttonText, cls, href, iconCls, mapView, mapViewStyle, theme;
612612

613613
if (me.connectedApps.includes('SharedCovidMap')) {
@@ -635,27 +635,27 @@ class MainContainerController extends ComponentController {
635635

636636

637637
if (Neo.config.useCssVars) {
638-
[view.appName, ...me.connectedApps].forEach(appName => {
639-
view = me.getMainView(appName);
638+
[component.appName, ...me.connectedApps].forEach(appName => {
639+
component = me.getMainView(appName);
640640

641-
cls = [...view.cls];
641+
cls = [...component.cls];
642642

643-
view.cls.forEach(item => {
643+
component.cls.forEach(item => {
644644
if (item.includes('neo-theme')) {
645645
NeoArray.remove(cls, item);
646646
}
647647
});
648648

649649
NeoArray.add(cls, theme);
650-
view.cls = cls;
650+
component.cls = cls;
651651
});
652652

653653
button.set({
654654
iconCls: iconCls,
655655
text : buttonText
656656
});
657657
} else {
658-
[view.appName, ...me.connectedApps].forEach(appName => {
658+
[component.appName, ...me.connectedApps].forEach(appName => {
659659
Neo.main.addon.Stylesheet.swapStyleSheet({
660660
appName: appName,
661661
href : href,

‎apps/sharedcovid/view/TableContainerController.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TableContainerController extends ComponentController {
4949

5050
const me = this;
5151

52-
me.view.on('countrySelect', me.onTableSelect, me);
52+
me.component.on('countrySelect', me.onTableSelect, me);
5353
}
5454

5555
/**
@@ -199,7 +199,7 @@ class TableContainerController extends ComponentController {
199199
const panel = this.getReference('controls-panel'),
200200
expand = panel.width === 40;
201201

202-
panel.width = expand ? this.view.historyPanelWidth : 40;
202+
panel.width = expand ? this.component.historyPanelWidth : 40;
203203

204204
data.component.text = expand ? 'X' : '+';
205205
}

‎apps/shareddialog/view/MainContainerController.mjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class MainContainerController extends ComponentController {
185185
* @return {Neo.button.Base}
186186
*/
187187
getOpenDockedWindowButton() {
188-
return this.view.down({iconCls: 'far fa-window-restore'});
188+
return this.component.down({iconCls: 'far fa-window-restore'});
189189
}
190190

191191
/**
@@ -265,14 +265,14 @@ class MainContainerController extends ComponentController {
265265
*/
266266
mountDialogInOtherWindow(data) {
267267
let me = this,
268-
appName = me.view.appName,
268+
appName = me.component.appName,
269269
dialog = me.dialog,
270270
dragEndWindowAppName = me.dockedWindowAppName,
271271
side = me.dockedWindowSide,
272272
proxyPosition, wrapperStyle;
273273

274274
if (dialog.appName === dragEndWindowAppName) {
275-
dragEndWindowAppName = me.view.appName;
275+
dragEndWindowAppName = me.component.appName;
276276
side = me.getOppositeSide(me.dockedWindowSide);
277277
}
278278

@@ -360,7 +360,7 @@ class MainContainerController extends ComponentController {
360360
* @param {Object} data
361361
*/
362362
onCreateDialogButtonClick(data) {
363-
this.createDialog(data, this.view.appName);
363+
this.createDialog(data, this.component.appName);
364364
}
365365

366366
/**
@@ -425,7 +425,7 @@ class MainContainerController extends ComponentController {
425425
// in case we trigger the drag:start inside the docked window,
426426
// we can keep the same logic with just flipping the side.
427427
if (me.dialog.appName === dockedWindowAppName) {
428-
dockedWindowAppName = me.view.appName;
428+
dockedWindowAppName = me.component.appName;
429429
side = me.getOppositeSide(me.dockedWindowSide);
430430
}
431431

@@ -471,7 +471,7 @@ class MainContainerController extends ComponentController {
471471
onDragStart(data) {
472472
if (this.hasDockedWindow()) {
473473
let me = this,
474-
appName = me.view.appName,
474+
appName = me.component.appName,
475475
dockedHorizontal = me.dockedWindowSide === 'left' || me.dockedWindowSide === 'right';
476476

477477
me.dialogRect = data.dragElementRect;

‎apps/shareddialog2/view/MainContainerController.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MainContainerController extends ComponentController {
2121
let app = Neo.apps['SharedDialog'];
2222

2323
if (app) {
24-
app.mainViewInstance.controller.createDialog(data, this.view.appName);
24+
app.mainViewInstance.controller.createDialog(data, this.component.appName);
2525
}
2626
}
2727
}

‎apps/website/view/MainContainerController.mjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ class MainContainerController extends ComponentController {
136136
* @param {Object} data
137137
*/
138138
onSwitchThemeButtonClick(data) {
139-
let me = this,
140-
button = data.component,
141-
view = me.view,
139+
let me = this,
140+
button = data.component,
141+
component = me.component,
142142
cls, iconCls, theme;
143143

144144
if (button.iconCls === 'fa fa-sun') {
@@ -149,16 +149,16 @@ class MainContainerController extends ComponentController {
149149
theme = 'neo-theme-dark';
150150
}
151151

152-
cls = [...view.cls];
152+
cls = [...component.cls];
153153

154-
view.cls.forEach(item => {
154+
component.cls.forEach(item => {
155155
if (item.includes('neo-theme')) {
156156
NeoArray.remove(cls, item);
157157
}
158158
});
159159

160160
NeoArray.add(cls, theme);
161-
view.cls = cls;
161+
component.cls = cls;
162162

163163
button.iconCls = iconCls;
164164
}

‎examples/calendar/basic/MainContainerController.mjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class MainContainerController extends ComponentController {
2121
onSwitchThemeButtonClick(data) {
2222
let me = this,
2323
button = data.component,
24+
component = me.component,
2425
headerToolbar = me.getReference('headerToolbar'),
25-
view = me.view,
26-
buttonText, cls, headerColor, iconCls, theme;
26+
buttonText, cls, headerColor, iconCls, style, theme;
2727

2828
if (button.text === 'Theme Light') {
2929
buttonText = 'Theme Dark';
@@ -37,23 +37,23 @@ class MainContainerController extends ComponentController {
3737
theme = 'neo-theme-dark';
3838
}
3939

40-
cls = [...view.cls];
40+
cls = [...component.cls];
4141

42-
view.cls.forEach(item => {
42+
component.cls.forEach(item => {
4343
if (item.includes('neo-theme')) {
4444
NeoArray.remove(cls, item);
4545
}
4646
});
4747

4848
NeoArray.add(cls, theme);
49-
view.cls = cls;
49+
component.cls = cls;
5050

5151
button.set({
5252
iconCls: iconCls,
5353
text : buttonText
5454
});
5555

56-
let style = headerToolbar.style || {};
56+
style = headerToolbar.style || {};
5757
style.backgroundColor = headerColor;
5858
headerToolbar.style = style;
5959
}

0 commit comments

Comments
 (0)