Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
Vikas Burman authored and Vikas Burman committed May 13, 2019
1 parent 5a5aed5 commit 95d74f1
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 25 deletions.
10 changes: 6 additions & 4 deletions dist/flair.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Assembly: flair.app
* File: ./flair.app.js
* Version: 0.6.82
* Mon, 13 May 2019 19:15:31 GMT
* Version: 0.6.84
* Mon, 13 May 2019 19:21:49 GMT
*
* (c) 2017-2019 Vikas Burman
* MIT
Expand Down Expand Up @@ -701,12 +701,14 @@
};
const loadPreambles = async () => {
// load preambles
let preambleLoader = null;
for(let item of settings.boot.preambles) {
// get simple script file
item = which(item); // server/client specific version (although this will not be the case, generally)
if (item) { // in case no item is set for either server/client
// this loads it as a function which is called here
await include(item)(flair);
preambleLoader = await include(item);
preambleLoader(flair);
}
}
};
Expand Down Expand Up @@ -2519,7 +2521,7 @@
AppDomain.context.current().currentAssemblyBeingLoaded('');

// register assembly definition object
AppDomain.registerAdo('{"name":"flair.app","file":"./flair.app{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.82","lupdate":"Mon, 13 May 2019 19:15:31 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["flair.app.Bootware","flair.app.Handler","flair.app.App","flair.app.Host","flair.ui.vue.VueComponentMembers","flair.api.RestHandler","flair.api.RestInterceptor","flair.app.BootEngine","flair.app.ClientHost","flair.app.ServerHost","flair.boot.ClientRouter","flair.boot.DIContainer","flair.boot.Middlewares","flair.boot.NodeEnv","flair.boot.ResHeaders","flair.boot.ServerRouter","flair.ui.ViewHandler","flair.ui.ViewInterceptor","flair.ui.ViewState","flair.ui.ViewTransition","flair.ui.vue.VueComponent","flair.ui.vue.VueDirective","flair.ui.vue.VueFilter","flair.ui.vue.VueLayout","flair.ui.vue.VueMixin","flair.ui.vue.VuePlugin","flair.ui.vue.VueSetup","flair.ui.vue.VueView"],"resources":[],"assets":[],"routes":[]}');
AppDomain.registerAdo('{"name":"flair.app","file":"./flair.app{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.84","lupdate":"Mon, 13 May 2019 19:21:49 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["flair.app.Bootware","flair.app.Handler","flair.app.App","flair.app.Host","flair.ui.vue.VueComponentMembers","flair.api.RestHandler","flair.api.RestInterceptor","flair.app.BootEngine","flair.app.ClientHost","flair.app.ServerHost","flair.boot.ClientRouter","flair.boot.DIContainer","flair.boot.Middlewares","flair.boot.NodeEnv","flair.boot.ResHeaders","flair.boot.ServerRouter","flair.ui.ViewHandler","flair.ui.ViewInterceptor","flair.ui.ViewState","flair.ui.ViewTransition","flair.ui.vue.VueComponent","flair.ui.vue.VueDirective","flair.ui.vue.VueFilter","flair.ui.vue.VueLayout","flair.ui.vue.VueMixin","flair.ui.vue.VuePlugin","flair.ui.vue.VueSetup","flair.ui.vue.VueView"],"resources":[],"assets":[],"routes":[]}');

// assembly load complete
if (typeof onLoadComplete === 'function') {
Expand Down
6 changes: 3 additions & 3 deletions dist/flair.app.min.js

Large diffs are not rendered by default.

Binary file modified dist/flair.app.min.js.gz
Binary file not shown.
10 changes: 5 additions & 5 deletions dist/flair.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Assembly: flair
* File: ./flair.js
* Version: 0.6.82
* Mon, 13 May 2019 19:15:28 GMT
* Version: 0.6.84
* Mon, 13 May 2019 19:21:46 GMT
*
* (c) 2017-2019 Vikas Burman
* MIT
Expand Down Expand Up @@ -7022,10 +7022,10 @@
name: 'flairjs',
title: 'Flair.js',
file: currentFile,
version: '0.6.82',
version: '0.6.84',
copyright: '(c) 2017-2019 Vikas Burman',
license: 'MIT',
lupdate: new Date('Mon, 13 May 2019 19:15:28 GMT')
lupdate: new Date('Mon, 13 May 2019 19:21:46 GMT')
});

// bundled assembly load process
Expand Down Expand Up @@ -7422,7 +7422,7 @@
AppDomain.context.current().currentAssemblyBeingLoaded('');

// register assembly definition object
AppDomain.registerAdo('{"name":"flair","file":"./flair{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.82","lupdate":"Mon, 13 May 2019 19:15:28 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["Aspect","Attribute","IDisposable","IProgressReporter","Task"],"resources":[],"assets":[],"routes":[]}');
AppDomain.registerAdo('{"name":"flair","file":"./flair{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.84","lupdate":"Mon, 13 May 2019 19:21:46 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["Aspect","Attribute","IDisposable","IProgressReporter","Task"],"resources":[],"assets":[],"routes":[]}');

