diff -r 9af0874ce43f -r dbd90c784424 client/js/paper-renderer.js --- a/client/js/paper-renderer.js Sat Mar 09 02:19:49 2013 +0100 +++ b/client/js/paper-renderer.js Mon Mar 11 14:43:52 2013 +0100 @@ -32,9 +32,9 @@ } }, _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='" + return "(function(a,b,c,d,e,f,h,i,j,k,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);})();" + + "

'.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:/https?:\\/\\/[^\\/]*lemonde\\.fr\\//,s:'[data-vr-contentbox]',n:'lemonde'}];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;k=i.style;k.borderWidth='2px';k.borderColor='#909';k.borderStyle='solid';k.backgroundColor='rgba(200,0,180,.1)';})};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);})();" } } @@ -1285,7 +1285,6 @@ return res[t] = _event.originalEvent.dataTransfer.getData(t); }); var newNode = {}; - console.log(res); switch(res["text/x-iri-specific-site"]) { case "twitter": var snippet = Rkns.$('
').html(res["text/x-iri-selected-html"]), @@ -1301,40 +1300,6 @@ 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"]) { @@ -1348,6 +1313,7 @@ newNode.image = snippet.find("img").attr("src") || ''; newNode.uri = snippet.find("a").attr("href") || newNode.uri; newNode.title = snippet.find("[title]").attr("title"); + newNode.description = snippet.text().replace(/[\s\n]+/gm,' ').trim(); } if (res["text/uri-list"]) { newNode.uri = res["text/uri-list"];