# HG changeset patch # User ymh # Date 1419000530 -3600 # Node ID cb5c0007c9f91c8e30d4855fa7cd4816b78db09b # Parent e616c4fff297d2a80e6a43658b47da7a8297eba3 continue bower integration diff -r e616c4fff297 -r cb5c0007c9f9 client/bower.json --- 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" } } diff -r e616c4fff297 -r cb5c0007c9f9 client/gruntfile.js --- 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, diff -r e616c4fff297 -r cb5c0007c9f9 client/js/main-renderer.js --- 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(); }); diff -r e616c4fff297 -r cb5c0007c9f9 client/test/publish-test-min.html --- 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 @@ Test de Rendu RENKAN - - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - + + + + + + - + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - - + + + + + + + @@ -21,7 +21,7 @@ - + @@ -34,11 +34,11 @@

Search Engines

- + - + + - +

Bins

- + - + + - +
- + diff -r e616c4fff297 -r cb5c0007c9f9 client/test/test-readonly-body-dist-min.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 @@ RENKAN test in read-only mode : body 100% - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + diff -r e616c4fff297 -r cb5c0007c9f9 client/test/test-writable-bins-div-100.html --- 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 @@ RENKAN test in read-only mode : body 100% - - - - - - - + + + + + + @@ -21,7 +20,7 @@ - + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - + + + + + + @@ -21,7 +21,7 @@ - + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - - + + + + + + + - - - - - + + + + + + @@ -20,7 +20,7 @@ - + - - - - - + + + + + + @@ -20,7 +20,7 @@ - +