Skip to content

Commit be92b3c

Browse files
petersirkapetersirka
committed
Add new directory schemas.
1 parent 5219695 commit be92b3c

5 files changed

Lines changed: 17 additions & 1 deletion

File tree

‎debug.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ function runwatching() {
9999
U.combine(F.config['directory-isomorphic']),
100100
U.combine(F.config['directory-modules']),
101101
U.combine(F.config['directory-models']),
102+
U.combine(F.config['directory-schemas']),
102103
U.combine(F.config['directory-resources']),
103104
U.combine(F.config['directory-source']),
104105
U.combine(F.config['directory-workers']),
@@ -110,6 +111,7 @@ function runwatching() {
110111
U.combine(F.config['directory-src'], F.config['directory-controllers']),
111112
U.combine(F.config['directory-src'], F.config['directory-definitions']),
112113
U.combine(F.config['directory-src'], F.config['directory-models']),
114+
U.combine(F.config['directory-src'], F.config['directory-schemas']),
113115
U.combine(F.config['directory-src'], F.config['directory-resources']),
114116
U.combine(F.config['directory-src'], F.config['directory-source']),
115117
U.combine(F.config['directory-src'], F.config['directory-workers']),

‎index.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,7 @@ function Framework() {
541541
'directory-definitions': '/definitions/',
542542
'directory-temp': '/tmp/',
543543
'directory-models': '/models/',
544+
'directory-schemas': '/schemas/',
544545
'directory-resources': '/resources/',
545546
'directory-public': '/public/',
546547
'directory-public-virtual': '/app/',
@@ -3307,6 +3308,16 @@ F.$load = function(types, targetdirectory, callback, packageName) {
33073308
});
33083309
}
33093310

3311+
if (!types || types.indexOf('schemas') !== -1) {
3312+
operations.push(function(resume) {
3313+
dir = U.combine(targetdirectory, isPackage ? '/schemas/' : F.config['directory-schemas']);
3314+
arr = [];
3315+
listing(dir, 0, arr);
3316+
arr.forEach((item) => dependencies.push(next => F.install('schema', item.name, item.filename, undefined, undefined, undefined, true, undefined, undefined, next, packageName)));
3317+
resume();
3318+
});
3319+
}
3320+
33103321
if (!types || types.indexOf('themes') !== -1) {
33113322
operations.push(function(resume) {
33123323
arr = [];
@@ -3864,7 +3875,7 @@ F.install = function(type, name, declaration, options, callback, internal, useRe
38643875
return F;
38653876
}
38663877

3867-
if (type === 'definition' || type === 'eval') {
3878+
if (type === 'definition' || type === 'eval' || type === 'schema') {
38683879

38693880
_controller = '';
38703881
_owner = (packageName ? packageName + '@' : '') + type + '#' + name;

‎test/schemas/user.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
F.global.schemas = 1;

‎test/test-framework-debug.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ framework.on('load', function() {
905905
assert.ok(RESOURCE('default', 'name-root').length > 0, 'custom resource mapping 1');
906906
assert.ok(RESOURCE('default', 'name-theme').length > 0, 'custom resource mapping 2');
907907
assert.ok(F.global.newslettercomponent, 'components: inline <script type="text/totaljs"> --> newsletter');
908+
assert.ok(F.global.schemas === 1, 'schemas are not loaded');
908909

909910
var sa = F.sitemap_navigation();
910911
var sb = F.sitemap_navigation('b');

‎test/test-framework-release.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,7 @@ framework.on('load', function() {
887887
assert.ok(RESOURCE('default', 'name-root').length > 0, 'custom resource mapping 1');
888888
assert.ok(RESOURCE('default', 'name-theme').length > 0, 'custom resource mapping 2');
889889
assert.ok(F.global.newslettercomponent, 'components: inline <script type="text/totaljs"> --> newsletter');
890+
assert.ok(F.global.schemas === 1, 'schemas are not loaded');
890891

891892
var sa = F.sitemap_navigation();
892893
var sb = F.sitemap_navigation('b');

0 commit comments

Comments
 (0)