--- a/client/bower.json Thu Dec 18 18:14:28 2014 +0100
+++ b/client/bower.json Fri Dec 19 15:48:50 2014 +0100
@@ -30,9 +30,10 @@
"jquery-mousewheel": "~3.1.12",
"paper": "~0.9.21",
"FileSaver": "*",
- "backbone-relational": "~0.9.0"
+ "backbone-relational": "~0.9.0",
+ "requirejs": null
},
"devDependencies": {
- "require": "*"
+ "jquery-ui": "~1.11.2"
}
}
--- a/client/gruntfile.js Thu Dec 18 18:14:28 2014 +0100
+++ b/client/gruntfile.js Fri Dec 19 15:48:50 2014 +0100
@@ -69,6 +69,7 @@
},
renderer: ["dist/js/paper-renderer.js"],
renkan: ["dist/"],
+ lib: ["lib/"],
},
cssmin: {
options: {
@@ -119,7 +120,7 @@
options: {
targetDir: './lib',
layout: 'byComponent',
- install: false,
+ install: true,
verbose: false,
cleanTargetDir: false,
cleanBowerDir: false,
--- a/client/js/main-renderer.js Thu Dec 18 18:14:28 2014 +0100
+++ b/client/js/main-renderer.js Fri Dec 19 15:48:50 2014 +0100
@@ -3,9 +3,9 @@
if( typeof require.config === "function" ) {
require.config({
paths: {
- 'jquery':'../lib/jquery.min',
- 'underscore':'../lib/underscore-min',
- 'filesaver' :'../lib/FileSaver',
+ 'jquery':'../lib/jquery/jquery',
+ 'underscore':'../lib/underscore/underscore',
+ 'filesaver' :'../lib/FileSaver/FileSaver',
'requtils':'require-utils'
}
});
@@ -62,6 +62,6 @@
Renderer.EdgeRevertButton = EdgeRevertButton;
Renderer.MiniFrame = MiniFrame;
Renderer.Scene = Scene;
-
+
startRenkan();
});
--- a/client/test/publish-test-min.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/publish-test-min.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
@@ -40,6 +40,6 @@
<body>
<div id="renkan"></div>
-
+
</body>
</html>
--- a/client/test/publish-test.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/publish-test.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,18 +6,18 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/defaults.js"></script>
<script src="../js/i18n.js"></script>
<script src="../js/models.js"></script>
<script src="../js/full-json.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
@@ -38,6 +38,6 @@
<body>
<div id="renkan"></div>
-
+
</body>
</html>
--- a/client/test/render-test.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/render-test.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/defaults.js"></script>
<script src="../js/i18n.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/list-bin.js"></script>
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
@@ -72,6 +72,6 @@
<body>
<div id="renkan"></div>
-
+
</body>
</html>
--- a/client/test/space-editor.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/space-editor.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,13 +6,13 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery-ui.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-ui/jquery-ui.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/defaults.js"></script>
<script src="../js/i18n.js"></script>
@@ -21,7 +21,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
<script src="../js/space-editor.js"></script>
-
+
<link rel="stylesheet" href="../css/renkan.css" />
<link rel="stylesheet" href="../css/space-editor.css" />
</head>
@@ -34,11 +34,11 @@
</div>
<div class="main">
<h2 class="section-title">Search Engines</h2>
-
+
<ul class="first-level-list search-engine-list">
<li class="item search-engine">
<a href="#" class="blue-button remove-item">×</a>
-
+
<span class="setting search-engine-type">
<label>Type:</label>
<span class="display-value"></span>
@@ -65,15 +65,15 @@
<div class="clearer"></div>
</li>
</ul>
-
+
<a class="add-item add-search-engine blue-button" href="#">+</a>
-
+
<h2 class="section-title">Bins</h2>
-
+
<ul class="first-level-list bin-list">
<li class="item bin">
<a href="#" class="blue-button remove-item">×</a>
-
+
<span class="setting bin-type">
<label>Type:</label>
<span class="display-value"></span>
@@ -161,10 +161,10 @@
<div class="clearer"></div>
</li>
</ul>
-
+
<a class="add-item add-bin blue-button" href="#">+</a>
-
+
</div>
-
+
</body>
</html>
--- a/client/test/test-readonly-body-dist-min.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-readonly-body-dist-min.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,13 +6,13 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../dist/lib/jquery.min.js"></script>
- <script src="../dist/lib/jquery.mousewheel.min.js"></script>
- <script src="../dist/lib/underscore-min.js"></script>
- <script src="../dist/lib/backbone.js"></script>
- <script src="../dist/lib/backbone-relational.js"></script>
- <script src="../dist/lib/paper.js"></script>
- <script src="../dist/lib/require.js"></script>
+ <script src="../dist/lib/jquery/jquery.js"></script>
+ <script src="../dist/lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../dist/lib/underscore/underscore.js"></script>
+ <script src="../dist/lib/backbone/backbone.js"></script>
+ <script src="../dist/lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../dist/lib/paper/paper-full.js"></script>
+ <script src="../dist/lib/requirejs/require.js"></script>
<script src="../dist/js/renkan.min.js"></script>
<script type="text/javascript">
function startRenkan(){
--- a/client/test/test-readonly-body-dist.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-readonly-body-dist.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,13 +6,13 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../dist/lib/jquery.min.js"></script>
- <script src="../dist/lib/jquery.mousewheel.min.js"></script>
- <script src="../dist/lib/underscore-min.js"></script>
- <script src="../dist/lib/backbone.js"></script>
- <script src="../dist/lib/backbone-relational.js"></script>
- <script src="../dist/lib/paper.js"></script>
- <script src="../dist/lib/require.js"></script>
+ <script src="../dist/lib/jquery/jquery.js"></script>
+ <script src="../dist/lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../dist/lib/underscore/underscore.js"></script>
+ <script src="../dist/lib/backbone/backbone.js"></script>
+ <script src="../dist/lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../dist/lib/paper/paper-full.js"></script>
+ <script src="../dist/lib/requirejs/require.js"></script>
<script src="../dist/js/renkan.js"></script>
<script type="text/javascript">
function startRenkan(){
--- a/client/test/test-readonly-body.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-readonly-body.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-readonly-div-resize.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-readonly-div-resize.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
@@ -55,7 +55,7 @@
position:absolute;
bottom: 0;
}
-
+
.wrapper {
position:absolute;
top:40px;
--- a/client/test/test-readonly-div.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-readonly-div.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/defaults.js"></script>
<script src="../js/i18n.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/list-bin.js"></script>
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
@@ -30,7 +30,7 @@
default_view:0
});
Rkns.jsonIO(_renkan, {
- url: "../data/example-cinema.json"
+ url: "../data/example-cinema-src.json"
});
};
</script>
--- a/client/test/test-writable-bins-div-100.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-bins-div-100.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,13 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/jquery-ui.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/defaults.js"></script>
<script src="../js/i18n.js"></script>
@@ -21,7 +20,7 @@
<script src="../js/list-bin.js"></script>
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-bins-div.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-bins-div.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-bins-save-on-click.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-bins-save-on-click.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -21,7 +21,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-bins.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-bins.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>RENKAN test in read-only mode : body 100%</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-simple-dist.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-simple-dist.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,13 +6,13 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../dist/lib/jquery.min.js"></script>
- <script src="../dist/lib/jquery.mousewheel.min.js"></script>
- <script src="../dist/lib/underscore-min.js"></script>
- <script src="../dist/lib/backbone.js"></script>
- <script src="../dist/lib/backbone-relational.js"></script>
- <script src="../dist/lib/paper.js"></script>
- <script src="../dist/lib/require.js"></script>
+ <script src="../dist/lib/jquery/jquery.js"></script>
+ <script src="../dist/lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../dist/lib/underscore/underscore.js"></script>
+ <script src="../dist/lib/backbone/backbone.js"></script>
+ <script src="../dist/lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../dist/lib/paper/paper-full.js"></script>
+ <script src="../dist/lib/requirejs/require.js"></script>
<script src="../dist/js/renkan.js"></script>
<script type="text/javascript">
function startRenkan(){
--- a/client/test/test-writable-simple-div.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-simple-div.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-simple.html Thu Dec 18 18:14:28 2014 +0100
+++ b/client/test/test-writable-simple.html Fri Dec 19 15:48:50 2014 +0100
@@ -6,12 +6,12 @@
<title>Test de Rendu RENKAN</title>
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation" />
- <script src="../lib/jquery.min.js"></script>
- <script src="../lib/jquery.mousewheel.min.js"></script>
- <script src="../lib/underscore-min.js"></script>
- <script src="../lib/backbone.js"></script>
- <script src="../lib/backbone-relational.js"></script>
- <script src="../lib/paper.js"></script>
+ <script src="../lib/jquery/jquery.js"></script>
+ <script src="../lib/jquery-mousewheel/jquery.mousewheel.js"></script>
+ <script src="../lib/underscore/underscore.js"></script>
+ <script src="../lib/backbone/backbone.js"></script>
+ <script src="../lib/backbone-relational/backbone-relational.js"></script>
+ <script src="../lib/paper/paper-full.js"></script>
<script src="../js/main.js"></script>
<script src="../js/models.js"></script>
<script src="../js/defaults.js"></script>
@@ -20,7 +20,7 @@
<script src="../js/ldtjson-bin.js"></script>
<script src="../js/list-bin.js"></script>
<script src="../js/wikipedia-bin.js"></script>
- <script data-main="../js/main-renderer" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer" src="../lib/requirejs/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({