--- a/client/gruntfile.js Fri May 16 14:09:57 2014 +0200
+++ b/client/gruntfile.js Fri May 16 14:14:39 2014 +0200
@@ -26,7 +26,7 @@
renderer: {
options: {
baseUrl: "js/",
- name: "build-renderer",
+ name: "main-renderer",
out: "dist/js/paper-renderer.js",
optimize: "none",
beautify: true,
--- a/client/js/build-renderer.js Fri May 16 14:09:57 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/* main-require.js */
-//Load modules and use them
-if( typeof require.config === "function" ) {
- require.config({
- paths: {
- 'jquery':'../lib/jquery.min',
- 'underscore':'../lib/underscore-min',
- 'requtils':'require-utils'
- }
- });
-}
-
-require(['renderer/baserepresentation',
- 'renderer/basebutton',
- 'renderer/noderepr',
- 'renderer/edge',
- 'renderer/tempedge',
- 'renderer/baseeditor',
- 'renderer/nodeeditor',
- 'renderer/edgeeditor',
- 'renderer/nodebutton',
- 'renderer/nodeeditbutton',
- 'renderer/noderemovebutton',
- 'renderer/noderevertbutton',
- 'renderer/nodelinkbutton',
- 'renderer/nodeenlargebutton',
- 'renderer/nodeshrinkbutton',
- 'renderer/edgeeditbutton',
- 'renderer/edgeremovebutton',
- 'renderer/edgerevertbutton',
- 'renderer/miniframe',
- 'renderer/scene'
- ], function(BaseRepresentation, BaseButton, NodeRepr, Edge, TempEdge, BaseEditor, NodeEditor, EdgeEditor, NodeButton, NodeEditButton, NodeRemoveButton, NodeRevertButton, NodeLinkButton, NodeEnlargeButton, NodeShrinkButton, EdgeEditButton, EdgeRemoveButton, EdgeRevertButton, MiniFrame, Scene){
-
- 'use strict';
-
- var Rkns = window.Rkns;
-
- if(typeof Rkns.Renderer === "undefined"){
- Rkns.Renderer = {};
- }
- var Renderer = Rkns.Renderer;
-
- Renderer._BaseRepresentation = BaseRepresentation;
- Renderer._BaseButton = BaseButton;
- Renderer.Node = NodeRepr;
- Renderer.Edge = Edge;
- Renderer.TempEdge = TempEdge;
- Renderer._BaseEditor = BaseEditor;
- Renderer.NodeEditor = NodeEditor;
- Renderer.EdgeEditor = EdgeEditor;
- Renderer._NodeButton = NodeButton;
- Renderer.NodeEditButton = NodeEditButton;
- Renderer.NodeRemoveButton = NodeRemoveButton;
- Renderer.NodeRevertButton = NodeRevertButton;
- Renderer.NodeLinkButton = NodeLinkButton;
- Renderer.NodeEnlargeButton = NodeEnlargeButton;
- Renderer.NodeShrinkButton = NodeShrinkButton;
- Renderer.EdgeEditButton = EdgeEditButton;
- Renderer.EdgeRemoveButton = EdgeRemoveButton;
- Renderer.EdgeRevertButton = EdgeRevertButton;
- Renderer.MiniFrame = MiniFrame;
- Renderer.Scene = Scene;
-
- startRenkan();
-});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/js/main-renderer.js Fri May 16 14:14:39 2014 +0200
@@ -0,0 +1,66 @@
+
+//Load modules and use them
+if( typeof require.config === "function" ) {
+ require.config({
+ paths: {
+ 'jquery':'../lib/jquery.min',
+ 'underscore':'../lib/underscore-min',
+ 'requtils':'require-utils'
+ }
+ });
+}
+
+require(['renderer/baserepresentation',
+ 'renderer/basebutton',
+ 'renderer/noderepr',
+ 'renderer/edge',
+ 'renderer/tempedge',
+ 'renderer/baseeditor',
+ 'renderer/nodeeditor',
+ 'renderer/edgeeditor',
+ 'renderer/nodebutton',
+ 'renderer/nodeeditbutton',
+ 'renderer/noderemovebutton',
+ 'renderer/noderevertbutton',
+ 'renderer/nodelinkbutton',
+ 'renderer/nodeenlargebutton',
+ 'renderer/nodeshrinkbutton',
+ 'renderer/edgeeditbutton',
+ 'renderer/edgeremovebutton',
+ 'renderer/edgerevertbutton',
+ 'renderer/miniframe',
+ 'renderer/scene'
+ ], function(BaseRepresentation, BaseButton, NodeRepr, Edge, TempEdge, BaseEditor, NodeEditor, EdgeEditor, NodeButton, NodeEditButton, NodeRemoveButton, NodeRevertButton, NodeLinkButton, NodeEnlargeButton, NodeShrinkButton, EdgeEditButton, EdgeRemoveButton, EdgeRevertButton, MiniFrame, Scene){
+
+ 'use strict';
+
+ var Rkns = window.Rkns;
+
+ if(typeof Rkns.Renderer === "undefined"){
+ Rkns.Renderer = {};
+ }
+ var Renderer = Rkns.Renderer;
+
+ Renderer._BaseRepresentation = BaseRepresentation;
+ Renderer._BaseButton = BaseButton;
+ Renderer.Node = NodeRepr;
+ Renderer.Edge = Edge;
+ Renderer.TempEdge = TempEdge;
+ Renderer._BaseEditor = BaseEditor;
+ Renderer.NodeEditor = NodeEditor;
+ Renderer.EdgeEditor = EdgeEditor;
+ Renderer._NodeButton = NodeButton;
+ Renderer.NodeEditButton = NodeEditButton;
+ Renderer.NodeRemoveButton = NodeRemoveButton;
+ Renderer.NodeRevertButton = NodeRevertButton;
+ Renderer.NodeLinkButton = NodeLinkButton;
+ Renderer.NodeEnlargeButton = NodeEnlargeButton;
+ Renderer.NodeShrinkButton = NodeShrinkButton;
+ Renderer.EdgeEditButton = EdgeEditButton;
+ Renderer.EdgeRemoveButton = EdgeRemoveButton;
+ Renderer.EdgeRevertButton = EdgeRevertButton;
+ Renderer.MiniFrame = MiniFrame;
+ Renderer.Scene = Scene;
+
+ startRenkan();
+});
--- a/client/test/publish-test-min.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/publish-test-min.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/publish-test.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/publish-test.html Fri May 16 14:14:39 2014 +0200
@@ -17,7 +17,7 @@
<script src="../js/i18n.js"></script>
<script src="../js/models.js"></script>
<script src="../js/full-json.js"></script>
- <script data-main="../js/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/render-test.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/render-test.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-readonly-body.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-readonly-body.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-readonly-div-resize.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-readonly-div-resize.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-readonly-div.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-readonly-div.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-bins-div.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-writable-bins-div.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-bins.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-writable-bins.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-simple-div.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-writable-simple-div.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({
--- a/client/test/test-writable-simple.html Fri May 16 14:09:57 2014 +0200
+++ b/client/test/test-writable-simple.html Fri May 16 14:14:39 2014 +0200
@@ -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/build-renderer.js" src="../lib/require.js"></script>
+ <script data-main="../js/main-renderer.js" src="../lib/require.js"></script>
<script type="text/javascript">
function startRenkan(){
var _renkan = new Rkns.Renkan({