diff -r f0873867143a -r 47b3125130a2 client/js/paper-renderer.js --- a/client/js/paper-renderer.js Thu Feb 28 19:13:08 2013 +0100 +++ b/client/js/paper-renderer.js Fri Mar 01 19:14:30 2013 +0100 @@ -30,6 +30,11 @@ get: function(attr) { return this[attr] || false; } + }, + _BOOKMARKLET_CODE: function(_renkan) { + return "(function(a,b,c,d,e,f,h,i,j,l,m,n,o,p,q,r){a=document;b=a.body;c=a.location.href;j='draggable';m='text/x-iri-';d=a.createElement('div');d.innerHTML='" + + _renkan.translate("Drag items from this website, drop them in Renkan").replace(/ /g,"_") + + "

'.replace(/_/g,String.fromCharCode(32));b.appendChild(d);e=[{r:/https?:\\/\\/[^\\/]*twitter\\.com\\//,s:'.tweet',n:'twitter'},{r:/https?:\\/\\/[^\\/]*google\\.[^\\/]+\\//,s:'.g',n:'google'},{r:/^http:\\/\\/ldt\\.iri\\.centrepompidou\\.fr/,s:'.Ldt-AnnotationsList-li,.Ldt-Polemic-TweetDiv,.Ldt-Segments-Segment',n:'ldt'}];f=false;e.forEach(function(g){if(g.r.test(c)){f=g;}});if(f){h=function(){Array.prototype.forEach.call(a.querySelectorAll(f.s),function(i){i[j]=true})};window.setInterval(h,500);h();};a.addEventListener('dragstart',function(k){l=k.dataTransfer;l.setData(m+'source-uri',c);l.setData(m+'source-title',a.title);n=k.target;if(f){o=n;while(!o.attributes[j]){o=o.parentNode;if(o==b){break;}}}if(f&&o.attributes[j]){p=o.cloneNode(true);l.setData(m+'specific-site',f.n)}else{q=a.getSelection();if(q.type==='Range'||!q.type){p=q.getRangeAt(0).cloneContents();}else{p=n.cloneNode();}}r=a.createElement('div');r.appendChild(p);l.setData('text/x-iri-selected-text',r.textContent.trim());l.setData('text/x-iri-selected-html',r.innerHTML);},false);})();" } } @@ -672,23 +677,23 @@ Rkns.Renderer.NodeEditor.prototype.template = Rkns._.template( '

×<%-translate("Edit Node")%>

' - + '

<%-translate("Title:")%>

' - + '

<%-translate("URI:")%>

' - + '

<%-translate("Description:")%><%=node.description%>

' - + '

<%-translate("Size:")%>-<%=node.size%>+

' - + '

<%-translate("Node color:")%>

<%-translate("Title:")%>

<%-translate("URI:")%>

<%-translate("Description:")%><%-node.description%>

<%-translate("Size:")%>-<%-node.size%>+

<%-translate("Node color:")%>

Choose color

<%-translate("Image URL:")%>

<%-translate("Image URL:")%>

<%-translate("Choose Image File:")%>

<%-translate("Created by:")%> <%=node.created_by_title%>

<%-translate("Created by:")%> <%-node.created_by_title%>

×<%-node.title%>

×<%-node.title%>

<%-node.uri%>

<%-node.description%>

<%-translate("Created by:")%><%=node.created_by_title%>

<%-translate("Created by:")%><%-node.created_by_title%>

×<%-translate("Edit Edge")%>

<%-translate("Title:")%>

<%-translate("URI:")%>

<%-translate("Title:")%>

<%-translate("URI:")%>

<%-translate("Choose from vocabulary:")%>

<%-translate("Edge color:")%>

<%-translate("Edge color:")%>

Choose color

<%-translate("From:")%><%=edge.from_title%>

<%-translate("To:")%><%=edge.to_title%>

<%-translate("Created by:")%><%=edge.created_by_title%>

<%-translate("From:")%><%-edge.from_title%>

<%-translate("To:")%><%-edge.to_title%>

<%-translate("Created by:")%><%-edge.created_by_title%>

×<%- edge.title %>

×<%- edge.title %>

<%-edge.uri%>

<%-edge.description%>

<%-translate("From:")%><%=edge.from_title%>

<%-translate("To:")%><%=edge.to_title%>

<%-translate("Created by:")%><%=edge.created_by_title%>

<%-translate("From:")%><%-edge.from_title%>

<%-translate("To:")%><%-edge.to_title%>

<%-translate("Created by:")%><%-edge.created_by_title%>

').html(res["text/html"]); - newNode.image = snippet.find("img").attr("src") || ''; - newNode.uri = snippet.find("a").attr("href") || newNode.uri; - newNode.title = snippet.find("[title]").attr("title"); - } - if (res["text/uri-list"]) { - newNode.uri = res["text/uri-list"]; - } - if (res["text/x-moz-url"] && !newNode.title) { - newNode.title = (res["text/x-moz-url"].split("\n")[1] || "").trim(); - if (newNode.title === newNode.uri) { - newNode.title = false; - } - } - if (res["text/x-iri-source-title"] && !newNode.title) { - newNode.title = res["text/x-iri-source-title"]; + console.log(res); + switch(res["text/x-iri-specific-site"]) { + case "twitter": + var snippet = Rkns.$('

').html(res["text/x-iri-selected-html"]), + tweetdiv = snippet.find(".tweet") + newNode.title = _renkan.translate("Tweet by ") + tweetdiv.attr("data-name"); + newNode.uri = "http://twitter.com/" + tweetdiv.attr("data-screen-name") + "/status/" + tweetdiv.attr("data-tweet-id"); + newNode.image = tweetdiv.find(".avatar").attr("src"); + newNode.description = tweetdiv.find(".js-tweet-text:first").text(); + break; + case "google": + var snippet = Rkns.$('

').html(res["text/x-iri-selected-html"]); + newNode.title = snippet.find("h3:first").text().trim(); + newNode.uri = snippet.find("h3 a").attr("href"); + newNode.description = snippet.find(".st:first").text().trim(); + break; + case "ldt": + var snippet = Rkns.$('

').html(res["text/x-iri-selected-html"]), + tweetel = snippet.children().first(); + if (tweetel.hasClass("Ldt-AnnotationsList-li")) { + newNode.title = tweetel.find(".Ldt-AnnotationsList-Title").text().trim(); + newNode.description = tweetel.find(".Ldt-AnnotationsList-Description").text().trim(); + newNode.image = tweetel.find(".Ldt-AnnotationsList-Thumbnail").attr("src"); + var url = tweetel.find("a").attr("href"); + if (/^https?:\/\//.test(url)) { + newNode.uri = url; + } else { + newNode.uri = res["text/x-iri-source-uri"].replace(/#.*$/,'') + '#' + url.replace(/^.*#/,'') + } + newNode.color = tweetel[0].style.backgroundColor; + } + if (tweetel.hasClass("Ldt-Polemic-TweetDiv")) { + newNode.title = _renkan.translate("Annotation from PolemicTweet"); + newNode.uri = res["text/x-iri-source-uri"].replace(/#.*$/,'') + '#id=' + tweetel.attr("annotation-id"); + newNode.description = tweetel.attr("tweet-title"); + newNode.color = tweetel.attr("polemic-color"); + } + if (tweetel.hasClass("Ldt-Segments-Segment")) { + var text = tweetel.attr("segment-text").split(/<[^>]+>/g); + newNode.title = text[0]; + newNode.description = text.slice(1).join(""); + + newNode.uri = res["text/x-iri-source-uri"].replace(/#.*$/,''); + var match = tweetel.attr("trace-info").match(/segment-id:([\d\w_-]+)/); + if (match) { + newNode.uri += '#id=' + match[1]; + } + newNode.color = tweetel.attr("data-base-color"); + } + break; + case undefined: + default: + if (res["text/x-iri-source-uri"]) { + newNode.uri = res["text/x-iri-source-uri"]; + } + if (res["text/plain"] || res["text/x-iri-selected-text"]) { + newNode.description = (res["text/plain"] || res["text/x-iri-selected-text"]).replace(/[\s\n]+/gm,' ').trim(); + } + if (res["text/html"] || res["text/x-iri-selected-html"]) { + var snippet = Rkns.$('

').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"); + } + if (res["text/uri-list"]) { + newNode.uri = res["text/uri-list"]; + } + if (res["text/x-moz-url"] && !newNode.title) { + newNode.title = (res["text/x-moz-url"].split("\n")[1] || "").trim(); + if (newNode.title === newNode.uri) { + newNode.title = false; + } + } + if (res["text/x-iri-source-title"] && !newNode.title) { + newNode.title = res["text/x-iri-source-title"]; + } } var fields = ["title", "description", "uri", "image"]; for (var i = 0; i < fields.length; i++) { @@ -1298,6 +1383,7 @@ title: newNode.title || _this.renkan.translate("Dragged resource"), description: newNode.description || "", image: newNode.image || "", + color: newNode.color || undefined, position: { x: _coords.x, y: _coords.y @@ -1368,22 +1454,42 @@ _this.notif_$.text(_renkan.translate("Click on a first node to start the edge")).fadeIn(); } }); - this.$.find(".Rk-Bookmarklet-Button").click(function(){ - _this.notif_$ - .text(_renkan.translate("Drag this bookmarklet to your bookmark bar. When on a third-party website, click it to enable drag-and-drop from the website to Renkan.")) - .fadeIn() - .delay(5000) - .fadeOut(); - return false; - }); + this.$.find(".Rk-Bookmarklet-Button") + .attr("href","javascript:" + Rkns.Renderer._BOOKMARKLET_CODE(_renkan)) + .click(function(){ + _this.notif_$ + .text(_renkan.translate("Drag this button to your bookmark bar. When on a third-party website, click it to enable drag-and-drop from the website to Renkan.")) + .fadeIn() + .delay(5000) + .fadeOut(); + return false; + }); this.$.find(".Rk-TopBar-Button").mouseover(function() { Rkns.$(this).find(".Rk-TopBar-Tooltip").show(); }).mouseout(function() { Rkns.$(this).find(".Rk-TopBar-Tooltip").hide(); }); + this.$.find(".Rk-Fold-Bins").click(function() { + var bins = _renkan.$.find(".Rk-Bins"); + if (bins.offset().left < 0) { + bins.animate({left: 0},250); + _this.$.animate({left: 300},250,function() { + var w = _this.$.width(); + paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); + }); + $(this).html("«"); + } else { + bins.animate({left: -300},250); + _this.$.animate({left: 0},250,function() { + var w = _this.$.width(); + paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); + }); + $(this).html("»"); + } + }); paper.view.onResize = function(_event) { - _this.offset = _this.offset.add(_event.delta.divide(2)); + _this.offset = _this.offset.add(_event.delta.divide(2)); _this.resetCoords(); _this.minimap.topleft = paper.view.bounds.bottomRight.subtract(_this.minimap.size) _this.minimap.rectangle.fitBounds(_this.minimap.topleft.subtract([2,2]), _this.minimap.size.add([4,4])); @@ -1446,13 +1552,12 @@ + '' + '' + '' - + '' + + '' + '

' + '<% } %>' + '

' + + '<% if (show_bins) { %>

«

<% } %>' + '

">

">

' + '

' ); @@ -1507,8 +1612,8 @@ this.minimap.scale = _scale; } if (nodes.length === 1) { - this.minimap.offset = this.minimap.size.divide(2).subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y])); - this.minimap.scale = .25; + this.minimap.scale = .1; + this.minimap.offset = this.minimap.size.divide(2).subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y]).multiply(this.minimap.scale)); } this.redraw(); }