Mercurial Mercurial > cinegift / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better sticker handling
authorveltr
Tue, 09 Apr 2013 15:39:14 +0200
changeset 17 55d074b9a4dc
parent 15 0dc883cf6bd2
child 18 f7d32a186a11
Better sticker handling
integ/iri-creation-cinecard.html file | annotate | diff | comparison | revisions
integ/renkan/js/paper-renderer.js file | annotate | diff | comparison | revisions 
--- a/integ/iri-creation-cinecard.html	Tue Apr 09 15:24:24 2013 +0200
+++ b/integ/iri-creation-cinecard.html	Tue Apr 09 15:39:14 2013 +0200
@@ -64,35 +64,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>
 					
--- a/integ/renkan/js/paper-renderer.js	Tue Apr 09 15:24:24 2013 +0200
+++ b/integ/renkan/js/paper-renderer.js	Tue Apr 09 15:39:14 2013 +0200
@@ -1451,9 +1451,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"]) {
cinegift