client/js/paper-renderer.js
changeset 271 b2cc6f238b0d
parent 270 aaef418cdf8d
child 273 3f4094a5c826
--- a/client/js/paper-renderer.js	Tue Feb 18 16:54:41 2014 +0100
+++ b/client/js/paper-renderer.js	Mon Mar 03 15:31:51 2014 +0100
@@ -387,7 +387,7 @@
         this.renderer.node_layer.activate();
         var width = _image.width,
             height = _image.height,
-            clipPath = this.model.get("clip-path"),
+            clipPath = this.model.get("clip_path"),
             hasClipPath = (typeof clipPath !== "undefined" && clipPath);
         if (hasClipPath) {
             var _clip = new paper.Path(),
@@ -1000,7 +1000,7 @@
                 image: _model.get("image") || "",
                 image_placeholder: _image_placeholder,
                 color: _model.get("color") || _created_by.get("color"),
-                clip_path: _model.get("clip-path") || false,
+                clip_path: _model.get("clip_path") || false,
                 created_by_color: _created_by.get("color"),
                 created_by_title: _created_by.get("title"),
                 size: (_size > 0 ? "+" : "") + _size
@@ -1794,8 +1794,6 @@
     bindClick(".Rk-ZoomIn", "zoomIn");
     bindClick(".Rk-ZoomFit", "autoScale");
     this.$.find(".Rk-ZoomSave").click( function() {
-    	console.log("SAVE ZOOM FOR REAL", _this.scale, _this.offset);
-    	console.log("_this.renkan.project", _this.renkan.project);
     	_this.renkan.project.set("views", [{id:Rkns.Utils.getUID('view'), zoom_level:_this.scale, offset_x:_this.offset.x, offset_y:_this.offset.y}]); // Save scale
     	_this.$.find(".Rk-ZoomSetSaved").show();
     });
@@ -2021,7 +2019,6 @@
     + '</div></div>'
 ),
 fixSize: function(_autoscale) {
-	console.log("fixSize", _autoscale, this.renkan.project.get("zoom_level"));
     var w = this.$.width(),
         h = this.$.height();
     if (this.renkan.options.show_top_bar) {
@@ -2201,7 +2198,6 @@
     }
 },
 autoScale: function(force_view) {
-	console.log("autoScale", force_view);
     var nodes = this.renkan.project.get("nodes");
     if (nodes.length > 1) {
         var _xx = nodes.map(function(_node) { return _node.get("position").x; }),
@@ -2621,7 +2617,7 @@
 		                newNode.uri = snippet.find("[data-uri]").attr("data-uri") || newNode.uri;
 		                newNode.title = snippet.find("[data-title]").attr("data-title") || newNode.title;
 		                newNode.description = snippet.find("[data-description]").attr("data-description") || newNode.description;
-		                newNode.description = snippet.find("[data-clip-path]").attr("data-clip-path") || newNode.description;
+		                newNode.clipPath = snippet.find("[data-clip-path]").attr("data-clip-path") || newNode.clipPath;
 		            }
 		    }
 	    	if(typeof _renkan.options.drop_enhancer === "function"){
@@ -2660,7 +2656,7 @@
             description: newNode.description || "",
             image: newNode.image || "",
             color: newNode.color || undefined,
-            "clip-path": newNode.clipPath || undefined,
+            clip_path: newNode.clipPath || undefined,
             position: {
                 x: _coords.x,
                 y: _coords.y