Merge branch 'master' into linaro

Fixed conflicts:
	setup.py

1 files changed, 3 insertions, 4 deletions

diff --git a/rhodecode/public/js/rhodecode.js b/rhodecode/public/js/rhodecode.js
index 5b1ddb2f..f52a280c 100644
--- a/rhodecode/public/js/rhodecode.js
+++ b/rhodecode/public/js/rhodecode.js
@@ -334,7 +334,7 @@ var show_changeset_tooltip = function(){
 			YUD.setAttribute(target, 'title',_TM['loading...']);
 			YAHOO.yuitip.main.set_listeners(target);
 			YAHOO.yuitip.main.show_yuitip(e, target);			
-			ajaxGET('/changeset_info/{0}/{1}'.format(repo_name,rid), success)
+			ajaxGET(LAZY_CS_URL.replace('__NAME__',repo_name).replace('__REV__', rid), success)
 		}
 	});
 };
@@ -416,7 +416,6 @@ YAHOO.yuitip.main = {
 	},
 
 	init: function(){
-		yt._tooltip = '';
 		yt.tipBox = yt.$('tip-box');
 		if(!yt.tipBox){
 			yt.tipBox = document.createElement('div');
@@ -457,7 +456,7 @@ YAHOO.yuitip.main = {
 
 		if(yt.tipText !== ''){
 			// save org title
-			yt._tooltip = yt.tipText;
+			YUD.setAttribute(el, 'tt_title', yt.tipText);
 			// reset title to not show org tooltips
 			YUD.setAttribute(el, 'title', '');
 
@@ -495,7 +494,7 @@ YAHOO.yuitip.main = {
 		} else {
 			YUD.setStyle(yt.tipBox, 'display', 'none');
 		}
-		YUD.setAttribute(el,'title', yt._tooltip);
+		YUD.setAttribute(el,'title', YUD.getAttribute(el, 'tt_title'));
 	}
 }