// assembly load complete
if (typeof onLoadComplete === 'function') {
Expand Down
6 changes: 3 additions & 3 deletions dist/flair.min.js

Large diffs are not rendered by default.

Binary file modified dist/flair.min.js.gz
Binary file not shown.
6 changes: 3 additions & 3 deletions dist/preamble.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @preserve
* Preamble for assemblies at: ./
* Created: Mon, 13 May 2019 19:15:32 GMT
* Created: Mon, 13 May 2019 19:21:50 GMT
*/
(function(root, loader) {
'use strict';
Expand All @@ -19,7 +19,7 @@
})(this, function(flair) {
'use strict';

flair.AppDomain.registerAdo(JSON.parse('{"name":"flair","file":"./flair{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.82","lupdate":"Mon, 13 May 2019 19:15:28 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["Aspect","Attribute","IDisposable","IProgressReporter","Task"],"resources":[],"assets":[],"routes":[]}'));
flair.AppDomain.registerAdo(JSON.parse('{"name":"flair.app","file":"./flair.app{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.82","lupdate":"Mon, 13 May 2019 19:15:31 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["flair.app.Bootware","flair.app.Handler","flair.app.App","flair.app.Host","flair.ui.vue.VueComponentMembers","flair.api.RestHandler","flair.api.RestInterceptor","flair.app.BootEngine","flair.app.ClientHost","flair.app.ServerHost","flair.boot.ClientRouter","flair.boot.DIContainer","flair.boot.Middlewares","flair.boot.NodeEnv","flair.boot.ResHeaders","flair.boot.ServerRouter","flair.ui.ViewHandler","flair.ui.ViewInterceptor","flair.ui.ViewState","flair.ui.ViewTransition","flair.ui.vue.VueComponent","flair.ui.vue.VueDirective","flair.ui.vue.VueFilter","flair.ui.vue.VueLayout","flair.ui.vue.VueMixin","flair.ui.vue.VuePlugin","flair.ui.vue.VueSetup","flair.ui.vue.VueView"],"resources":[],"assets":[],"routes":[]}'));
flair.AppDomain.registerAdo(JSON.parse('{"name":"flair","file":"./flair{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.84","lupdate":"Mon, 13 May 2019 19:21:46 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["Aspect","Attribute","IDisposable","IProgressReporter","Task"],"resources":[],"assets":[],"routes":[]}'));
flair.AppDomain.registerAdo(JSON.parse('{"name":"flair.app","file":"./flair.app{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.84","lupdate":"Mon, 13 May 2019 19:21:49 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["flair.app.Bootware","flair.app.Handler","flair.app.App","flair.app.Host","flair.ui.vue.VueComponentMembers","flair.api.RestHandler","flair.api.RestInterceptor","flair.app.BootEngine","flair.app.ClientHost","flair.app.ServerHost","flair.boot.ClientRouter","flair.boot.DIContainer","flair.boot.Middlewares","flair.boot.NodeEnv","flair.boot.ResHeaders","flair.boot.ServerRouter","flair.ui.ViewHandler","flair.ui.ViewInterceptor","flair.ui.ViewState","flair.ui.ViewTransition","flair.ui.vue.VueComponent","flair.ui.vue.VueDirective","flair.ui.vue.VueFilter","flair.ui.vue.VueLayout","flair.ui.vue.VueMixin","flair.ui.vue.VuePlugin","flair.ui.vue.VueSetup","flair.ui.vue.VueView"],"resources":[],"assets":[],"routes":[]}'));

});
10 changes: 5 additions & 5 deletions docs/v1/examples/js/flair.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Assembly: flair
* File: ./flair.js
* Version: 0.6.82
* Mon, 13 May 2019 19:15:28 GMT
* Version: 0.6.84
* Mon, 13 May 2019 19:21:46 GMT
*
* (c) 2017-2019 Vikas Burman
* MIT
Expand Down Expand Up @@ -7022,10 +7022,10 @@
name: 'flairjs',
title: 'Flair.js',
file: currentFile,
version: '0.6.82',
version: '0.6.84',
copyright: '(c) 2017-2019 Vikas Burman',
license: 'MIT',
lupdate: new Date('Mon, 13 May 2019 19:15:28 GMT')
lupdate: new Date('Mon, 13 May 2019 19:21:46 GMT')
});

// bundled assembly load process
Expand Down Expand Up @@ -7422,7 +7422,7 @@
AppDomain.context.current().currentAssemblyBeingLoaded('');

// register assembly definition object
AppDomain.registerAdo('{"name":"flair","file":"./flair{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.82","lupdate":"Mon, 13 May 2019 19:15:28 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["Aspect","Attribute","IDisposable","IProgressReporter","Task"],"resources":[],"assets":[],"routes":[]}');
AppDomain.registerAdo('{"name":"flair","file":"./flair{.min}.js","mainAssembly":"flair","desc":"True Object Oriented JavaScript","title":"Flair.js","version":"0.6.84","lupdate":"Mon, 13 May 2019 19:21:46 GMT","builder":{"name":"flairBuild","version":"1","format":"fasm","formatVersion":"1","contains":["init","func","type","vars","reso","asst","rout","sreg"]},"copyright":"(c) 2017-2019 Vikas Burman","license":"MIT","types":["Aspect","Attribute","IDisposable","IProgressReporter","Task"],"resources":[],"assets":[],"routes":[]}');

// assembly load complete
if (typeof onLoadComplete === 'function') {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Flair.js",
"description": "True Object Oriented JavaScript",
"copyright": "(c) 2017-2019 Vikas Burman",
"version": "0.6.82",
"version": "0.6.84",
"author": "Vikas Burman <[email protected]>",
"keywords": [
"javascript",
Expand Down
4 changes: 3 additions & 1 deletion src/flair.app/flair.app/BootEngine.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ Class('(auto)', function() {
};
const loadPreambles = async () => {
// load preambles
let preambleLoader = null;
for(let item of settings.boot.preambles) {
// get simple script file
item = which(item); // server/client specific version (although this will not be the case, generally)
if (item) { // in case no item is set for either server/client
// this loads it as a function which is called here
await include(item)(flair);
preambleLoader = await include(item);
preambleLoader(flair);
}
}
};
Expand Down

0 comments on commit 95d74f1

Please sign in to comment.