# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1365587320 -7200
# Node ID 5e41bc4feda803083d00dfd6e617b31fab002d6c
# Parent  937b6ee27f0610f96776ff40ff867bdaaad0c556# Parent  79a9ea254b219539edf048c82d56fdcc5210ab48
Merge

diff -r 937b6ee27f06 -r 5e41bc4feda8 integ/iri-creation-cinecard.html
--- a/integ/iri-creation-cinecard.html	Wed Apr 10 11:46:53 2013 +0200
+++ b/integ/iri-creation-cinecard.html	Wed Apr 10 11:48:40 2013 +0200
@@ -66,35 +66,35 @@
 						<h3 class="instruction">Glisser un contenu dans la carte</h3>
 						<h3>Stickers</h3>
 						<ul class="stickers less" id="stickers-more">
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-image="img/stickers/scenes-cultes.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Scènes cultes" data-image="img/stickers/scenes-cultes.png">
 								<a class="culte" href="#">
 									<span>SCENES CULTES</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-image="img/stickers/mon-avis.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Mon avis" data-image="img/stickers/mon-avis.png">
 								<a class="star" href="#">
-									<span>MON <br />AVIS</span>
+									<span>MON<br />AVIS</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-image="img/stickers/tu-vas-aimer.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Tu vas aimer" data-image="img/stickers/tu-vas-aimer.png">
 								<a class="like" href="#">
-									<span>TU VAS <br />AIMER</span>
+									<span>TU VAS<br />AIMER</span>
 								</a>
 							</li>
 						
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-image="img/stickers/pourquoi-le-voir.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Pourquoi le voir" data-image="img/stickers/pourquoi-le-voir.png">
 								<a class="culte" href="#">
-									<span>POURQUOI <br/>LE VOIR</span>
+									<span>POURQUOI<br/>LE VOIR</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-image="img/stickers/secrets-et-bonus.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Secrets et bonus" data-image="img/stickers/secrets-et-bonus.png">
 								<a class="star" href="#">
-									<span>SECRETS <br />ET BONUS</span>
+									<span>SECRETS<br />ET BONUS</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-image="img/stickers/pourquoi-j-ai-aime.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Pourquoi j'ai aimé" data-image="img/stickers/pourquoi-j-ai-aime.png">
 								<a class="like" href="#">
-									<span>POURQUOI <br />J'AI AIMÉ</span>
+									<span>POURQUOI<br />J'AI AIMÉ</span>
 								</a>
 							</li>
 					
diff -r 937b6ee27f06 -r 5e41bc4feda8 integ/js/iri-creation-cinecard.js
--- a/integ/js/iri-creation-cinecard.js	Wed Apr 10 11:46:53 2013 +0200
+++ b/integ/js/iri-creation-cinecard.js	Wed Apr 10 11:48:40 2013 +0200
@@ -227,5 +227,8 @@
 		}
     });
 
+$(".send").click(function() {
+	alert("Save JSON data:\n\n" + JSON.stringify(_renkan.project.toJSON()));
+});
 
 });
\ No newline at end of file
diff -r 937b6ee27f06 -r 5e41bc4feda8 integ/renkan/js/paper-renderer.js
--- a/integ/renkan/js/paper-renderer.js	Wed Apr 10 11:46:53 2013 +0200
+++ b/integ/renkan/js/paper-renderer.js	Wed Apr 10 11:48:40 2013 +0200
@@ -304,6 +304,7 @@
     if (this.renderer.minimap) {
 	    this.renderer.minimap.node_layer.activate();
 	    this.minimap_circle = new paper.Path.Circle([0, 0], 1);
+	    this.minimap_circle.__representation = this.renderer.minimap.miniframe.__representation;
 	    this.renderer.minimap.node_group.addChild(this.minimap_circle);
     }
 }
@@ -562,6 +563,7 @@
     	this.renderer.minimap.edge_layer.activate();
 	    this.minimap_line = new paper.Path();
 	    this.minimap_line.add([0,0],[0,0]);
+	    this.minimap_line.__representation = this.renderer.minimap.miniframe.__representation;
 	    this.minimap_line.strokeWidth = 1;
     }
 }
