# HG changeset patch
# User veltr
# Date 1345567781 -7200
# Node ID b5ada3bb8e53d013ac1eced9b78385c474aaefaa
# Parent  121a24be9da48cf2c7846d12bb70dda5591e9d43
Bugfixes

diff -r 121a24be9da4 -r b5ada3bb8e53 client/js/full-json.js
--- a/client/js/full-json.js	Tue Aug 21 16:27:26 2012 +0200
+++ b/client/js/full-json.js	Tue Aug 21 18:49:41 2012 +0200
@@ -7,8 +7,8 @@
     }
     var _load = function() {
         Rkns.$.getJSON(_opts.url, function(_data) {
-            console.log("Setting data");
             _proj.set(_data);
+            _renkan.renderer.autoScale();
         });
     }
     var _save = function() {
diff -r 121a24be9da4 -r b5ada3bb8e53 client/js/paper-renderer.js
--- a/client/js/paper-renderer.js	Tue Aug 21 16:27:26 2012 +0200
+++ b/client/js/paper-renderer.js	Tue Aug 21 18:49:41 2012 +0200
@@ -434,7 +434,7 @@
     + '<p><label><%=l10n.edit_title%></label><input class="Rk-Edit-Title" type="text" value="<%=node.title%>"/></p>'
     + '<p><label><%=l10n.edit_uri%></label><input class="Rk-Edit-URI" type="text" value="<%=node.uri%>"/></p>'
     + '<p><label><%=l10n.edit_description%></label><textarea class="Rk-Edit-Description"><%=node.description%></textarea></p>'
-    + '<p><label><%=l10n.created_by%></label> <span class="Rk-UserColor" style="background:<%=node.created_by.color%>;"></span> <%=node.created_by.title%></p>'
+    + '<p><label><%=l10n.created_by%></label> <span class="Rk-UserColor" style="background:<%=node.created_by_color%>;"></span><%=node.created_by_title%></p>'
 );
 
 Rkns.Renderer.NodeEditor.prototype.redraw = function() {
@@ -447,10 +447,8 @@
                 title: _model.get("title"),
                 uri: _model.get("uri"),
                 description: _model.get("description"),
-                created_by: {
-                    color: _model.get("created_by").get("color"),
-                    title: _model.get("created_by").get("title")
-                }
+                created_by_color: _model.get("created_by").get("color"),
+                created_by_title: _model.get("created_by").get("title")
             },
             l10n: this.renderer.renkan.l10n
         }))
@@ -506,9 +504,9 @@
     '<h2><span class="Rk-CloseX">&times;</span><%=l10n.edit_edge%></span></h2>'
     + '<p><label><%=l10n.edit_title%></label><input class="Rk-Edit-Title" type="text" value="<%=edge.title%>"/></p>'
     + '<p><label><%=l10n.edit_uri%></label><input class="Rk-Edit-URI" type="text" value="<%=edge.uri%>"/></p>'
-    + '<p><label><%=l10n.edit_from%></label><span class="Rk-UserColor" style="background:<%=edge.from.created_by.color%>;"></span><%=edge.from.title%></p>'
-    + '<p><label><%=l10n.edit_to%></label><span class="Rk-UserColor" style="background:<%=edge.to.created_by.color%>;"></span><%=edge.to.title%></p>'
-    + '<p><label><%=l10n.created_by%> </label><span class="Rk-UserColor" style="background:<%=edge.created_by.color%>;"></span> <%=edge.created_by.title%></p>'
+    + '<p><label><%=l10n.edit_from%></label><span class="Rk-UserColor" style="background:<%=edge.from_created_by_color%>;"></span><%=edge.from_title%></p>'
+    + '<p><label><%=l10n.edit_to%></label><span class="Rk-UserColor" style="background:<%=edge.to_created_by_color%>;"></span><%=edge.to_title%></p>'
+    + '<p><label><%=l10n.created_by%> </label><span class="Rk-UserColor" style="background:<%=edge.created_by_color%>;"></span><%=edge.created_by_title%></p>'
 );
 
 Rkns.Renderer.EdgeEditor.prototype.redraw = function() {
@@ -517,7 +515,17 @@
         _css = Rkns.Renderer.Utils.drawEditBox(_coords, this.editor_block, 250, 200);
     this.editor_$
         .html(this.template({
-            edge: _model,
+            edge: {
+                title: _model.get("title"),
+                uri: _model.get("uri"),
+                description: _model.get("description"),
+                from_title: _model.get("from").get("title"),
+                to_title: _model.get("to").get("title"),
+                from_created_by_color: _model.get("from").get("created_by").get("color"),
+                to_created_by_color: _model.get("to").get("created_by").get("color"),
+                created_by_color: _model.get("created_by").get("color"),
+                created_by_title: _model.get("created_by").get("title")
+            },
             l10n: this.renderer.renkan.l10n
         }))
         .show()
@@ -841,6 +849,18 @@
     + '</div>'
 );
 
+Rkns.Renderer.Scene.prototype.autoScale = function() {
+    var _xx = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").x }),
+        _yy = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").y }),
+        _minx = Math.min.apply(Math, _xx),
+        _miny = Math.min.apply(Math, _yy),
+        _maxx = Math.max.apply(Math, _xx),
+        _maxy = Math.max.apply(Math, _yy);
+    this.scale = Math.min((paper.view.size.width - 2 * this._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * this._MARGIN_Y) / (_maxy - _miny));
+    this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(this.scale));
+    this.redraw();
+}
+
 Rkns.Renderer.Scene.prototype.toPaperCoords = function(_point) {
     return _point.multiply(this.scale).add(this.offset);
 }
diff -r 121a24be9da4 -r b5ada3bb8e53 client/js/random-data.js
--- a/client/js/random-data.js	Tue Aug 21 16:27:26 2012 +0200
+++ b/client/js/random-data.js	Tue Aug 21 18:49:41 2012 +0200
@@ -38,4 +38,5 @@
         });
     }
     _renkan.current_user = "user-0";
+    _renkan.renderer.autoScale();
 }
diff -r 121a24be9da4 -r b5ada3bb8e53 client/js/wikipedia-bin.js
--- a/client/js/wikipedia-bin.js	Tue Aug 21 16:27:26 2012 +0200
+++ b/client/js/wikipedia-bin.js	Tue Aug 21 18:49:41 2012 +0200
@@ -19,7 +19,7 @@
                 _html = Rkns._(_data.query.search).map(function(_result) {
                 return _this.resultTemplate({
                     result: _result,
-                    wpurl: "http://" + this.lang + ".wikipedia.org/wiki/" + encodeURI(_result.title.replace(/ /g,"_")),
+                    wpurl: "http://" + _this.lang + ".wikipedia.org/wiki/" + encodeURI(_result.title.replace(/ /g,"_")),
                     highlightedtitle: _result.title.replace(_rgxp, "<span class='searchmatch'>$1</span>"),
                     wpdesc: Rkns.$('<div>').html(_result.snippet).text()
                 });