From efe36f4f1b5df351eeb4d40a54c3900cf9a7079b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
<aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 13 Sep 2013 14:37:32 +0200
Subject: [PATCH 1/1] Refactoring: cleaning directories structure
---
Gruntfile.js | 8 ++--
karma.conf.js | 10 +----
entrypoint.js => src/editor/entrypoint.js | 26 ++++++++-----
modules.js => src/editor/modules.js | 0
{modules => src/editor/modules}/data/data.js | 0
.../editor/modules}/data/data.less | 0
.../editor/modules}/data/saveDialog.html | 0
.../editor/modules}/data/saveDialog.js | 0
.../editor/modules}/data/saveDialog.less | 0
.../editor/modules}/diffViewer/diff.html | 0
.../editor/modules}/diffViewer/diffViewer.js | 0
.../modules}/diffViewer/diffViewer.less | 0
.../modules}/documentCanvas/canvas/canvas.js | 0
.../documentCanvas/canvas/canvas.test.js | 0
.../documentCanvas/canvas/documentElement.js | 0
.../documentCanvas/canvas/keyboard.js | 0
.../modules}/documentCanvas/canvas/utils.js | 0
.../documentCanvas/canvas/utils.test.js | 0
.../modules}/documentCanvas/canvas/widgets.js | 0
.../documentCanvas/canvas/widgets.less | 0
.../documentCanvas/canvas/wlxmlManagers.js | 0
.../documentCanvas/classAttributes.js | 0
.../modules}/documentCanvas/commands.js | 0
.../modules}/documentCanvas/documentCanvas.js | 0
.../documentCanvas/documentCanvas.less | 0
.../editor/modules}/documentCanvas/nodes.less | 0
.../modules}/documentCanvas/template.html | 0
.../tests/classAttributes.test.js | 0
.../documentHistory/documentHistory.js | 0
.../documentHistory/documentHistory.less | 0
.../modules}/documentHistory/restoreDialog.js | 0
.../documentHistory/templates/item.html | 0
.../documentHistory/templates/main.html | 0
.../templates/restoreDialog.html | 0
.../documentToolbar/documentToolbar.js | 0
.../documentToolbar/documentToolbar.less | 0
.../modules}/documentToolbar/template.html | 0
.../editor/modules}/indicator/indicator.js | 0
.../editor/modules}/indicator/indicator.less | 0
.../editor/modules}/indicator/template.html | 0
.../editor/modules}/mainBar/mainBar.js | 0
.../editor/modules}/mainBar/mainBar.less | 0
.../editor/modules}/mainBar/template.html | 0
.../modules}/metadataEditor/metadataEditor.js | 0
.../metadataEditor/metadataEditor.less | 0
.../metadataEditor/templates/item.html | 0
.../metadataEditor/templates/main.html | 0
.../metadataEditor/transformations.js | 0
.../nodeBreadCrumbs/nodeBreadCrumbs.js | 0
.../modules}/nodeBreadCrumbs/template.html | 0
.../modules}/nodeFamilyTree/nodeFamilyTree.js | 0
.../nodeFamilyTree/nodeFamilyTree.less | 0
.../modules}/nodeFamilyTree/template.html | 0
.../nodePane/metaWidget/metaWidget.js | 0
.../nodePane/metaWidget/metaWidget.test.js | 0
.../nodePane/metaWidget/stringField.html | 0
.../editor/modules}/nodePane/nodePane.js | 0
.../editor/modules}/nodePane/nodePane.less | 0
.../editor/modules}/nodePane/template.html | 0
.../editor/modules}/rng/diffLayout.html | 0
.../editor/modules}/rng/diffLayout.less | 0
.../editor/modules}/rng/editingLayout.html | 0
.../editor/modules}/rng/editingLayout.less | 0
.../editor/modules}/rng/mainLayout.html | 0
.../editor/modules}/rng/mainLayout.less | 0
{modules => src/editor/modules}/rng/rng.js | 0
{modules => src/editor/modules}/rng/rng.less | 0
.../modules}/sourceEditor/sourceEditor.js | 0
.../modules}/sourceEditor/sourceEditor.less | 0
rng.js => src/editor/rng.js | 0
{styles => src/editor/styles}/common.less | 0
{styles => src/editor/styles}/main.less | 0
{styles => src/editor/styles}/mixins.less | 0
{utils => src/editor/utils}/wlxml.js | 0
{views => src/editor/views}/tabs/tabs.js | 0
.../editor/views}/tabs/templates/handle.html | 0
.../editor/views}/tabs/templates/main.html | 0
{fnpjs => src/fnpjs}/layout.js | 0
{fnpjs => src/fnpjs}/runner.js | 0
{fnpjs => src/fnpjs}/vbox.js | 0
tests/main.js | 38 ++++++++++++-------
81 files changed, 47 insertions(+), 35 deletions(-)
rename entrypoint.js => src/editor/entrypoint.js (55%)
rename modules.js => src/editor/modules.js (100%)
rename {modules => src/editor/modules}/data/data.js (100%)
rename {modules => src/editor/modules}/data/data.less (100%)
rename {modules => src/editor/modules}/data/saveDialog.html (100%)
rename {modules => src/editor/modules}/data/saveDialog.js (100%)
rename {modules => src/editor/modules}/data/saveDialog.less (100%)
rename {modules => src/editor/modules}/diffViewer/diff.html (100%)
rename {modules => src/editor/modules}/diffViewer/diffViewer.js (100%)
rename {modules => src/editor/modules}/diffViewer/diffViewer.less (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/canvas.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/canvas.test.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/documentElement.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/keyboard.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/utils.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/utils.test.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/widgets.js (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/widgets.less (100%)
rename {modules => src/editor/modules}/documentCanvas/canvas/wlxmlManagers.js (100%)
rename {modules => src/editor/modules}/documentCanvas/classAttributes.js (100%)
rename {modules => src/editor/modules}/documentCanvas/commands.js (100%)
rename {modules => src/editor/modules}/documentCanvas/documentCanvas.js (100%)
rename {modules => src/editor/modules}/documentCanvas/documentCanvas.less (100%)
rename {modules => src/editor/modules}/documentCanvas/nodes.less (100%)
rename {modules => src/editor/modules}/documentCanvas/template.html (100%)
rename {modules => src/editor/modules}/documentCanvas/tests/classAttributes.test.js (100%)
rename {modules => src/editor/modules}/documentHistory/documentHistory.js (100%)
rename {modules => src/editor/modules}/documentHistory/documentHistory.less (100%)
rename {modules => src/editor/modules}/documentHistory/restoreDialog.js (100%)
rename {modules => src/editor/modules}/documentHistory/templates/item.html (100%)
rename {modules => src/editor/modules}/documentHistory/templates/main.html (100%)
rename {modules => src/editor/modules}/documentHistory/templates/restoreDialog.html (100%)
rename {modules => src/editor/modules}/documentToolbar/documentToolbar.js (100%)
rename {modules => src/editor/modules}/documentToolbar/documentToolbar.less (100%)
rename {modules => src/editor/modules}/documentToolbar/template.html (100%)
rename {modules => src/editor/modules}/indicator/indicator.js (100%)
rename {modules => src/editor/modules}/indicator/indicator.less (100%)
rename {modules => src/editor/modules}/indicator/template.html (100%)
rename {modules => src/editor/modules}/mainBar/mainBar.js (100%)
rename {modules => src/editor/modules}/mainBar/mainBar.less (100%)
rename {modules => src/editor/modules}/mainBar/template.html (100%)
rename {modules => src/editor/modules}/metadataEditor/metadataEditor.js (100%)
rename {modules => src/editor/modules}/metadataEditor/metadataEditor.less (100%)
rename {modules => src/editor/modules}/metadataEditor/templates/item.html (100%)
rename {modules => src/editor/modules}/metadataEditor/templates/main.html (100%)
rename {modules => src/editor/modules}/metadataEditor/transformations.js (100%)
rename {modules => src/editor/modules}/nodeBreadCrumbs/nodeBreadCrumbs.js (100%)
rename {modules => src/editor/modules}/nodeBreadCrumbs/template.html (100%)
rename {modules => src/editor/modules}/nodeFamilyTree/nodeFamilyTree.js (100%)
rename {modules => src/editor/modules}/nodeFamilyTree/nodeFamilyTree.less (100%)
rename {modules => src/editor/modules}/nodeFamilyTree/template.html (100%)
rename {modules => src/editor/modules}/nodePane/metaWidget/metaWidget.js (100%)
rename {modules => src/editor/modules}/nodePane/metaWidget/metaWidget.test.js (100%)
rename {modules => src/editor/modules}/nodePane/metaWidget/stringField.html (100%)
rename {modules => src/editor/modules}/nodePane/nodePane.js (100%)
rename {modules => src/editor/modules}/nodePane/nodePane.less (100%)
rename {modules => src/editor/modules}/nodePane/template.html (100%)
rename {modules => src/editor/modules}/rng/diffLayout.html (100%)
rename {modules => src/editor/modules}/rng/diffLayout.less (100%)
rename {modules => src/editor/modules}/rng/editingLayout.html (100%)
rename {modules => src/editor/modules}/rng/editingLayout.less (100%)
rename {modules => src/editor/modules}/rng/mainLayout.html (100%)
rename {modules => src/editor/modules}/rng/mainLayout.less (100%)
rename {modules => src/editor/modules}/rng/rng.js (100%)
rename {modules => src/editor/modules}/rng/rng.less (100%)
rename {modules => src/editor/modules}/sourceEditor/sourceEditor.js (100%)
rename {modules => src/editor/modules}/sourceEditor/sourceEditor.less (100%)
rename rng.js => src/editor/rng.js (100%)
rename {styles => src/editor/styles}/common.less (100%)
rename {styles => src/editor/styles}/main.less (100%)
rename {styles => src/editor/styles}/mixins.less (100%)
rename {utils => src/editor/utils}/wlxml.js (100%)
rename {views => src/editor/views}/tabs/tabs.js (100%)
rename {views => src/editor/views}/tabs/templates/handle.html (100%)
rename {views => src/editor/views}/tabs/templates/main.html (100%)
rename {fnpjs => src/fnpjs}/layout.js (100%)
rename {fnpjs => src/fnpjs}/runner.js (100%)
rename {fnpjs => src/fnpjs}/vbox.js (100%)
diff --git a/Gruntfile.js b/Gruntfile.js
index 8b7469e..55ee1c8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,8 +4,8 @@ module.exports = function(grunt) {
requirejs: {
compile: {
options: {
- baseUrl: '',
- mainConfigFile: 'entrypoint.js',
+ baseUrl: 'src/editor',
+ mainConfigFile: 'src/editor/entrypoint.js',
out: 'build/rng.js',
name: 'entrypoint',
include: ['libs/require']
@@ -19,12 +19,12 @@ module.exports = function(grunt) {
yuicompress: true
},
files: {
- 'build/rng.css': 'styles/main.less'
+ 'build/rng.css': 'src/editor/styles/main.less'
},
},
},
jshint: {
- all: ['Gruntfile.js', 'modules/**/*.js', 'views/**/*.js', 'fnpjs/**/*.js'],
+ all: ['Gruntfile.js', 'src/**/*.js'],
options: {
jshintrc: '.jshintrc'
}
diff --git a/karma.conf.js b/karma.conf.js
index ea3a375..e498786 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -8,14 +8,8 @@ files = [
'vkbeautify.js',
{pattern: 'libs/*.js', included: false},
- {pattern: 'fnpjs/**/*.js', included: false},
- {pattern: 'modules/**/*.js', included: false},
- {pattern: 'utils/**/*.js', included: false},
- {pattern: 'views/**/*.js', included: false},
- {pattern: 'fnpjs/**/*.html', included: false},
- {pattern: 'modules/**/*.html', included: false},
- {pattern: 'views/**/*.html', included: false},
-
+ {pattern: 'src/**/*.js', included: false},
+ {pattern: 'src/**/*.html', included: false},
'tests/main.js',
];
diff --git a/entrypoint.js b/src/editor/entrypoint.js
similarity index 55%
rename from entrypoint.js
rename to src/editor/entrypoint.js
index 251151e..5e546ef 100644
--- a/entrypoint.js
+++ b/src/editor/entrypoint.js
@@ -2,29 +2,35 @@
'use strict';
requirejs.config({
- baseUrl: '/static/editor',
+ baseUrl: '/static/editor/src/editor',
+ paths: {
+ 'fnpjs': '../fnpjs',
+ 'libs': '../../libs'
+ },
+
map: {
'*':
{
- 'libs/jquery': 'libs/jquery-1.9.1.min',
- 'libs/underscore': 'libs/underscore-min',
- 'libs/bootstrap': 'libs/bootstrap/js/bootstrap.min',
- 'libs/backbone': 'libs/backbone-min'
+ 'libs/jquery': '../../libs/jquery-1.9.1.min',
+ 'libs/underscore': '../../libs/underscore-min',
+ 'libs/bootstrap': '../../libs/bootstrap/js/bootstrap.min',
+ 'libs/backbone': '../../libs/backbone-min',
+
}
},
shim: {
- 'libs/jquery-1.9.1.min': {
+ '../../libs/jquery-1.9.1.min': {
exports: '$',
},
- 'libs/underscore-min': {
+ '../../libs/underscore-min': {
exports: '_'
},
- 'libs/bootstrap/js/bootstrap.min': {
+ '../../libs/bootstrap/js/bootstrap.min': {
deps: ['libs/jquery']
},
- 'libs/backbone-min': {
+ '../../libs/backbone-min': {
exports: 'Backbone',
deps: ['libs/jquery', 'libs/underscore']
}
@@ -34,7 +40,7 @@
requirejs([
'libs/jquery',
- 'fnpjs/runner',
+ '../fnpjs/runner',
'rng',
'./modules',
'libs/bootstrap'
diff --git a/modules.js b/src/editor/modules.js
similarity index 100%
rename from modules.js
rename to src/editor/modules.js
diff --git a/modules/data/data.js b/src/editor/modules/data/data.js
similarity index 100%
rename from modules/data/data.js
rename to src/editor/modules/data/data.js
diff --git a/modules/data/data.less b/src/editor/modules/data/data.less
similarity index 100%
rename from modules/data/data.less
rename to src/editor/modules/data/data.less
diff --git a/modules/data/saveDialog.html b/src/editor/modules/data/saveDialog.html
similarity index 100%
rename from modules/data/saveDialog.html
rename to src/editor/modules/data/saveDialog.html
diff --git a/modules/data/saveDialog.js b/src/editor/modules/data/saveDialog.js
similarity index 100%
rename from modules/data/saveDialog.js
rename to src/editor/modules/data/saveDialog.js
diff --git a/modules/data/saveDialog.less b/src/editor/modules/data/saveDialog.less
similarity index 100%
rename from modules/data/saveDialog.less
rename to src/editor/modules/data/saveDialog.less
diff --git a/modules/diffViewer/diff.html b/src/editor/modules/diffViewer/diff.html
similarity index 100%
rename from modules/diffViewer/diff.html
rename to src/editor/modules/diffViewer/diff.html
diff --git a/modules/diffViewer/diffViewer.js b/src/editor/modules/diffViewer/diffViewer.js
similarity index 100%
rename from modules/diffViewer/diffViewer.js
rename to src/editor/modules/diffViewer/diffViewer.js
diff --git a/modules/diffViewer/diffViewer.less b/src/editor/modules/diffViewer/diffViewer.less
similarity index 100%
rename from modules/diffViewer/diffViewer.less
rename to src/editor/modules/diffViewer/diffViewer.less
diff --git a/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js
similarity index 100%
rename from modules/documentCanvas/canvas/canvas.js
rename to src/editor/modules/documentCanvas/canvas/canvas.js
diff --git a/modules/documentCanvas/canvas/canvas.test.js b/src/editor/modules/documentCanvas/canvas/canvas.test.js
similarity index 100%
rename from modules/documentCanvas/canvas/canvas.test.js
rename to src/editor/modules/documentCanvas/canvas/canvas.test.js
diff --git a/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js
similarity index 100%
rename from modules/documentCanvas/canvas/documentElement.js
rename to src/editor/modules/documentCanvas/canvas/documentElement.js
diff --git a/modules/documentCanvas/canvas/keyboard.js b/src/editor/modules/documentCanvas/canvas/keyboard.js
similarity index 100%
rename from modules/documentCanvas/canvas/keyboard.js
rename to src/editor/modules/documentCanvas/canvas/keyboard.js
diff --git a/modules/documentCanvas/canvas/utils.js b/src/editor/modules/documentCanvas/canvas/utils.js
similarity index 100%
rename from modules/documentCanvas/canvas/utils.js
rename to src/editor/modules/documentCanvas/canvas/utils.js
diff --git a/modules/documentCanvas/canvas/utils.test.js b/src/editor/modules/documentCanvas/canvas/utils.test.js
similarity index 100%
rename from modules/documentCanvas/canvas/utils.test.js
rename to src/editor/modules/documentCanvas/canvas/utils.test.js
diff --git a/modules/documentCanvas/canvas/widgets.js b/src/editor/modules/documentCanvas/canvas/widgets.js
similarity index 100%
rename from modules/documentCanvas/canvas/widgets.js
rename to src/editor/modules/documentCanvas/canvas/widgets.js
diff --git a/modules/documentCanvas/canvas/widgets.less b/src/editor/modules/documentCanvas/canvas/widgets.less
similarity index 100%
rename from modules/documentCanvas/canvas/widgets.less
rename to src/editor/modules/documentCanvas/canvas/widgets.less
diff --git a/modules/documentCanvas/canvas/wlxmlManagers.js b/src/editor/modules/documentCanvas/canvas/wlxmlManagers.js
similarity index 100%
rename from modules/documentCanvas/canvas/wlxmlManagers.js
rename to src/editor/modules/documentCanvas/canvas/wlxmlManagers.js
diff --git a/modules/documentCanvas/classAttributes.js b/src/editor/modules/documentCanvas/classAttributes.js
similarity index 100%
rename from modules/documentCanvas/classAttributes.js
rename to src/editor/modules/documentCanvas/classAttributes.js
diff --git a/modules/documentCanvas/commands.js b/src/editor/modules/documentCanvas/commands.js
similarity index 100%
rename from modules/documentCanvas/commands.js
rename to src/editor/modules/documentCanvas/commands.js
diff --git a/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js
similarity index 100%
rename from modules/documentCanvas/documentCanvas.js
rename to src/editor/modules/documentCanvas/documentCanvas.js
diff --git a/modules/documentCanvas/documentCanvas.less b/src/editor/modules/documentCanvas/documentCanvas.less
similarity index 100%
rename from modules/documentCanvas/documentCanvas.less
rename to src/editor/modules/documentCanvas/documentCanvas.less
diff --git a/modules/documentCanvas/nodes.less b/src/editor/modules/documentCanvas/nodes.less
similarity index 100%
rename from modules/documentCanvas/nodes.less
rename to src/editor/modules/documentCanvas/nodes.less
diff --git a/modules/documentCanvas/template.html b/src/editor/modules/documentCanvas/template.html
similarity index 100%
rename from modules/documentCanvas/template.html
rename to src/editor/modules/documentCanvas/template.html
diff --git a/modules/documentCanvas/tests/classAttributes.test.js b/src/editor/modules/documentCanvas/tests/classAttributes.test.js
similarity index 100%
rename from modules/documentCanvas/tests/classAttributes.test.js
rename to src/editor/modules/documentCanvas/tests/classAttributes.test.js
diff --git a/modules/documentHistory/documentHistory.js b/src/editor/modules/documentHistory/documentHistory.js
similarity index 100%
rename from modules/documentHistory/documentHistory.js
rename to src/editor/modules/documentHistory/documentHistory.js
diff --git a/modules/documentHistory/documentHistory.less b/src/editor/modules/documentHistory/documentHistory.less
similarity index 100%
rename from modules/documentHistory/documentHistory.less
rename to src/editor/modules/documentHistory/documentHistory.less
diff --git a/modules/documentHistory/restoreDialog.js b/src/editor/modules/documentHistory/restoreDialog.js
similarity index 100%
rename from modules/documentHistory/restoreDialog.js
rename to src/editor/modules/documentHistory/restoreDialog.js
diff --git a/modules/documentHistory/templates/item.html b/src/editor/modules/documentHistory/templates/item.html
similarity index 100%
rename from modules/documentHistory/templates/item.html
rename to src/editor/modules/documentHistory/templates/item.html
diff --git a/modules/documentHistory/templates/main.html b/src/editor/modules/documentHistory/templates/main.html
similarity index 100%
rename from modules/documentHistory/templates/main.html
rename to src/editor/modules/documentHistory/templates/main.html
diff --git a/modules/documentHistory/templates/restoreDialog.html b/src/editor/modules/documentHistory/templates/restoreDialog.html
similarity index 100%
rename from modules/documentHistory/templates/restoreDialog.html
rename to src/editor/modules/documentHistory/templates/restoreDialog.html
diff --git a/modules/documentToolbar/documentToolbar.js b/src/editor/modules/documentToolbar/documentToolbar.js
similarity index 100%
rename from modules/documentToolbar/documentToolbar.js
rename to src/editor/modules/documentToolbar/documentToolbar.js
diff --git a/modules/documentToolbar/documentToolbar.less b/src/editor/modules/documentToolbar/documentToolbar.less
similarity index 100%
rename from modules/documentToolbar/documentToolbar.less
rename to src/editor/modules/documentToolbar/documentToolbar.less
diff --git a/modules/documentToolbar/template.html b/src/editor/modules/documentToolbar/template.html
similarity index 100%
rename from modules/documentToolbar/template.html
rename to src/editor/modules/documentToolbar/template.html
diff --git a/modules/indicator/indicator.js b/src/editor/modules/indicator/indicator.js
similarity index 100%
rename from modules/indicator/indicator.js
rename to src/editor/modules/indicator/indicator.js
diff --git a/modules/indicator/indicator.less b/src/editor/modules/indicator/indicator.less
similarity index 100%
rename from modules/indicator/indicator.less
rename to src/editor/modules/indicator/indicator.less
diff --git a/modules/indicator/template.html b/src/editor/modules/indicator/template.html
similarity index 100%
rename from modules/indicator/template.html
rename to src/editor/modules/indicator/template.html
diff --git a/modules/mainBar/mainBar.js b/src/editor/modules/mainBar/mainBar.js
similarity index 100%
rename from modules/mainBar/mainBar.js
rename to src/editor/modules/mainBar/mainBar.js
diff --git a/modules/mainBar/mainBar.less b/src/editor/modules/mainBar/mainBar.less
similarity index 100%
rename from modules/mainBar/mainBar.less
rename to src/editor/modules/mainBar/mainBar.less
diff --git a/modules/mainBar/template.html b/src/editor/modules/mainBar/template.html
similarity index 100%
rename from modules/mainBar/template.html
rename to src/editor/modules/mainBar/template.html
diff --git a/modules/metadataEditor/metadataEditor.js b/src/editor/modules/metadataEditor/metadataEditor.js
similarity index 100%
rename from modules/metadataEditor/metadataEditor.js
rename to src/editor/modules/metadataEditor/metadataEditor.js
diff --git a/modules/metadataEditor/metadataEditor.less b/src/editor/modules/metadataEditor/metadataEditor.less
similarity index 100%
rename from modules/metadataEditor/metadataEditor.less
rename to src/editor/modules/metadataEditor/metadataEditor.less
diff --git a/modules/metadataEditor/templates/item.html b/src/editor/modules/metadataEditor/templates/item.html
similarity index 100%
rename from modules/metadataEditor/templates/item.html
rename to src/editor/modules/metadataEditor/templates/item.html
diff --git a/modules/metadataEditor/templates/main.html b/src/editor/modules/metadataEditor/templates/main.html
similarity index 100%
rename from modules/metadataEditor/templates/main.html
rename to src/editor/modules/metadataEditor/templates/main.html
diff --git a/modules/metadataEditor/transformations.js b/src/editor/modules/metadataEditor/transformations.js
similarity index 100%
rename from modules/metadataEditor/transformations.js
rename to src/editor/modules/metadataEditor/transformations.js
diff --git a/modules/nodeBreadCrumbs/nodeBreadCrumbs.js b/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js
similarity index 100%
rename from modules/nodeBreadCrumbs/nodeBreadCrumbs.js
rename to src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js
diff --git a/modules/nodeBreadCrumbs/template.html b/src/editor/modules/nodeBreadCrumbs/template.html
similarity index 100%
rename from modules/nodeBreadCrumbs/template.html
rename to src/editor/modules/nodeBreadCrumbs/template.html
diff --git a/modules/nodeFamilyTree/nodeFamilyTree.js b/src/editor/modules/nodeFamilyTree/nodeFamilyTree.js
similarity index 100%
rename from modules/nodeFamilyTree/nodeFamilyTree.js
rename to src/editor/modules/nodeFamilyTree/nodeFamilyTree.js
diff --git a/modules/nodeFamilyTree/nodeFamilyTree.less b/src/editor/modules/nodeFamilyTree/nodeFamilyTree.less
similarity index 100%
rename from modules/nodeFamilyTree/nodeFamilyTree.less
rename to src/editor/modules/nodeFamilyTree/nodeFamilyTree.less
diff --git a/modules/nodeFamilyTree/template.html b/src/editor/modules/nodeFamilyTree/template.html
similarity index 100%
rename from modules/nodeFamilyTree/template.html
rename to src/editor/modules/nodeFamilyTree/template.html
diff --git a/modules/nodePane/metaWidget/metaWidget.js b/src/editor/modules/nodePane/metaWidget/metaWidget.js
similarity index 100%
rename from modules/nodePane/metaWidget/metaWidget.js
rename to src/editor/modules/nodePane/metaWidget/metaWidget.js
diff --git a/modules/nodePane/metaWidget/metaWidget.test.js b/src/editor/modules/nodePane/metaWidget/metaWidget.test.js
similarity index 100%
rename from modules/nodePane/metaWidget/metaWidget.test.js
rename to src/editor/modules/nodePane/metaWidget/metaWidget.test.js
diff --git a/modules/nodePane/metaWidget/stringField.html b/src/editor/modules/nodePane/metaWidget/stringField.html
similarity index 100%
rename from modules/nodePane/metaWidget/stringField.html
rename to src/editor/modules/nodePane/metaWidget/stringField.html
diff --git a/modules/nodePane/nodePane.js b/src/editor/modules/nodePane/nodePane.js
similarity index 100%
rename from modules/nodePane/nodePane.js
rename to src/editor/modules/nodePane/nodePane.js
diff --git a/modules/nodePane/nodePane.less b/src/editor/modules/nodePane/nodePane.less
similarity index 100%
rename from modules/nodePane/nodePane.less
rename to src/editor/modules/nodePane/nodePane.less
diff --git a/modules/nodePane/template.html b/src/editor/modules/nodePane/template.html
similarity index 100%
rename from modules/nodePane/template.html
rename to src/editor/modules/nodePane/template.html
diff --git a/modules/rng/diffLayout.html b/src/editor/modules/rng/diffLayout.html
similarity index 100%
rename from modules/rng/diffLayout.html
rename to src/editor/modules/rng/diffLayout.html
diff --git a/modules/rng/diffLayout.less b/src/editor/modules/rng/diffLayout.less
similarity index 100%
rename from modules/rng/diffLayout.less
rename to src/editor/modules/rng/diffLayout.less
diff --git a/modules/rng/editingLayout.html b/src/editor/modules/rng/editingLayout.html
similarity index 100%
rename from modules/rng/editingLayout.html
rename to src/editor/modules/rng/editingLayout.html
diff --git a/modules/rng/editingLayout.less b/src/editor/modules/rng/editingLayout.less
similarity index 100%
rename from modules/rng/editingLayout.less
rename to src/editor/modules/rng/editingLayout.less
diff --git a/modules/rng/mainLayout.html b/src/editor/modules/rng/mainLayout.html
similarity index 100%
rename from modules/rng/mainLayout.html
rename to src/editor/modules/rng/mainLayout.html
diff --git a/modules/rng/mainLayout.less b/src/editor/modules/rng/mainLayout.less
similarity index 100%
rename from modules/rng/mainLayout.less
rename to src/editor/modules/rng/mainLayout.less
diff --git a/modules/rng/rng.js b/src/editor/modules/rng/rng.js
similarity index 100%
rename from modules/rng/rng.js
rename to src/editor/modules/rng/rng.js
diff --git a/modules/rng/rng.less b/src/editor/modules/rng/rng.less
similarity index 100%
rename from modules/rng/rng.less
rename to src/editor/modules/rng/rng.less
diff --git a/modules/sourceEditor/sourceEditor.js b/src/editor/modules/sourceEditor/sourceEditor.js
similarity index 100%
rename from modules/sourceEditor/sourceEditor.js
rename to src/editor/modules/sourceEditor/sourceEditor.js
diff --git a/modules/sourceEditor/sourceEditor.less b/src/editor/modules/sourceEditor/sourceEditor.less
similarity index 100%
rename from modules/sourceEditor/sourceEditor.less
rename to src/editor/modules/sourceEditor/sourceEditor.less
diff --git a/rng.js b/src/editor/rng.js
similarity index 100%
rename from rng.js
rename to src/editor/rng.js
diff --git a/styles/common.less b/src/editor/styles/common.less
similarity index 100%
rename from styles/common.less
rename to src/editor/styles/common.less
diff --git a/styles/main.less b/src/editor/styles/main.less
similarity index 100%
rename from styles/main.less
rename to src/editor/styles/main.less
diff --git a/styles/mixins.less b/src/editor/styles/mixins.less
similarity index 100%
rename from styles/mixins.less
rename to src/editor/styles/mixins.less
diff --git a/utils/wlxml.js b/src/editor/utils/wlxml.js
similarity index 100%
rename from utils/wlxml.js
rename to src/editor/utils/wlxml.js
diff --git a/views/tabs/tabs.js b/src/editor/views/tabs/tabs.js
similarity index 100%
rename from views/tabs/tabs.js
rename to src/editor/views/tabs/tabs.js
diff --git a/views/tabs/templates/handle.html b/src/editor/views/tabs/templates/handle.html
similarity index 100%
rename from views/tabs/templates/handle.html
rename to src/editor/views/tabs/templates/handle.html
diff --git a/views/tabs/templates/main.html b/src/editor/views/tabs/templates/main.html
similarity index 100%
rename from views/tabs/templates/main.html
rename to src/editor/views/tabs/templates/main.html
diff --git a/fnpjs/layout.js b/src/fnpjs/layout.js
similarity index 100%
rename from fnpjs/layout.js
rename to src/fnpjs/layout.js
diff --git a/fnpjs/runner.js b/src/fnpjs/runner.js
similarity index 100%
rename from fnpjs/runner.js
rename to src/fnpjs/runner.js
diff --git a/fnpjs/vbox.js b/src/fnpjs/vbox.js
similarity index 100%
rename from fnpjs/vbox.js
rename to src/fnpjs/vbox.js
diff --git a/tests/main.js b/tests/main.js
index 16154b7..87eb6b2 100644
--- a/tests/main.js
+++ b/tests/main.js
@@ -7,31 +7,43 @@
});
require({
- baseUrl: '/base/',
+ baseUrl: '/base/src/editor',
deps: tests,
callback: window.__karma__.start,
+
+ paths: {
+ 'fnpjs': '../fnpjs',
+ 'libs': '../../libs'
+ },
+
+ map: {
+ '*':
+ {
+ 'libs/jquery': '../../libs/jquery-1.9.1.min',
+ 'libs/underscore': '../../libs/underscore-min',
+ 'libs/bootstrap': '../../libs/bootstrap/js/bootstrap.min',
+ 'libs/backbone': '../../libs/backbone-min',
+ 'libs/sinon': '../../libs/sinon-1.7.3'
+ }
+ },
+
shim: {
- 'libs/jquery-1.9.1.min': {
+ '../../libs/jquery-1.9.1.min': {
exports: '$',
},
- 'libs/underscore': {
+ '../../libs/underscore-min': {
exports: '_'
},
- 'libs/bootstrap/js/bootstrap.min': {
- deps: ['libs/jquery-1.9.1.min']
+ '../../libs/bootstrap/js/bootstrap.min': {
+ deps: ['libs/jquery']
},
- 'libs/backbone': {
+ '../../libs/backbone-min': {
exports: 'Backbone',
- deps: ['libs/jquery-1.9.1.min', 'libs/underscore']
+ deps: ['libs/jquery', 'libs/underscore']
},
- 'libs/sinon-1.7.3': {
+ '../../libs/sinon-1.7.3': {
exports: 'sinon'
}
- },
- map: {
- '*': {
- 'libs/sinon': 'libs/sinon-1.7.3'
- }
}
});
--
2.20.1