@@ -655,6 +657,8 @@
         if (this.renderer.is_dragging) {
             this.from_representation.saveCoords();
             this.to_representation.saveCoords();
+            this.from_representation.is_dragging = false;
+            this.to_representation.is_dragging = false;
         } else {
             this.openEditor();
         }
@@ -1176,6 +1180,8 @@
 }
 
 Rkns.Renderer.NodeRemoveButton.prototype.mouseup = function() {
+    this.renderer.click_target = null;
+    this.renderer.is_dragging = false;
     this.renderer.removeRepresentationsOfType("editor");
     if (this.renderer.isEditable() && confirm(this.renkan.translate('Do you really wish to remove node ') + '"' + this.source_representation.model.get("title") + '"?')) {
         this.project.removeNode(this.source_representation.model);
@@ -1297,6 +1303,7 @@
     this.scale = 1;
     this.offset = paper.view.center;
     this.totalScroll = 0;
+    this.mouse_down = false;
     this.click_target = null;
     this.selected_target = null;
     this.edge_layer = new paper.Layer();
@@ -1340,43 +1347,45 @@
     
     this.bundles = [];
     this.click_mode = false;
-    var _tool = new paper.Tool(),
-        _this = this,
+    
+    var _this = this,
         _allowScroll = true;
     
-    _tool.minDistance = Rkns.Renderer._MIN_DRAG_DISTANCE;
-    _tool.onMouseMove = function(_event) {
+    this.canvas_$.on({
+    	mousedown: function(_event) {
+    		_this.onMouseDown(_event);
+    	},
+    	mousemove: function(_event) {
         _this.onMouseMove(_event);
-    }
-    _tool.onMouseDown = function(_event) {
-        _this.onMouseDown(_event);
-    }
-    _tool.onMouseDrag = function(_event) {
-        _this.onMouseDrag(_event);
-    }
-    this.canvas_$.mouseup(function(_event) {
-        _this.onMouseUp(_event);
-    });
-    this.canvas_$.mousewheel(function(_event, _delta) {
-        if (_allowScroll) {
-        	_this.onScroll(_event, _delta);
-        }
-    });
-    this.canvas_$.dblclick(function(_event) {
-        _this.onDoubleClick(_event);
-    });
-    this.canvas_$.on("dragover", function(_event) {
-    	_event.preventDefault();
-    });
-    this.canvas_$.on("dragenter", function(_event) {
-    	_allowScroll = false;
-    	_event.preventDefault();
-    });
-    this.canvas_$.on("dragleave", function(_event) {
-    	_allowScroll = true;
-    	_event.preventDefault();
-    });
-    this.canvas_$.on("drop", function(_event) {
+	    },
+	    mouseup: function(_event) {
+	        _this.onMouseUp(_event);
+	    },
+	    mousewheel: function(_event, _delta) {
+	        if (_allowScroll) {
+	        	_this.onScroll(_event, _delta);
+	        }
+	    },
+	    dblclick: function(_event) {
+	        _this.onDoubleClick(_event);
+	    },
+	    mouseleave: function(_event) {
+	        _this.onMouseUp(_event);
+	        _this.click_target = null;
+	        _this.is_dragging = false;
+	    },
+	    dragover: function(_event) {
+	    	_event.preventDefault();
+	    },
+	    dragenter: function(_event) {
+	    	_allowScroll = false;
+	    	_event.preventDefault();
+	    },
+	    dragleave: function(_event) {
+	    	_allowScroll = true;
+	    	_event.preventDefault();
+	    },
+    drop: function(_event) {
     	_event.preventDefault();
     	_allowScroll = true;
     	if (!_this.isEditable()) {
@@ -1451,9 +1460,15 @@
 		    	}
 		    	if (res["text/html"] || res["text/x-iri-selected-html"]) {
 		    		var snippet = Rkns.$('<div>').html(res["text/html"] || res["text/x-iri-selected-html"]);
-		    		newNode.image = snippet.find("img").attr("src") || '';
-		    		newNode.uri = snippet.find("a").attr("href") || newNode.uri;
-		    		newNode.title = snippet.find("[title]").attr("title");
+		    		var _imgs = snippet.find("img");
+		    		if (_imgs.length) {
+		    			newNode.image = _imgs[0].src;
+		    		}
+		    		var _as = snippet.find("a");
+		    		if (_as.length) {
+		    			newNode.uri = _as[0].href;
+		    		}
+		    		newNode.title = snippet.find("[title]").attr("title") || newNode.title;
 		    		newNode.description = snippet.text().replace(/[\s\n]+/gm,' ').trim();
 		    	}
 		    	if (res["text/uri-list"]) {
@@ -1505,7 +1520,8 @@
         	var _node = _this.renkan.project.addNode(_data);
             _this.getRepresentationByModel(_node).openEditor();
     	}
-    })
+    }
+    });
     this.editor_$.find(".Rk-ZoomOut").click(function() {
     	var _newScale = _this.scale * Math.SQRT1_2,
     		_offset = new paper.Point([
@@ -1907,33 +1923,51 @@
 }
 
 Rkns.Renderer.Scene.prototype.onMouseMove = function(_event) {
-    var _hitResult = paper.project.hitTest(_event.point);
+    var _off = this.canvas_$.offset(),
+    	_point = new paper.Point([
+            _event.pageX - _off.left,
+            _event.pageY - _off.top
+        ]);
+	var _delta = _point.subtract(this.last_point);
+	this.last_point = _point;
+    if (!this.is_dragging && this.mouse_down && _delta.length > Rkns.Renderer._MIN_DRAG_DISTANCE) {
+    	this.is_dragging = true;
+    }
+    var _hitResult = paper.project.hitTest(_point);
     if (this.is_dragging) {
         if (this.click_target && typeof this.click_target.paperShift === "function") {
-            this.click_target.paperShift(_event.delta);
+            this.click_target.paperShift(_delta);
         } else {
-            this.paperShift(_event.delta);
+            this.paperShift(_delta);
         }
     } else {
         this.findTarget(_hitResult);
     }
+    paper.view.draw();
 }
 
 Rkns.Renderer.Scene.prototype.onMouseDown = function(_event) {
+    var _off = this.canvas_$.offset(),
+    	_point = new paper.Point([
+            _event.pageX - _off.left,
+            _event.pageY - _off.top
+        ]);
+    this.last_point = _point;
+    this.mouse_down = true;
     if (!this.click_target || this.click_target.type !== "Temp-edge") {
         this.removeRepresentationsOfType("editor");
         this.is_dragging = false;
-        var _hitResult = paper.project.hitTest(_event.point);
+        var _hitResult = paper.project.hitTest(_point);
         if (this.isEditable() && _hitResult && typeof _hitResult.item.__representation !== "undefined") {
             this.click_target = _hitResult.item.__representation;
             if (this.click_target.type === "Node-link-button") {
                 this.removeRepresentationsOfType("editor");
-                this.addTempEdge(this.click_target.source_representation, _event.point);
+                this.addTempEdge(this.click_target.source_representation, _point);
             }
         } else {
             this.click_target = null;
             if (this.isEditable() && this.click_mode === Rkns.Renderer._CLICKMODE_ADDNODE) {
-                var _coords = this.toModelCoords(_event.point),
+                var _coords = this.toModelCoords(_point),
                     _data = {
                         id: Rkns.Utils.getUID('node'),
                         created_by: this.renkan.current_user,
@@ -1950,7 +1984,7 @@
     if (this.click_mode) {
         if (this.isEditable() && this.click_mode === Rkns.Renderer._CLICKMODE_STARTEDGE && this.click_target && this.click_target.type === "Node") {
             this.removeRepresentationsOfType("editor");
-            this.addTempEdge(this.click_target, _event.point);
+            this.addTempEdge(this.click_target, _point);
             this.click_mode = Rkns.Renderer._CLICKMODE_ENDEDGE;
             this.notif_$.fadeOut(function() {
                 Rkns.$(this).html(_renkan.translate("Click on a second node to complete the edge")).fadeIn();
@@ -1962,12 +1996,8 @@
     }
 }
 
-Rkns.Renderer.Scene.prototype.onMouseDrag = function(_event) {
-    this.is_dragging = true;
-    this.onMouseMove(_event);
-}
-
 Rkns.Renderer.Scene.prototype.onMouseUp = function(_event) {
+	this.mouse_down = false;
     if (this.click_target) {
         var _off = this.canvas_$.offset();
         this.click_target.mouseup(