Skip to content

Commit 90b3277

Browse files
committed
new components for v7
1 parent 9bbb664 commit 90b3277

File tree

1,184 files changed

+576117
-36
lines changed

Some content is hidden

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

1,184 files changed

+576117
-36
lines changed

generators/ext-component-creator/all.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function launch(framework, data, srcFolder, libFolder, templateToolkitFolder, mo
8282
case 'angular':
8383
extension = 'ts';
8484
break;
85-
case 'components':
85+
case 'web-components':
8686
extension = 'js';
8787
break;
8888
default:
@@ -133,7 +133,7 @@ function launch(framework, data, srcFolder, libFolder, templateToolkitFolder, mo
133133
// log(`transitionFile`,`${transitionFile}`)
134134

135135
break
136-
case 'components':
136+
case 'web-components':
137137
var routerFile = `${libFolder}aa-router.component.js`
138138
fs.writeFile(routerFile, doRouter(templateToolkitFolder), function(err) {if(err){return console.log(err);} })
139139
log(`routerFile`,`${routerFile}`);
@@ -218,7 +218,7 @@ function launch(framework, data, srcFolder, libFolder, templateToolkitFolder, mo
218218
fs.writeFile(moduleFile, doModule(moduleVars), function(err) {if(err) { return console.log(err); } });
219219
log(`moduleFile`,`${moduleFile}`)
220220
break
221-
case 'components':
221+
case 'web-components':
222222
fs.writeFile(`${libFolder}base.${extension}`, doExtBase(templateToolkitFolder), function(err) {if(err){return console.log(err);} })
223223
var indexFile = `${libFolder}index.js`
224224
fs.writeFile(indexFile, doIndex(moduleVars), function(err) {if(err) { return console.log(err); } });
@@ -471,7 +471,7 @@ function oneItem(o, libFolder, framework, extension, num, xtype, alias, moduleVa
471471
case 'angular':
472472
fs.writeFile(`${classFile}`, doClass(o.xtype, sGETSET, sMETHODS, sPROPERTIES, sPROPERTIESOBJECT, sEVENTS, sEVENTNAMES, o.name, classname, capclassname, templateToolkitFolder), function(err) {if(err) { return console.log(err); }});
473473
break;
474-
case 'components':
474+
case 'web-components':
475475
fs.writeFile(`${classFile}`, doClass(o.xtype, sGETSET, sMETHODS, sPROPERTIES, sPROPERTIESOBJECT, sEVENTS, sEVENTNAMES, o.name, classname, capclassname, templateToolkitFolder), function(err) {if(err) { return console.log(err); }});
476476
break;
477477
default:
@@ -652,11 +652,11 @@ export class ExtClassComponent {
652652

653653
function processArgs(framework, toolkit) {
654654
if(framework == undefined) {
655-
log(``,`framework: ${framework} is incorrect. should be components or angular`)
655+
log(``,`framework: ${framework} is incorrect. should be web-components or angular`)
656656
return -1
657657
}
658-
if ((framework != 'components') && (framework != 'angular') && (framework != 'studio')) {
659-
log(``,`framework: ${framework} is incorrect. should be components or angular or studio`)
658+
if ((framework != 'web-components') && (framework != 'angular') && (framework != 'studio')) {
659+
log(``,`framework: ${framework} is incorrect. should be web-components or angular or studio`)
660660
return -1
661661
}
662662
if(toolkit == undefined) {

generators/ext-component-creator/filetemplates/angular/base.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ export class base {
109109
this.ext = Ext.create(o)
110110
}
111111

112-
@ContentChild('extroute') _extroute: any;
112+
@ContentChild('extroute',{ static : false }) _extroute: any;
113113
@ContentChildren('extroute') _extroutes: QueryList<any>;
114-
@ContentChild('extitem') _extitem: any;
114+
@ContentChild('extitem',{ static : false }) _extitem: any;
115115
@ContentChildren('extitem') _extitems: QueryList<any>;
116116
baseAfterContentInit() {
117117
if (this._extitems.length == 1) {

0 commit comments

Comments
 (0)