kallithea Changeset - 5d7f6b22d6b4

Changeset - 5d7f6b22d6b4

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-01-13 20:03:15
marcin@python-works.com

fixed issue #719 Journal revision ID tooltip AJAX query path is incorrect when running in a subdir

2 files changed with 2 insertions and 1 deletions:

rhodecode/public/js/rhodecode.js

rhodecode/templates/base/root.html

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -313,49 +313,49 @@ var show_more_event = function(){ @@
         YUD.setStyle(el.parentNode,'display','none');
     });
 };
 /**
  * show changeset tooltip
  */
 var show_changeset_tooltip = function(){
 	YUE.on(YUD.getElementsByClassName('lazy-cs'), 'mouseover', function(e){
 		var target = e.currentTarget;
 		var rid = YUD.getAttribute(target,'raw_id');
 		var repo_name = YUD.getAttribute(target,'repo_name');
 		var ttid = 'tt-'+rid;
 		var success = function(o){
 			var json = JSON.parse(o.responseText);
 			YUD.addClass(target,'tooltip')
 			YUD.setAttribute(target, 'title',json['message']);
 			YAHOO.yuitip.main.show_yuitip(e, target);
+		}
 		if(rid && !YUD.hasClass(target, 'tooltip')){
 			YUD.setAttribute(target,'id',ttid);
 			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)
+		}
 	});
 };
 var onSuccessFollow = function(target){
     var f = YUD.get(target.id);
     var f_cnt = YUD.get('current_followers_count');
     if(YUD.hasClass(f, 'follow')){
         f.setAttribute('class','following');
         f.setAttribute('title',_TM['Stop following this repository']);
         if(f_cnt){
             var cnt = Number(f_cnt.innerHTML)+1;
             f_cnt.innerHTML = cnt;
+        }
+    }
     else{
         f.setAttribute('class','follow');
         f.setAttribute('title',_TM['Start following this repository']);
         if(f_cnt){
             var cnt = Number(f_cnt.innerHTML)-1;
             f_cnt.innerHTML = cnt;
+        }

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -33,48 +33,49 @@ @@
 	      })();
 	     </script>
 	    %endif
         ## JAVASCRIPT ##
         <%def name="js()">
             <script type="text/javascript">
             //JS translations map
             var TRANSLATION_MAP = {
                 'add another comment':'${_("add another comment")}',
                 'Stop following this repository':"${_('Stop following this repository')}",
                 'Start following this repository':"${_('Start following this repository')}",
                 'Group':"${_('Group')}",
                 'members':"${_('members')}",
                 'loading...':"${_('loading...')}",
                 'search truncated': "${_('search truncated')}",
                 'no matching files': "${_('no matching files')}",
                 'Open new pull request': "${_('Open new pull request')}",
                 'Open new pull request for selected changesets':  "${_('Open new pull request for selected changesets')}",
                 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}",
                 'Selection link': "${_('Selection link')}",
             };
             var _TM = TRANSLATION_MAP;
             var TOGGLE_FOLLOW_URL  = "${h.url('toggle_following')}";
             var LAZY_CS_URL = "${h.url('changeset_info', repo_name='__NAME__', revision='__REV__')}"
             </script>
             <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.rhodecode_version)}"></script>
             <!--[if lt IE 9]>
                <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>
             <![endif]-->
             <script type="text/javascript" src="${h.url('/js/yui.flot.js', ver=c.rhodecode_version)}"></script>
             <script type="text/javascript" src="${h.url('/js/native.history.js', ver=c.rhodecode_version)}"></script>
             <script type="text/javascript" src="${h.url('/js/rhodecode.js', ver=c.rhodecode_version)}"></script>
            ## EXTRA FOR JS
            ${self.js_extra()}
             <script type="text/javascript">
             (function(window,undefined){
                 // Prepare
                 var History = window.History; // Note: We are using a capital H instead of a lower h
                 if ( !History.enabled ) {
                      // History.js is disabled for this browser.
                      // This is because we can optionally choose to support HTML4 browsers or not.
                     return false;
+                }
             })(window);
             YUE.onDOMReady(function(){
               tooltip_activate();
               show_more_event();

0 comments (0 inline, 0 general)