can3p (can3p) wrote in changelog,
can3p
can3p
changelog

[livejournal] r20335: LJSUP-10149: Add note update. Contextual...

Committer: dpetrov
LJSUP-10149: Add note update. Contextual hover
U   trunk/htdocs/js/contextualhover.js
Modified: trunk/htdocs/js/contextualhover.js
===================================================================
--- trunk/htdocs/js/contextualhover.js	2011-10-17 08:54:13 UTC (rev 20334)
+++ trunk/htdocs/js/contextualhover.js	2011-10-17 09:05:53 UTC (rev 20335)
@@ -142,7 +142,10 @@
 					'<div class="b-contextualhover-section">' +
 					'<div class="b-contextualhover-title">' +
 						'<h3>{{html title.title}}</h3>' +
-						'{{each headLinks}}<p><a href="${$value.url}">${$value.text}</a></p>{{/each}}' +
+						'{{each headLinks}}' +
+								'<p>{{if $value.url}}<a href="${$value.url}">${$value.text}</a>' +
+								'{{else}}{{html $value}}{{/if}}</p>' + 
+						'{{/each}}' +
 					'</div>' +
 					'{{each(i, group) linkGroups}}' +
 						'{{if group.length }}' +
@@ -284,6 +287,33 @@
 				title: label
 			};
 
+			// aliases
+			if (!data.is_requester && data.is_logged_in) {
+				if (data.alias_enable) {
+					if (data.alias) {
+						buildObject.headLinks.push(data.alias.encodeHTML());
+					}
+					
+					buildObject.headLinks.push({
+						url: Site.siteroot + '/manage/notes.bml',
+						click: function(e)
+						{
+							e.preventDefault();
+							addAlias(this, data.alias_title, data.username, data.alias || '');
+						},
+						text: data.alias_title
+					});
+				} else {
+					buildObject.headLinks.push(
+						'<span class="alias-unavailable">'+
+							'<a href="'+Site.siteroot+'/manage/account">'+
+								'<img src="'+Site.statprefix+'/horizon/upgrade-paid-icon.gif" width="13" height="16" alt=""/>'+
+							'</a> '+
+							'<a href="'+Site.siteroot+'/support/faqbrowse.bml?faqid=295">'+data.alias_title+'</a>'+
+						'</span>');
+				}
+			}
+
 			// add/remove friend link
 			if (data.is_logged_in && !data.is_requester) {
 				buildObject.headLinks.push({
@@ -316,33 +346,6 @@
 
 			var linkGroup = [];
 			
-			// aliases
-			if (!data.is_requester && data.is_logged_in) {
-				if (data.alias_enable) {
-					if (data.alias) {
-						linkGroup.push(data.alias.encodeHTML());
-					}
-					
-					linkGroup.push({
-						url: Site.siteroot + '/manage/notes.bml',
-						click: function(e)
-						{
-							e.preventDefault();
-							addAlias(this, data.alias_title, data.username, data.alias || '');
-						},
-						text: data.alias_title
-					});
-				} else {
-					linkGroup.push(
-						'<span class="alias-unavailable">'+
-							'<a href="'+Site.siteroot+'/manage/account">'+
-								'<img src="'+Site.statprefix+'/horizon/upgrade-paid-icon.gif" width="13" height="16" alt=""/>'+
-							'</a> '+
-							'<a href="'+Site.siteroot+'/support/faqbrowse.bml?faqid=295">'+data.alias_title+'</a>'+
-						'</span>');
-				}
-			}
-
 			// member of community
 			if (data.is_logged_in && data.is_comm) {
 				linkGroup.push({

Tags: can3p, dpetrov, js, livejournal
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments