diff --git a/app/config/config.json b/app/config/config.json
index da92fc7..f135673 100644
--- a/app/config/config.json
+++ b/app/config/config.json
@@ -9,10 +9,10 @@
"viewsPath": "/app/views/",
"libsBaseClasses":[
{
- "path": "/EIC",
- "classes": [ "EICController", "EICDomContent", "EICDialogContent", "EICMetaData", "EICModel", "EICPluralModel", "EICBusModel" ],
- "dependencies" : { "EICPluralModel": [ "EICModel" ] }
- }
+ "path": "/Windoz",
+ "classes": [ "WindozController", "WindozDomContent", "WindozDialogContent", "WindozMetaData", "WindozModel", "WindozPluralModel", "WindozBusModel" ],
+ "dependencies" : { "WindozPluralModel": [ "WindozModel" ] }
+ }
],
"masterController": "EICAppController",
"defaultMasterTemplate": "templates/EICAppTemplate"
@@ -25,10 +25,10 @@
},
"userLib": {
"className": "myUser",
- "modelPath": "/app/models/myUserModel",
"checkauthEndpoint": "/api/checkauth",
"loginEndpoint": "/api/login",
"logoutEndpoint": "/api/logout",
+ "modelPath": "/app/models/myUserModel",
"keepAliveSeconds": 0
},
"messageBus":{
@@ -75,14 +75,14 @@
"setIndexPage": true
},
{
- "target": "eiclibs.js",
+ "target": "windozlibs.js",
"sources": [
- "/app/libs/EIC/EICController.js",
- "/app/libs/EIC/EICDialogContent.js",
- "/app/libs/EIC/EICDomContent.js",
- "/app/libs/EIC/EICMetaData.js",
- "/app/libs/EIC/EICModel.js",
- "/app/libs/EIC/EICPluralModel.js"
+ "/app/libs/Windoz/WindozController.js",
+ "/app/libs/Windoz/WindozDialogContent.js",
+ "/app/libs/Windoz/WindozDomContent.js",
+ "/app/libs/Windoz/WindozMetaData.js",
+ "/app/libs/Windoz/WindozModel.js",
+ "/app/libs/Windoz/WindozPluralModel.js"
],
"compressed": false,
"minify": false,
diff --git a/app/controllers/common/errorController.js b/app/controllers/common/errorController.js
index 35e926e..b87ed88 100755
--- a/app/controllers/common/errorController.js
+++ b/app/controllers/common/errorController.js
@@ -1,7 +1,7 @@
/**
*
*/
-class errorController extends EICController {
+class errorController extends WindozController {
/**
*
diff --git a/app/controllers/editors/EditorsController.js b/app/controllers/editors/EditorsController.js
index 15e0458..071af67 100644
--- a/app/controllers/editors/EditorsController.js
+++ b/app/controllers/editors/EditorsController.js
@@ -1,4 +1,7 @@
-class EditorsController extends EICController {
+
+
+
+class EditorsController extends WindozController {
constructor(params) {
super(params)
@@ -32,41 +35,21 @@ class EditorsController extends EICController {
this.loadWindow(
- 'editors/SpaceView',
+ 'editors/KeyFameView',
{
title: ' Keyframe edito 3D view',
static: true,
- expanded: false,
+ expanded: true,
withSettings: true,
- windowStyle: EICDomContent.boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }),
+ windowStyle: WindozDomContent.boxFromPrefs('editors.keyframe', { x: 50, y:50, w:1000, h:800 }),
},
{
models: models,
agentDefs: this.agentDefs,
- rendererId:'3drenderer',
- mode: '3D',
- ttb: ttb,
+ //ttb: ttb,
}
)
-
-
- this.loadWindow(
- 'editors/SpaceView',
- {
- title: ' Keyframe editor 2D View',
- static: true,
- expanded: false,
- withSettings: true,
- windowStyle: EICDomContent.boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }),
- },
- {
- models: models,
- agentDefs: this.agentDefs,
- rendererId:'2drenderer',
- mode: '2D',
- ttb: ttb,
- }
- )
+
}
async sprites() {
diff --git a/app/controllers/live/DashboardsController.js b/app/controllers/live/DashboardsController.js
index cce5286..fe57416 100644
--- a/app/controllers/live/DashboardsController.js
+++ b/app/controllers/live/DashboardsController.js
@@ -1,4 +1,4 @@
-class DashboardsController extends EICController {
+class DashboardsController extends WindozController {
constructor(params) {
super(params)
@@ -43,7 +43,7 @@ class DashboardsController extends EICController {
static: true,
expanded: false,
withSettings: true,
- windowStyle: EICDomContent.boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }),
+ windowStyle: WindozDomContent.boxFromPrefs('live.spaceview.3D', { x: 50, y:100, w:600, h:400 }),
},
{
models: models,
@@ -62,7 +62,7 @@ class DashboardsController extends EICController {
static: true,
expanded: false,
withSettings: true,
- windowStyle: EICDomContent.boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }),
+ windowStyle: WindozDomContent.boxFromPrefs('live.spaceview.2D', { x: 500, y:100, w:600, h:400 }),
},
{
models: models,
diff --git a/app/controllers/system/systemController.js b/app/controllers/system/systemController.js
index 009c288..e693188 100755
--- a/app/controllers/system/systemController.js
+++ b/app/controllers/system/systemController.js
@@ -1,4 +1,4 @@
-class systemController extends EICController {
+class systemController extends WindozController {
/**
* Platform access control
diff --git a/app/helpers/activeAttributes.js b/app/helpers/activeAttributes.js
index 95f9d10..ad5cbc3 100644
--- a/app/helpers/activeAttributes.js
+++ b/app/helpers/activeAttributes.js
@@ -1,7 +1,7 @@
if(!app.helpers) app.helpers = {}
/**
* Mixing add-in methods to your view instance.
- * All of this should not be a helper, but inherited this from EICDomContent, but not my framework anymore.
+ * All of this should not be a helper, but inherited this from WindozDomContent, but not my framework anymore.
* @category MyEic
*/
app.helpers.activeAttributes = {
@@ -12,7 +12,7 @@ app.helpers.activeAttributes = {
* setupTriggers is re-entrant: it can be called again after refreshing part of the view
* @param {eicui-components []} components : the view's components (usually result of ui.eicfy(this.el) )
*/
- setupTriggers(components){ // Should inherit this from EICDomContent, but not my framework anymore.
+ setupTriggers(components){ // Should inherit this from WindozDomContent, but not my framework anymore.
for(let component of components.filter(component => component.el.hasAttribute('data-trigger'))) {
if(typeof this[component.el.dataset.trigger] !== 'function') {
console.warn(`data-trigger without corresponding method : ${component.el.dataset.trigger}`)
diff --git a/app/libs/EIC/EICBusModel.js b/app/libs/Windoz/WindozBusModel.js
similarity index 93%
rename from app/libs/EIC/EICBusModel.js
rename to app/libs/Windoz/WindozBusModel.js
index c0f439a..c47bd4a 100644
--- a/app/libs/EIC/EICBusModel.js
+++ b/app/libs/Windoz/WindozBusModel.js
@@ -1,9 +1,9 @@
/**
* @category MyEic
* @subcategory Libraries
- * @extends EICModel
+ * @extends WindozModel
*/
-class EICBusModel extends EICModel{
+class WindozBusModel extends WindozModel{
/**
@@ -48,4 +48,4 @@ class EICBusModel extends EICModel{
}
}
-app.registerClass('EICBusModel', EICBusModel)
+app.registerClass('WindozBusModel', WindozBusModel)
diff --git a/app/libs/EIC/EICController.js b/app/libs/Windoz/WindozController.js
similarity index 97%
rename from app/libs/EIC/EICController.js
rename to app/libs/Windoz/WindozController.js
index c20637f..46336a0 100755
--- a/app/libs/EIC/EICController.js
+++ b/app/libs/Windoz/WindozController.js
@@ -3,7 +3,7 @@
* @subcategory Libraries
* @extends Controller
*/
-class EICController extends Controller {
+class WindozController extends Controller {
constructor() {
super();
@@ -170,19 +170,19 @@ class EICController extends Controller {
let promise = new Promise(function(resolve) {
if(typeof view === 'string') {
let message = view;
- view = new EICDialogContent();
+ view = new WindozDialogContent();
view.el = message;
}
- let dialog = EICController.createDialog(view);
+ let dialog = WindozController.createDialog(view);
function commit(result) {
- EICController.closeDialog(view._sparcId);
+ WindozController.closeDialog(view._sparcId);
resolve(result);
}
function abort(result) {
- EICController.closeDialog(view._sparcId);
+ WindozController.closeDialog(view._sparcId);
resolve(result);
}
@@ -374,4 +374,4 @@ class EICController extends Controller {
}
-app.registerClass('EICController', EICController);
\ No newline at end of file
+app.registerClass('WindozController', WindozController);
\ No newline at end of file
diff --git a/app/libs/EIC/EICDialogContent.js b/app/libs/Windoz/WindozDialogContent.js
similarity index 94%
rename from app/libs/EIC/EICDialogContent.js
rename to app/libs/Windoz/WindozDialogContent.js
index ed6c781..4a896a8 100755
--- a/app/libs/EIC/EICDialogContent.js
+++ b/app/libs/Windoz/WindozDialogContent.js
@@ -3,7 +3,7 @@
* @subcategory Libraries
* @extends View
*/
-class EICDialogContent extends View {
+class WindozDialogContent extends View {
icon = null;
@@ -73,4 +73,4 @@ class EICDialogContent extends View {
}
-app.registerClass('EICDialogContent', EICDialogContent);
\ No newline at end of file
+app.registerClass('WindozDialogContent', WindozDialogContent);
\ No newline at end of file
diff --git a/app/libs/EIC/EICDomContent.js b/app/libs/Windoz/WindozDomContent.js
similarity index 91%
rename from app/libs/EIC/EICDomContent.js
rename to app/libs/Windoz/WindozDomContent.js
index e9118bd..489dc96 100755
--- a/app/libs/EIC/EICDomContent.js
+++ b/app/libs/Windoz/WindozDomContent.js
@@ -3,7 +3,7 @@
* @subcategory Libraries
* @extends View
*/
-class EICDomContent extends View {
+class WindozDomContent extends View {
icon = null;
@@ -57,19 +57,19 @@ class EICDomContent extends View {
let promise = new Promise(function(resolve) {
if(typeof view === 'string') {
let content = view;
- view = new EICDialogContent();
+ view = new WindozDialogContent();
view.el = content;
}
- let dialog = EICController.createDialog(view);
+ let dialog = WindozController.createDialog(view);
function commit(result) {
- EICController.closeDialog(view._sparcId);
+ WindozController.closeDialog(view._sparcId);
resolve(result);
}
function abort(result) {
- EICController.closeDialog(view._sparcId);
+ WindozController.closeDialog(view._sparcId);
resolve(result);
}
@@ -270,11 +270,19 @@ class EICDomContent extends View {
app.User.preferences.windows
)
}
+ let top, left, width, height
const box = getPref(viewName)
- let left = box.x ? box.x : defaults.x
- let top = box.y ? box.y : defaults.y
- let width = box.w ? box.w : defaults.w
- let height = box.x ? box.h : defaults.h
+ if(box){
+ left = box.x ? box.x : defaults.x
+ top = box.y ? box.y : defaults.y
+ width = box.w ? box.w : defaults.w
+ height = box.x ? box.h : defaults.h
+ } else {
+ left = defaults.x
+ top = defaults.y
+ width = defaults.w
+ height = defaults.h
+ }
return({
width: `${width}px`,
height: `${height}px`,
@@ -284,4 +292,4 @@ class EICDomContent extends View {
}
}
-app.registerClass('EICDomContent', EICDomContent);
\ No newline at end of file
+app.registerClass('WindozDomContent', WindozDomContent);
\ No newline at end of file
diff --git a/app/libs/EIC/EICMetaData.js b/app/libs/Windoz/WindozMetaData.js
similarity index 97%
rename from app/libs/EIC/EICMetaData.js
rename to app/libs/Windoz/WindozMetaData.js
index 99f52cc..f6a3faa 100755
--- a/app/libs/EIC/EICMetaData.js
+++ b/app/libs/Windoz/WindozMetaData.js
@@ -6,7 +6,7 @@
* @category MyEic
* @subcategory Libraries
*/
-class EICMetaData {
+class WindozMetaData {
collections = {};
@@ -119,5 +119,5 @@ class EICMetaData {
}
}
-app.registerClass('EICMetaData',EICMetaData);
-app.meta = new EICMetaData();
\ No newline at end of file
+app.registerClass('WindozMetaData',WindozMetaData);
+app.meta = new WindozMetaData();
\ No newline at end of file
diff --git a/app/libs/EIC/EICModel.js b/app/libs/Windoz/WindozModel.js
similarity index 98%
rename from app/libs/EIC/EICModel.js
rename to app/libs/Windoz/WindozModel.js
index a8adca4..945bed8 100755
--- a/app/libs/EIC/EICModel.js
+++ b/app/libs/Windoz/WindozModel.js
@@ -8,7 +8,7 @@
* @subcategory Libraries
* @extends Model
*/
-class EICModel extends Model {
+class WindozModel extends Model {
// data container for the item
itemData = {};
@@ -139,5 +139,5 @@ class EICModel extends Model {
}
}
-app.registerClass('EICModel',EICModel);
+app.registerClass('WindozModel',WindozModel);
diff --git a/app/libs/EIC/EICPluralModel.js b/app/libs/Windoz/WindozPluralModel.js
similarity index 98%
rename from app/libs/EIC/EICPluralModel.js
rename to app/libs/Windoz/WindozPluralModel.js
index cc18fe5..158d6fd 100644
--- a/app/libs/EIC/EICPluralModel.js
+++ b/app/libs/Windoz/WindozPluralModel.js
@@ -2,9 +2,9 @@
* @author Nicolas Stein
* @category MyEic
* @subcategory Libraries
- * @extends EICModel
+ * @extends WindozModel
*/
-class EICPluralModel extends EICModel {
+class WindozPluralModel extends WindozModel {
constructor(businessObject, privileges, singletonClass) {
super(businessObject, privileges);
@@ -243,4 +243,4 @@ class EICPluralModel extends EICModel {
}
-app.registerClass('EICPluralModel',EICPluralModel);
\ No newline at end of file
+app.registerClass('WindozPluralModel',WindozPluralModel);
\ No newline at end of file
diff --git a/app/models/AgentsModel.js b/app/models/AgentsModel.js
index 7a997ab..450fbf6 100644
--- a/app/models/AgentsModel.js
+++ b/app/models/AgentsModel.js
@@ -1,4 +1,4 @@
-class AgentsModel extends EICModel {
+class AgentsModel extends WindozModel {
constructor() {
super()
diff --git a/app/views/common/profile/dialogs/ProfilePreferencesResetDialog.js b/app/views/common/profile/dialogs/ProfilePreferencesResetDialog.js
index d3f1c04..8d0d6d9 100644
--- a/app/views/common/profile/dialogs/ProfilePreferencesResetDialog.js
+++ b/app/views/common/profile/dialogs/ProfilePreferencesResetDialog.js
@@ -1,4 +1,4 @@
-class ProfilePreferencesResetDialog extends EICDialogContent {
+class ProfilePreferencesResetDialog extends WindozDialogContent {
actions = [
{
label: 'Cancel',
diff --git a/app/views/common/profile/myProfileView.js b/app/views/common/profile/myProfileView.js
index 40cc569..4e1750c 100644
--- a/app/views/common/profile/myProfileView.js
+++ b/app/views/common/profile/myProfileView.js
@@ -1,4 +1,4 @@
-class myProfileView extends EICDomContent {
+class myProfileView extends WindozDomContent {
DOMContentLoaded() {
ui.eicfy(this.el)
diff --git a/app/views/editors/KeyframeView.js b/app/views/editors/KeyframeView.js
index 23283a3..8d1c6ff 100644
--- a/app/views/editors/KeyframeView.js
+++ b/app/views/editors/KeyframeView.js
@@ -1,4 +1,4 @@
-class KeyframeView extends EICDomContent {
+class KeyframeView extends WindozDomContent {
constructor() {
super()
diff --git a/app/views/system/tools/EICUIView.js b/app/views/system/tools/EICUIView.js
index 38d028c..8bcd970 100644
--- a/app/views/system/tools/EICUIView.js
+++ b/app/views/system/tools/EICUIView.js
@@ -1,4 +1,4 @@
-class EICUIView extends EICDomContent {
+class EICUIView extends WindozDomContent {
DOMContentLoaded() {
diff --git a/app/views/system/tools/dialogs/codeTemplateDialog.js b/app/views/system/tools/dialogs/codeTemplateDialog.js
index b50e247..6d9bb22 100644
--- a/app/views/system/tools/dialogs/codeTemplateDialog.js
+++ b/app/views/system/tools/dialogs/codeTemplateDialog.js
@@ -1,4 +1,4 @@
-class codeTemplateDialog extends EICDialogContent {
+class codeTemplateDialog extends WindozDialogContent {
actions = [
{
diff --git a/app/views/system/tools/statusView.js b/app/views/system/tools/statusView.js
index 3f44b1f..c352dbc 100755
--- a/app/views/system/tools/statusView.js
+++ b/app/views/system/tools/statusView.js
@@ -1,4 +1,4 @@
-class statusView extends EICDomContent {
+class statusView extends WindozDomContent {
times = [];
fps;
diff --git a/app/views/system/tools/styleguideView.js b/app/views/system/tools/styleguideView.js
index 83d0a4f..b6b2b11 100755
--- a/app/views/system/tools/styleguideView.js
+++ b/app/views/system/tools/styleguideView.js
@@ -1,4 +1,4 @@
-class styleguideView extends EICDomContent {
+class styleguideView extends WindozDomContent {
DOMContentLoaded() {
diff --git a/app/views/templates/EICAppTemplate.js b/app/views/templates/EICAppTemplate.js
index e0c12c5..12ba92c 100755
--- a/app/views/templates/EICAppTemplate.js
+++ b/app/views/templates/EICAppTemplate.js
@@ -4,9 +4,9 @@
* @category MyEic
* @subcategory Views
*
- * @extends EICDialogContent
+ * @extends WindozDialogContent
*/
-class EICAppTemplate extends EICDomContent {
+class EICAppTemplate extends WindozDomContent {
DOMContentLoaded() {
ui.init({ariaEnabled: true});
@@ -20,7 +20,7 @@ class EICAppTemplate extends EICDomContent {
this.loadAppMenu('global/app-menu-map.json');
}
- onGlobalResize() { EICController.resize(); }
+ onGlobalResize() { WindozController.resize(); }
loadAppMenu(source) {
app.Assets.loadJson({ name: source})
diff --git a/app/views/templates/dialogs/ConfirmDialog.js b/app/views/templates/dialogs/ConfirmDialog.js
index c9c6370..e76c555 100644
--- a/app/views/templates/dialogs/ConfirmDialog.js
+++ b/app/views/templates/dialogs/ConfirmDialog.js
@@ -2,9 +2,9 @@
* @category MyEic
* @subcategory Views
*
- * @extends EICDialogContent
+ * @extends WindozDialogContent
*/
-class ConfirmDialog extends EICDialogContent {
+class ConfirmDialog extends WindozDialogContent {
actions = [
{
diff --git a/app/views/visualisers/SpaceView.js b/app/views/visualisers/SpaceView.js
index b4f22e8..be84031 100644
--- a/app/views/visualisers/SpaceView.js
+++ b/app/views/visualisers/SpaceView.js
@@ -1,4 +1,4 @@
-class SpaceView extends EICDomContent {
+class SpaceView extends WindozDomContent {
constructor() {
super()