# HG changeset patch # User Marcin Kuzminski # Date 1365209411 -7200 # Node ID e07b07ac9fbe19bf8571edc9c78d1ff6e0c42521 # Parent 45df84d36b44d95dd8b418295995b15fc363dd7f codecleaner for rhodecode.js diff -r 45df84d36b44 -r e07b07ac9fbe rhodecode/public/js/rhodecode.js --- a/rhodecode/public/js/rhodecode.js Sat Apr 06 02:49:42 2013 +0200 +++ b/rhodecode/public/js/rhodecode.js Sat Apr 06 02:50:11 2013 +0200 @@ -3,13 +3,13 @@ **/ if (typeof console == "undefined" || typeof console.log == "undefined"){ - console = { log: function() {} } + console = { log: function() {} } } var str_repeat = function(i, m) { - for (var o = []; m > 0; o[--m] = i); - return o.join(''); + for (var o = []; m > 0; o[--m] = i); + return o.join(''); }; /** @@ -19,48 +19,48 @@ * Inspired by https://gist.github.com/1049426 */ String.prototype.format = function() { - - function format() { - var str = this; - var len = arguments.length+1; - var safe = undefined; - var arg = undefined; - - // For each {0} {1} {n...} replace with the argument in that position. If - // the argument is an object or an array it will be stringified to JSON. - for (var i=0; i < len; arg = arguments[i++]) { - safe = typeof arg === 'object' ? JSON.stringify(arg) : arg; - str = str.replace(RegExp('\\{'+(i-1)+'\\}', 'g'), safe); - } - return str; - } + + function format() { + var str = this; + var len = arguments.length+1; + var safe = undefined; + var arg = undefined; - // Save a reference of what may already exist under the property native. - // Allows for doing something like: if("".format.native) { /* use native */ } - format.native = String.prototype.format; + // For each {0} {1} {n...} replace with the argument in that position. If + // the argument is an object or an array it will be stringified to JSON. + for (var i=0; i < len; arg = arguments[i++]) { + safe = typeof arg === 'object' ? JSON.stringify(arg) : arg; + str = str.replace(RegExp('\\{'+(i-1)+'\\}', 'g'), safe); + } + return str; + } - // Replace the prototype property - return format; + // Save a reference of what may already exist under the property native. + // Allows for doing something like: if("".format.native) { /* use native */ } + format.native = String.prototype.format; + + // Replace the prototype property + return format; }(); String.prototype.strip = function(char) { - if(char === undefined){ - char = '\\s'; - } - return this.replace(new RegExp('^'+char+'+|'+char+'+$','g'), ''); + if(char === undefined){ + char = '\\s'; + } + return this.replace(new RegExp('^'+char+'+|'+char+'+$','g'), ''); } String.prototype.lstrip = function(char) { - if(char === undefined){ - char = '\\s'; - } - return this.replace(new RegExp('^'+char+'+'),''); + if(char === undefined){ + char = '\\s'; + } + return this.replace(new RegExp('^'+char+'+'),''); } String.prototype.rstrip = function(char) { - if(char === undefined){ - char = '\\s'; - } - return this.replace(new RegExp(''+char+'+$'),''); + if(char === undefined){ + char = '\\s'; + } + return this.replace(new RegExp(''+char+'+$'),''); } @@ -90,30 +90,30 @@ * SmartColorGenerator * *usage:: - * var CG = new ColorGenerator(); + * var CG = new ColorGenerator(); * var col = CG.getColor(key); //returns array of RGB * 'rgb({0})'.format(col.join(',') - * + * * @returns {ColorGenerator} */ var ColorGenerator = function(){ - this.GOLDEN_RATIO = 0.618033988749895; - this.CURRENT_RATIO = 0.22717784590367374 // this can be random - this.HSV_1 = 0.75;//saturation - this.HSV_2 = 0.95; - this.color; - this.cacheColorMap = {}; + this.GOLDEN_RATIO = 0.618033988749895; + this.CURRENT_RATIO = 0.22717784590367374 // this can be random + this.HSV_1 = 0.75;//saturation + this.HSV_2 = 0.95; + this.color; + this.cacheColorMap = {}; }; ColorGenerator.prototype = { getColor:function(key){ - if(this.cacheColorMap[key] !== undefined){ - return this.cacheColorMap[key]; - } - else{ - this.cacheColorMap[key] = this.generateColor(); - return this.cacheColorMap[key]; - } + if(this.cacheColorMap[key] !== undefined){ + return this.cacheColorMap[key]; + } + else{ + this.cacheColorMap[key] = this.generateColor(); + return this.cacheColorMap[key]; + } }, _hsvToRgb:function(h,s,v){ if (s == 0.0) @@ -124,18 +124,18 @@ q = v * (1.0 - s * f) t = v * (1.0 - s * (1.0 - f)) i = i % 6 - if (i == 0) + if (i == 0) return [v, t, p] - if (i == 1) + if (i == 1) return [q, v, p] - if (i == 2) + if (i == 2) return [p, v, t] if (i == 3) return [p, q, v] - if (i == 4) + if (i == 4) return [t, p, v] if (i == 5) - return [v, p, q] + return [v, p, q] }, generateColor:function(){ this.CURRENT_RATIO = this.CURRENT_RATIO+this.GOLDEN_RATIO; @@ -143,20 +143,20 @@ HSV_tuple = [this.CURRENT_RATIO, this.HSV_1, this.HSV_2] RGB_tuple = this._hsvToRgb(HSV_tuple[0],HSV_tuple[1],HSV_tuple[2]); function toRgb(v){ - return ""+parseInt(v*256) + return ""+parseInt(v*256) } return [toRgb(RGB_tuple[0]),toRgb(RGB_tuple[1]),toRgb(RGB_tuple[2])]; - + } } /** * PyRoutesJS - * + * * Usage pyroutes.url('mark_error_fixed',{"error_id":error_id}) // /mark_error_fixed/ */ var pyroutes = (function() { - // access global map defined in special file pyroutes + // access global map defined in special file pyroutes var matchlist = PROUTES_MAP; var sprintf = (function() { function get_type(variable) { @@ -285,7 +285,7 @@ 'url': function(route_name, params) { var result = route_name; if (typeof(params) != 'object'){ - params = {}; + params = {}; } if (matchlist.hasOwnProperty(route_name)) { var route = matchlist[route_name]; @@ -296,40 +296,40 @@ throw new Error(route[1][i] + ' missing in "' + route_name + '" route generation'); } result = sprintf(route[0], params); - + var ret = []; //extra params => GET for(param in params){ - if (route[1].indexOf(param) == -1){ - ret.push(encodeURIComponent(param) + "=" + encodeURIComponent(params[param])); - } + if (route[1].indexOf(param) == -1){ + ret.push(encodeURIComponent(param) + "=" + encodeURIComponent(params[param])); + } } var _parts = ret.join("&"); if(_parts){ - result = result +'?'+ _parts + result = result +'?'+ _parts } } return result; }, - 'register': function(route_name, route_tmpl, req_params) { - if (typeof(req_params) != 'object') { - req_params = []; - } - //fix escape - route_tmpl = unescape(route_tmpl); - keys = []; - for (o in req_params){ - keys.push(req_params[o]) - } - matchlist[route_name] = [ - route_tmpl, - keys - ] - }, - '_routes': function(){ - return matchlist; - } + 'register': function(route_name, route_tmpl, req_params) { + if (typeof(req_params) != 'object') { + req_params = []; + } + //fix escape + route_tmpl = unescape(route_tmpl); + keys = []; + for (o in req_params){ + keys.push(req_params[o]) + } + matchlist[route_name] = [ + route_tmpl, + keys + ] + }, + '_routes': function(){ + return matchlist; + } } })(); @@ -345,31 +345,31 @@ // defines if push state is enabled for this browser ? var push_state_enabled = Boolean( - window.history && window.history.pushState && window.history.replaceState - && !( /* disable for versions of iOS before version 4.3 (8F190) */ - (/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i).test(navigator.userAgent) - /* disable for the mercury iOS browser, or at least older versions of the webkit engine */ - || (/AppleWebKit\/5([0-2]|3[0-2])/i).test(navigator.userAgent) - ) + window.history && window.history.pushState && window.history.replaceState + && !( /* disable for versions of iOS before version 4.3 (8F190) */ + (/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i).test(navigator.userAgent) + /* disable for the mercury iOS browser, or at least older versions of the webkit engine */ + || (/AppleWebKit\/5([0-2]|3[0-2])/i).test(navigator.userAgent) + ) ); var _run_callbacks = function(callbacks){ - if (callbacks !== undefined){ - var _l = callbacks.length; - for (var i=0;i<_l;i++){ - var func = callbacks[i]; - if(typeof(func)=='function'){ - try{ - func(); - }catch (err){}; - } - } - } + if (callbacks !== undefined){ + var _l = callbacks.length; + for (var i=0;i<_l;i++){ + var func = callbacks[i]; + if(typeof(func)=='function'){ + try{ + func(); + }catch (err){}; + } + } + } } /** * Partial Ajax Implementation - * + * * @param url: defines url to make partial request * @param container: defines id of container to input partial result * @param s_call: success callback function that takes o as arg @@ -382,44 +382,44 @@ * o.responseXML * o.argument * @param f_call: failure callback - * @param args arguments + * @param args arguments */ function ypjax(url,container,s_call,f_call,args){ - var method='GET'; - if(args===undefined){ - args=null; - } - - // Set special header for partial ajax == HTTP_X_PARTIAL_XHR - YUC.initHeader('X-PARTIAL-XHR',true); - - // wrapper of passed callback - var s_wrapper = (function(o){ - return function(o){ - YUD.get(container).innerHTML=o.responseText; - YUD.setStyle(container,'opacity','1.0'); - //execute the given original callback - if (s_call !== undefined){ - s_call(o); - } - } - })() - YUD.setStyle(container,'opacity','0.3'); - YUC.asyncRequest(method,url,{ - success:s_wrapper, - failure:function(o){ - console.log(o); - YUD.get(container).innerHTML='ERROR: {0}'.format(o.status); - YUD.setStyle(container,'opacity','1.0'); - }, - cache:false - },args); - + var method='GET'; + if(args===undefined){ + args=null; + } + + // Set special header for partial ajax == HTTP_X_PARTIAL_XHR + YUC.initHeader('X-PARTIAL-XHR',true); + + // wrapper of passed callback + var s_wrapper = (function(o){ + return function(o){ + YUD.get(container).innerHTML=o.responseText; + YUD.setStyle(container,'opacity','1.0'); + //execute the given original callback + if (s_call !== undefined){ + s_call(o); + } + } + })() + YUD.setStyle(container,'opacity','0.3'); + YUC.asyncRequest(method,url,{ + success:s_wrapper, + failure:function(o){ + console.log(o); + YUD.get(container).innerHTML='ERROR: {0}'.format(o.status); + YUD.setStyle(container,'opacity','1.0'); + }, + cache:false + },args); + }; var ajaxGET = function(url,success) { - // Set special header for ajax == HTTP_X_PARTIAL_XHR - YUC.initHeader('X-PARTIAL-XHR',true); + // Set special header for ajax == HTTP_X_PARTIAL_XHR + YUC.initHeader('X-PARTIAL-XHR',true); var sUrl = url; var callback = { @@ -438,20 +438,20 @@ var ajaxPOST = function(url,postData,success) { - // Set special header for ajax == HTTP_X_PARTIAL_XHR - YUC.initHeader('X-PARTIAL-XHR',true); - - var toQueryString = function(o) { - if(typeof o !== 'object') { - return false; - } - var _p, _qs = []; - for(_p in o) { - _qs.push(encodeURIComponent(_p) + '=' + encodeURIComponent(o[_p])); - } - return _qs.join('&'); - }; - + // Set special header for ajax == HTTP_X_PARTIAL_XHR + YUC.initHeader('X-PARTIAL-XHR',true); + + var toQueryString = function(o) { + if(typeof o !== 'object') { + return false; + } + var _p, _qs = []; + for(_p in o) { + _qs.push(encodeURIComponent(_p) + '=' + encodeURIComponent(o[_p])); + } + return _qs.join('&'); + }; + var sUrl = url; var callback = { success: success, @@ -469,8 +469,8 @@ * tooltip activate */ var tooltip_activate = function(){ - yt = YAHOO.yuitip.main; - YUE.onDOMReady(yt.init); + yt = YAHOO.yuitip.main; + YUE.onDOMReady(yt.init); }; /** @@ -488,26 +488,26 @@ * 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); - var url = pyroutes.url('changeset_info', {"repo_name":repo_name, "revision": rid}); - ajaxGET(url, success) - } - }); + 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); + var url = pyroutes.url('changeset_info', {"repo_name":repo_name, "revision": rid}); + ajaxGET(url, success) + } + }); }; var onSuccessFollow = function(target){ @@ -541,7 +541,7 @@ } YUC.asyncRequest('POST',TOGGLE_FOLLOW_URL,{ success:function(o){ - onSuccessFollow(target); + onSuccessFollow(target); } },args); return false; @@ -556,7 +556,7 @@ } YUC.asyncRequest('POST',TOGGLE_FOLLOW_URL,{ success:function(o){ - onSuccessFollow(target); + onSuccessFollow(target); } },args); return false; @@ -564,18 +564,18 @@ var showRepoSize = function(target, repo_name, token){ var args= 'auth_token='+token; - + if(!YUD.hasClass(target, 'loaded')){ YUD.get(target).innerHTML = _TM['Loading ...']; var url = pyroutes.url('repo_size', {"repo_name":repo_name}); YUC.asyncRequest('POST',url,{ success:function(o){ - YUD.get(target).innerHTML = JSON.parse(o.responseText); - YUD.addClass(target, 'loaded'); + YUD.get(target).innerHTML = JSON.parse(o.responseText); + YUD.addClass(target, 'loaded'); } - },args); + },args); } - return false; + return false; } /** @@ -584,207 +584,207 @@ YAHOO.namespace('yuitip'); YAHOO.yuitip.main = { - $: YAHOO.util.Dom.get, + $: YAHOO.util.Dom.get, - bgColor: '#000', - speed: 0.3, - opacity: 0.9, - offset: [15,15], - useAnim: false, - maxWidth: 600, - add_links: false, - yuitips: [], + bgColor: '#000', + speed: 0.3, + opacity: 0.9, + offset: [15,15], + useAnim: false, + maxWidth: 600, + add_links: false, + yuitips: [], - set_listeners: function(tt){ - YUE.on(tt, 'mouseover', yt.show_yuitip, tt); - YUE.on(tt, 'mousemove', yt.move_yuitip, tt); - YUE.on(tt, 'mouseout', yt.close_yuitip, tt); - }, + set_listeners: function(tt){ + YUE.on(tt, 'mouseover', yt.show_yuitip, tt); + YUE.on(tt, 'mousemove', yt.move_yuitip, tt); + YUE.on(tt, 'mouseout', yt.close_yuitip, tt); + }, - init: function(){ - yt.tipBox = yt.$('tip-box'); - if(!yt.tipBox){ - yt.tipBox = document.createElement('div'); - document.body.appendChild(yt.tipBox); - yt.tipBox.id = 'tip-box'; - } + init: function(){ + yt.tipBox = yt.$('tip-box'); + if(!yt.tipBox){ + yt.tipBox = document.createElement('div'); + document.body.appendChild(yt.tipBox); + yt.tipBox.id = 'tip-box'; + } - YUD.setStyle(yt.tipBox, 'display', 'none'); - YUD.setStyle(yt.tipBox, 'position', 'absolute'); - if(yt.maxWidth !== null){ - YUD.setStyle(yt.tipBox, 'max-width', yt.maxWidth+'px'); - } + YUD.setStyle(yt.tipBox, 'display', 'none'); + YUD.setStyle(yt.tipBox, 'position', 'absolute'); + if(yt.maxWidth !== null){ + YUD.setStyle(yt.tipBox, 'max-width', yt.maxWidth+'px'); + } - var yuitips = YUD.getElementsByClassName('tooltip'); + var yuitips = YUD.getElementsByClassName('tooltip'); - if(yt.add_links === true){ - var links = document.getElementsByTagName('a'); - var linkLen = links.length; - for(i=0;i'+ - ''+ - ''+ + var _el = document.createElement('div'); + var cont = new YAHOO.util.Element(body); + var comment_id = fromHTML(body).children[0].id.split('comment-')[1]; + var id = 'comment-tr-{0}'.format(comment_id); + var _html = (''+ + ''+ + ''+ ''+ '
{2}
').format(id, cls, body); - _el.innerHTML = _html; - return _el.children[0].children[0].children[0]; + _el.innerHTML = _html; + return _el.children[0].children[0].children[0]; }; /** comments **/ var removeInlineForm = function(form) { - form.parentNode.removeChild(form); + form.parentNode.removeChild(form); }; var createInlineForm = function(parent_tr, f_path, line) { - var tmpl = YUD.get('comment-inline-form-template').innerHTML; - tmpl = tmpl.format(f_path, line); - var form = tableTr('comment-form-inline',tmpl) + var tmpl = YUD.get('comment-inline-form-template').innerHTML; + tmpl = tmpl.format(f_path, line); + var form = tableTr('comment-form-inline',tmpl) - // create event for hide button - form = new YAHOO.util.Element(form); - var form_hide_button = new YAHOO.util.Element(YUD.getElementsByClassName('hide-inline-form',null,form)[0]); - form_hide_button.on('click', function(e) { - var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode; - if(YUD.hasClass(newtr.nextElementSibling,'inline-comments-button')){ - YUD.setStyle(newtr.nextElementSibling,'display',''); - } - removeInlineForm(newtr); - YUD.removeClass(parent_tr, 'form-open'); - YUD.removeClass(parent_tr, 'hl-comment'); - - }); - - return form + // create event for hide button + form = new YAHOO.util.Element(form); + var form_hide_button = new YAHOO.util.Element(YUD.getElementsByClassName('hide-inline-form',null,form)[0]); + form_hide_button.on('click', function(e) { + var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode; + if(YUD.hasClass(newtr.nextElementSibling,'inline-comments-button')){ + YUD.setStyle(newtr.nextElementSibling,'display',''); + } + removeInlineForm(newtr); + YUD.removeClass(parent_tr, 'form-open'); + YUD.removeClass(parent_tr, 'hl-comment'); + + }); + + return form }; /** @@ -793,116 +793,116 @@ * block at the very bottom */ var injectInlineForm = function(tr){ - if(!YUD.hasClass(tr, 'line')){ - return - } - var submit_url = AJAX_COMMENT_URL; - var _td = YUD.getElementsByClassName('code',null,tr)[0]; - if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context') || YUD.hasClass(_td,'no-comment')){ - return - } - YUD.addClass(tr,'form-open'); - YUD.addClass(tr,'hl-comment'); - var node = YUD.getElementsByClassName('full_f_path',null,tr.parentNode.parentNode.parentNode)[0]; - var f_path = YUD.getAttribute(node,'path'); - var lineno = getLineNo(tr); - var form = createInlineForm(tr, f_path, lineno, submit_url); - - var parent = tr; - while (1){ - var n = parent.nextElementSibling; - // next element are comments ! - if(YUD.hasClass(n,'inline-comments')){ - parent = n; - } - else{ - break; - } - } - YUD.insertAfter(form,parent); - var f = YUD.get(form); - var overlay = YUD.getElementsByClassName('overlay',null,f)[0]; - var _form = YUD.getElementsByClassName('inline-form',null,f)[0]; - - YUE.on(YUD.get(_form), 'submit',function(e){ - YUE.preventDefault(e); - - //ajax submit - var text = YUD.get('text_'+lineno).value; - var postData = { - 'text':text, - 'f_path':f_path, - 'line':lineno - }; - - if(lineno === undefined){ - alert('missing line !'); - return - } - if(f_path === undefined){ - alert('missing file path !'); - return - } - - if(text == ""){ - return - } - - var success = function(o){ - YUD.removeClass(tr, 'form-open'); - removeInlineForm(f); - var json_data = JSON.parse(o.responseText); - renderInlineComment(json_data); - }; + if(!YUD.hasClass(tr, 'line')){ + return + } + var submit_url = AJAX_COMMENT_URL; + var _td = YUD.getElementsByClassName('code',null,tr)[0]; + if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context') || YUD.hasClass(_td,'no-comment')){ + return + } + YUD.addClass(tr,'form-open'); + YUD.addClass(tr,'hl-comment'); + var node = YUD.getElementsByClassName('full_f_path',null,tr.parentNode.parentNode.parentNode)[0]; + var f_path = YUD.getAttribute(node,'path'); + var lineno = getLineNo(tr); + var form = createInlineForm(tr, f_path, lineno, submit_url); + + var parent = tr; + while (1){ + var n = parent.nextElementSibling; + // next element are comments ! + if(YUD.hasClass(n,'inline-comments')){ + parent = n; + } + else{ + break; + } + } + YUD.insertAfter(form,parent); + var f = YUD.get(form); + var overlay = YUD.getElementsByClassName('overlay',null,f)[0]; + var _form = YUD.getElementsByClassName('inline-form',null,f)[0]; + + YUE.on(YUD.get(_form), 'submit',function(e){ + YUE.preventDefault(e); + + //ajax submit + var text = YUD.get('text_'+lineno).value; + var postData = { + 'text':text, + 'f_path':f_path, + 'line':lineno + }; + + if(lineno === undefined){ + alert('missing line !'); + return + } + if(f_path === undefined){ + alert('missing file path !'); + return + } - if (YUD.hasClass(overlay,'overlay')){ - var w = _form.offsetWidth; - var h = _form.offsetHeight; - YUD.setStyle(overlay,'width',w+'px'); - YUD.setStyle(overlay,'height',h+'px'); - } - YUD.addClass(overlay, 'submitting'); - - ajaxPOST(submit_url, postData, success); - }); + if(text == ""){ + return + } + + var success = function(o){ + YUD.removeClass(tr, 'form-open'); + removeInlineForm(f); + var json_data = JSON.parse(o.responseText); + renderInlineComment(json_data); + }; - YUE.on('preview-btn_'+lineno, 'click', function(e){ - var _text = YUD.get('text_'+lineno).value; - if(!_text){ - return - } - var post_data = {'text': _text}; - YUD.addClass('preview-box_'+lineno, 'unloaded'); - YUD.get('preview-box_'+lineno).innerHTML = _TM['Loading ...']; - YUD.setStyle('edit-container_'+lineno, 'display', 'none'); - YUD.setStyle('preview-container_'+lineno, 'display', ''); + if (YUD.hasClass(overlay,'overlay')){ + var w = _form.offsetWidth; + var h = _form.offsetHeight; + YUD.setStyle(overlay,'width',w+'px'); + YUD.setStyle(overlay,'height',h+'px'); + } + YUD.addClass(overlay, 'submitting'); + + ajaxPOST(submit_url, postData, success); + }); - var url = pyroutes.url('changeset_comment_preview', {'repo_name': REPO_NAME}); - ajaxPOST(url,post_data,function(o){ - YUD.get('preview-box_'+lineno).innerHTML = o.responseText; - YUD.removeClass('preview-box_'+lineno, 'unloaded'); - }) - }) - YUE.on('edit-btn_'+lineno, 'click', function(e){ - YUD.setStyle('edit-container_'+lineno, 'display', ''); - YUD.setStyle('preview-container_'+lineno, 'display', 'none'); - }) - - - setTimeout(function(){ - // callbacks - tooltip_activate(); - MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno, - _USERS_AC_DATA, _GROUPS_AC_DATA); - var _e = YUD.get('text_'+lineno); - if(_e){ - _e.focus(); - } - },10) + YUE.on('preview-btn_'+lineno, 'click', function(e){ + var _text = YUD.get('text_'+lineno).value; + if(!_text){ + return + } + var post_data = {'text': _text}; + YUD.addClass('preview-box_'+lineno, 'unloaded'); + YUD.get('preview-box_'+lineno).innerHTML = _TM['Loading ...']; + YUD.setStyle('edit-container_'+lineno, 'display', 'none'); + YUD.setStyle('preview-container_'+lineno, 'display', ''); + + var url = pyroutes.url('changeset_comment_preview', {'repo_name': REPO_NAME}); + ajaxPOST(url,post_data,function(o){ + YUD.get('preview-box_'+lineno).innerHTML = o.responseText; + YUD.removeClass('preview-box_'+lineno, 'unloaded'); + }) + }) + YUE.on('edit-btn_'+lineno, 'click', function(e){ + YUD.setStyle('edit-container_'+lineno, 'display', ''); + YUD.setStyle('preview-container_'+lineno, 'display', 'none'); + }) + + + setTimeout(function(){ + // callbacks + tooltip_activate(); + MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno, + _USERS_AC_DATA, _GROUPS_AC_DATA); + var _e = YUD.get('text_'+lineno); + if(_e){ + _e.focus(); + } + },10) }; var deleteComment = function(comment_id){ - var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__',comment_id); + var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__',comment_id); var postData = {'_method':'delete'}; var success = function(o){ var n = YUD.get('comment-tr-'+comment_id); @@ -912,7 +912,7 @@ // scann nodes, and attach add button to last one only for TR // which are the inline comments if(root && root.tagName == 'TR'){ - placeAddButton(root); + placeAddButton(root); } } ajaxPOST(url,postData,success); @@ -920,91 +920,91 @@ var createInlineAddButton = function(tr){ - var label = TRANSLATION_MAP['Add another comment']; - - var html_el = document.createElement('div'); - YUD.addClass(html_el, 'add-comment'); - html_el.innerHTML = '{0}'.format(label); - - var add = new YAHOO.util.Element(html_el); - add.on('click', function(e) { - injectInlineForm(tr); - }); - return add; + var label = TRANSLATION_MAP['Add another comment']; + + var html_el = document.createElement('div'); + YUD.addClass(html_el, 'add-comment'); + html_el.innerHTML = '{0}'.format(label); + + var add = new YAHOO.util.Element(html_el); + add.on('click', function(e) { + injectInlineForm(tr); + }); + return add; }; var getLineNo = function(tr) { - var line; - var o = tr.children[0].id.split('_'); - var n = tr.children[1].id.split('_'); + var line; + var o = tr.children[0].id.split('_'); + var n = tr.children[1].id.split('_'); - if (n.length >= 2) { - line = n[n.length-1]; - } else if (o.length >= 2) { - line = o[o.length-1]; - } + if (n.length >= 2) { + line = n[n.length-1]; + } else if (o.length >= 2) { + line = o[o.length-1]; + } - return line + return line }; var placeAddButton = function(target_tr){ - if(!target_tr){ - return - } - var last_node = target_tr; - //scann - while (1){ - var n = last_node.nextElementSibling; - // next element are comments ! - if(YUD.hasClass(n,'inline-comments')){ - last_node = n; - //also remove the comment button from previous - var comment_add_buttons = YUD.getElementsByClassName('add-comment',null,last_node); - for(var i=0;i matches_max){ - break; - } - - var n = nodes[i].name; - var t = nodes[i].type; - var n_hl = n.substring(0,pos) - +"{0}".format(n.substring(pos,pos+query.length)) - +n.substring(pos+query.length) - var new_url = url_base.replace('__FPATH__',n); - match.push('{2}'.format(t,new_url,n_hl)); - } - if(match.length >= matches_max){ - match.push('{0}'.format(_TM['Search truncated'])); - } - } - } - if(query != ""){ - YUD.setStyle('tbody','display','none'); - YUD.setStyle('tbody_filtered','display',''); - - if (match.length==0){ - match.push('{0}'.format(_TM['No matching files'])); - } - - YUD.get('tbody_filtered').innerHTML = match.join(""); - } - else{ - YUD.setStyle('tbody','display',''); - YUD.setStyle('tbody_filtered','display','none'); - } - - } - }; + var pos = nodes[i].name.toLowerCase().indexOf(query) + if(query && pos != -1){ + + matches++ + //show only certain amount to not kill browser + if (matches > matches_max){ + break; + } + + var n = nodes[i].name; + var t = nodes[i].type; + var n_hl = n.substring(0,pos) + +"{0}".format(n.substring(pos,pos+query.length)) + +n.substring(pos+query.length) + var new_url = url_base.replace('__FPATH__',n); + match.push('{2}'.format(t,new_url,n_hl)); + } + if(match.length >= matches_max){ + match.push('{0}'.format(_TM['Search truncated'])); + } + } + } + if(query != ""){ + YUD.setStyle('tbody','display','none'); + YUD.setStyle('tbody_filtered','display',''); - YUE.on(YUD.get('filter_activate'),'click',function(){ - F.initFilter(); - }) - YUE.on(n_filter,'click',function(){ - if(YUD.hasClass(n_filter,'init')){ - n_filter.value = ''; - YUD.removeClass(n_filter,'init'); - } - }); - YUE.on(n_filter,'keyup',function(e){ - clearTimeout(F.filterTimeout); - F.filterTimeout = setTimeout(F.updateFilter(e),600); - }); + if (match.length==0){ + match.push('{0}'.format(_TM['No matching files'])); + } + + YUD.get('tbody_filtered').innerHTML = match.join(""); + } + else{ + YUD.setStyle('tbody','display',''); + YUD.setStyle('tbody_filtered','display','none'); + } + + } + }; + + YUE.on(YUD.get('filter_activate'),'click',function(){ + F.initFilter(); + }) + YUE.on(n_filter,'click',function(){ + if(YUD.hasClass(n_filter,'init')){ + n_filter.value = ''; + YUD.removeClass(n_filter,'init'); + } + }); + YUE.on(n_filter,'keyup',function(e){ + clearTimeout(F.filterTimeout); + F.filterTimeout = setTimeout(F.updateFilter(e),600); + }); }; -var initCodeMirror = function(textAreadId,resetUrl){ +var initCodeMirror = function(textAreadId,resetUrl){ var myCodeMirror = CodeMirror.fromTextArea(YUD.get(textAreadId),{ mode: "null", lineNumbers:true @@ -1162,129 +1162,129 @@ YUE.on('reset','click',function(e){ window.location=resetUrl }); - + YUE.on('file_enable','click',function(){ YUD.setStyle('editor_container','display',''); YUD.setStyle('upload_file_container','display','none'); YUD.setStyle('filename_container','display',''); }); - + YUE.on('upload_file_enable','click',function(){ YUD.setStyle('editor_container','display','none'); YUD.setStyle('upload_file_container','display',''); YUD.setStyle('filename_container','display','none'); - }); + }); }; var getIdentNode = function(n){ - //iterate thru nodes untill matched interesting node ! - - if (typeof n == 'undefined'){ - return -1 - } - - if(typeof n.id != "undefined" && n.id.match('L[0-9]+')){ - return n - } - else{ - return getIdentNode(n.parentNode); - } + //iterate thru nodes untill matched interesting node ! + + if (typeof n == 'undefined'){ + return -1 + } + + if(typeof n.id != "undefined" && n.id.match('L[0-9]+')){ + return n + } + else{ + return getIdentNode(n.parentNode); + } }; var getSelectionLink = function(e) { - //get selection from start/to nodes - if (typeof window.getSelection != "undefined") { - s = window.getSelection(); - - from = getIdentNode(s.anchorNode); - till = getIdentNode(s.focusNode); - - f_int = parseInt(from.id.replace('L','')); - t_int = parseInt(till.id.replace('L','')); - - if (f_int > t_int){ - //highlight from bottom - offset = -35; - ranges = [t_int,f_int]; - - } - else{ - //highligth from top - offset = 35; - ranges = [f_int,t_int]; - } - // if we select more than 2 lines - if (ranges[0] != ranges[1]){ - if(YUD.get('linktt') == null){ - hl_div = document.createElement('div'); - hl_div.id = 'linktt'; - } - hl_div.innerHTML = ''; + //get selection from start/to nodes + if (typeof window.getSelection != "undefined") { + s = window.getSelection(); + + from = getIdentNode(s.anchorNode); + till = getIdentNode(s.focusNode); + + f_int = parseInt(from.id.replace('L','')); + t_int = parseInt(till.id.replace('L','')); + + if (f_int > t_int){ + //highlight from bottom + offset = -35; + ranges = [t_int,f_int]; - anchor = '#L'+ranges[0]+'-'+ranges[1]; - var link = document.createElement('a'); - link.href = location.href.substring(0,location.href.indexOf('#'))+anchor; - link.innerHTML = _TM['Selection link']; - hl_div.appendChild(link); - YUD.get('body').appendChild(hl_div); - - xy = YUD.getXY(till.id); + } + else{ + //highligth from top + offset = 35; + ranges = [f_int,t_int]; + } + // if we select more than 2 lines + if (ranges[0] != ranges[1]){ + if(YUD.get('linktt') == null){ + hl_div = document.createElement('div'); + hl_div.id = 'linktt'; + } + hl_div.innerHTML = ''; - YUD.addClass('linktt', 'hl-tip-box'); - YUD.setStyle('linktt','top',xy[1]+offset+'px'); - YUD.setStyle('linktt','left',xy[0]+'px'); - YUD.setStyle('linktt','visibility','visible'); + anchor = '#L'+ranges[0]+'-'+ranges[1]; + var link = document.createElement('a'); + link.href = location.href.substring(0,location.href.indexOf('#'))+anchor; + link.innerHTML = _TM['Selection link']; + hl_div.appendChild(link); + YUD.get('body').appendChild(hl_div); + + xy = YUD.getXY(till.id); - } - else{ - YUD.setStyle('linktt','visibility','hidden'); - } - } + YUD.addClass('linktt', 'hl-tip-box'); + YUD.setStyle('linktt','top',xy[1]+offset+'px'); + YUD.setStyle('linktt','left',xy[0]+'px'); + YUD.setStyle('linktt','visibility','visible'); + + } + else{ + YUD.setStyle('linktt','visibility','hidden'); + } + } }; var deleteNotification = function(url, notification_id,callbacks){ - var callback = { - success:function(o){ - var obj = YUD.get(String("notification_"+notification_id)); - if(obj.parentNode !== undefined){ - obj.parentNode.removeChild(obj); - } - _run_callbacks(callbacks); - }, - failure:function(o){ - alert("error"); - }, - }; + var callback = { + success:function(o){ + var obj = YUD.get(String("notification_"+notification_id)); + if(obj.parentNode !== undefined){ + obj.parentNode.removeChild(obj); + } + _run_callbacks(callbacks); + }, + failure:function(o){ + alert("error"); + }, + }; var postData = '_method=delete'; var sUrl = url.replace('__NOTIFICATION_ID__',notification_id); - var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, - callback, postData); -}; + var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, + callback, postData); +}; var readNotification = function(url, notification_id,callbacks){ - var callback = { - success:function(o){ - var obj = YUD.get(String("notification_"+notification_id)); - YUD.removeClass(obj, 'unread'); - var r_button = YUD.getElementsByClassName('read-notification',null,obj.children[0])[0]; - - if(r_button.parentNode !== undefined){ - r_button.parentNode.removeChild(r_button); - } - _run_callbacks(callbacks); - }, - failure:function(o){ - alert("error"); - }, - }; + var callback = { + success:function(o){ + var obj = YUD.get(String("notification_"+notification_id)); + YUD.removeClass(obj, 'unread'); + var r_button = YUD.getElementsByClassName('read-notification',null,obj.children[0])[0]; + + if(r_button.parentNode !== undefined){ + r_button.parentNode.removeChild(r_button); + } + _run_callbacks(callbacks); + }, + failure:function(o){ + alert("error"); + }, + }; var postData = '_method=put'; var sUrl = url.replace('__NOTIFICATION_ID__',notification_id); - var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, - callback, postData); -}; + var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, + callback, postData); +}; /** MEMBERS AUTOCOMPLETE WIDGET **/ @@ -1303,9 +1303,9 @@ // Match against each name of each contact for (; i < l; i++) { contact = myUsers[i]; - if (((contact.fname+"").toLowerCase().indexOf(query) > -1) || - ((contact.lname+"").toLowerCase().indexOf(query) > -1) || - ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) { + if (((contact.fname+"").toLowerCase().indexOf(query) > -1) || + ((contact.lname+"").toLowerCase().indexOf(query) > -1) || + ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) { matches[matches.length] = contact; } } @@ -1354,7 +1354,7 @@ membersAC.useShadow = false; membersAC.resultTypeList = false; membersAC.animVert = false; - membersAC.animHoriz = false; + membersAC.animHoriz = false; membersAC.animSpeed = 0.1; // Instantiate AutoComplete for owner @@ -1367,9 +1367,9 @@ // Helper highlight function for the formatter var highlightMatch = function (full, snippet, matchindex) { - return full.substring(0, matchindex) - + "" - + full.substr(matchindex, snippet.length) + return full.substring(0, matchindex) + + "" + + full.substr(matchindex, snippet.length) + "" + full.substring(matchindex + snippet.length); }; @@ -1377,11 +1377,11 @@ var custom_formatter = function (oResultData, sQuery, sResultMatch) { var query = sQuery.toLowerCase(); var _gravatar = function(res, em, group){ - if (group !== undefined){ - em = '/images/icons/group.png' - } - tmpl = '
{1}
' - return tmpl.format(em,res) + if (group !== undefined){ + em = '/images/icons/group.png' + } + tmpl = '
{1}
' + return tmpl.format(em,res) } // group if (oResultData.grname != undefined) { @@ -1395,13 +1395,13 @@ if (grnameMatchIndex > -1) { return _gravatar(grprefix + highlightMatch(grname, query, grnameMatchIndex) + grsuffix,null,true); } - return _gravatar(grprefix + oResultData.grname + grsuffix, null,true); + return _gravatar(grprefix + oResultData.grname + grsuffix, null,true); // Users } else if (oResultData.nname != undefined) { var fname = oResultData.fname || ""; var lname = oResultData.lname || ""; var nname = oResultData.nname; - + // Guard against null value var fnameMatchIndex = fname.toLowerCase().indexOf(query), lnameMatchIndex = lname.toLowerCase().indexOf(query), @@ -1435,7 +1435,7 @@ ownerAC.formatResult = custom_formatter; var myHandler = function (sType, aArgs) { - var nextId = divid.split('perm_new_member_name_')[1]; + var nextId = divid.split('perm_new_member_name_')[1]; var myAC = aArgs[0]; // reference back to the AC instance var elLI = aArgs[1]; // reference to the selected LI element var oData = aArgs[2]; // object literal of selected item's result data @@ -1453,7 +1453,7 @@ membersAC.itemSelectEvent.subscribe(myHandler); if(ownerAC.itemSelectEvent){ - ownerAC.itemSelectEvent.subscribe(myHandler); + ownerAC.itemSelectEvent.subscribe(myHandler); } return { @@ -1471,11 +1471,11 @@ // Define a custom search function for the DataSource of users var matchUsers = function (sQuery) { - var org_sQuery = sQuery; - if(this.mentionQuery == null){ - return [] - } - sQuery = this.mentionQuery; + var org_sQuery = sQuery; + if(this.mentionQuery == null){ + return [] + } + sQuery = this.mentionQuery; // Case insensitive matching var query = sQuery.toLowerCase(); var i = 0; @@ -1485,9 +1485,9 @@ // Match against each name of each contact for (; i < l; i++) { contact = myUsers[i]; - if (((contact.fname+"").toLowerCase().indexOf(query) > -1) || - ((contact.lname+"").toLowerCase().indexOf(query) > -1) || - ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) { + if (((contact.fname+"").toLowerCase().indexOf(query) > -1) || + ((contact.lname+"").toLowerCase().indexOf(query) > -1) || + ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) { matches[matches.length] = contact; } } @@ -1513,37 +1513,37 @@ ownerAC.resultTypeList = false; ownerAC.suppressInputUpdate = true; ownerAC.animVert = false; - ownerAC.animHoriz = false; + ownerAC.animHoriz = false; ownerAC.animSpeed = 0.1; - + // Helper highlight function for the formatter var highlightMatch = function (full, snippet, matchindex) { - return full.substring(0, matchindex) - + "" - + full.substr(matchindex, snippet.length) + return full.substring(0, matchindex) + + "" + + full.substr(matchindex, snippet.length) + "" + full.substring(matchindex + snippet.length); }; // Custom formatter to highlight the matching letters ownerAC.formatResult = function (oResultData, sQuery, sResultMatch) { - var org_sQuery = sQuery; - if(this.dataSource.mentionQuery != null){ - sQuery = this.dataSource.mentionQuery; - } + var org_sQuery = sQuery; + if(this.dataSource.mentionQuery != null){ + sQuery = this.dataSource.mentionQuery; + } var query = sQuery.toLowerCase(); var _gravatar = function(res, em, group){ - if (group !== undefined){ - em = '/images/icons/group.png' - } - tmpl = '
{1}
' - return tmpl.format(em,res) + if (group !== undefined){ + em = '/images/icons/group.png' + } + tmpl = '
{1}
' + return tmpl.format(em,res) } if (oResultData.nname != undefined) { var fname = oResultData.fname || ""; var lname = oResultData.lname || ""; var nname = oResultData.nname; - + // Guard against null value var fnameMatchIndex = fname.toLowerCase().indexOf(query), lnameMatchIndex = lname.toLowerCase().indexOf(query), @@ -1575,7 +1575,7 @@ }; if(ownerAC.itemSelectEvent){ - ownerAC.itemSelectEvent.subscribe(function (sType, aArgs) { + ownerAC.itemSelectEvent.subscribe(function (sType, aArgs) { var myAC = aArgs[0]; // reference back to the AC instance var elLI = aArgs[1]; // reference to the selected LI element @@ -1583,13 +1583,13 @@ //fill the autocomplete with value if (oData.nname != undefined) { //users - //Replace the mention name with replaced - var re = new RegExp(); - var org = myAC.getInputEl().value; - var chunks = myAC.dataSource.chunks - // replace middle chunk(the search term) with actuall match - chunks[1] = chunks[1].replace('@'+myAC.dataSource.mentionQuery, - '@'+oData.nname+' '); + //Replace the mention name with replaced + var re = new RegExp(); + var org = myAC.getInputEl().value; + var chunks = myAC.dataSource.chunks + // replace middle chunk(the search term) with actuall match + chunks[1] = chunks[1].replace('@'+myAC.dataSource.mentionQuery, + '@'+oData.nname+' '); myAC.getInputEl().value = chunks.join('') YUD.get(myAC.getInputEl()).focus(); // Y U NO WORK !? } else { @@ -1607,48 +1607,48 @@ ownerAC.dataSource.mentionQuery = null; ownerAC.get_mention = function(msg, max_pos) { - var org = msg; - var re = new RegExp('(?:^@|\s@)([a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+)$') - var chunks = []; + var org = msg; + var re = new RegExp('(?:^@|\s@)([a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+)$') + var chunks = []; + - - // cut first chunk until curret pos - var to_max = msg.substr(0, max_pos); - var at_pos = Math.max(0,to_max.lastIndexOf('@')-1); - var msg2 = to_max.substr(at_pos); + // cut first chunk until curret pos + var to_max = msg.substr(0, max_pos); + var at_pos = Math.max(0,to_max.lastIndexOf('@')-1); + var msg2 = to_max.substr(at_pos); - chunks.push(org.substr(0,at_pos))// prefix chunk - chunks.push(msg2) // search chunk - chunks.push(org.substr(max_pos)) // postfix chunk + chunks.push(org.substr(0,at_pos))// prefix chunk + chunks.push(msg2) // search chunk + chunks.push(org.substr(max_pos)) // postfix chunk - // clean up msg2 for filtering and regex match - var msg2 = msg2.lstrip(' ').lstrip('\n'); + // clean up msg2 for filtering and regex match + var msg2 = msg2.lstrip(' ').lstrip('\n'); - if(re.test(msg2)){ - var unam = re.exec(msg2)[1]; - return [unam, chunks]; - } - return [null, null]; + if(re.test(msg2)){ + var unam = re.exec(msg2)[1]; + return [unam, chunks]; + } + return [null, null]; }; - + if (ownerAC.textboxKeyUpEvent){ - ownerAC.textboxKeyUpEvent.subscribe(function(type, args){ - - var ac_obj = args[0]; - var currentMessage = args[1]; - var currentCaretPosition = args[0]._elTextbox.selectionStart; - - var unam = ownerAC.get_mention(currentMessage, currentCaretPosition); - var curr_search = null; - if(unam[0]){ - curr_search = unam[0]; - } - - ownerAC.dataSource.chunks = unam[1]; - ownerAC.dataSource.mentionQuery = curr_search; - - }) - } + ownerAC.textboxKeyUpEvent.subscribe(function(type, args){ + + var ac_obj = args[0]; + var currentMessage = args[1]; + var currentCaretPosition = args[0]._elTextbox.selectionStart; + + var unam = ownerAC.get_mention(currentMessage, currentCaretPosition); + var curr_search = null; + if(unam[0]){ + curr_search = unam[0]; + } + + ownerAC.dataSource.chunks = unam[1]; + ownerAC.dataSource.mentionQuery = curr_search; + + }) + } return { ownerDS: ownerDS, ownerAC: ownerAC, @@ -1656,54 +1656,54 @@ } var addReviewMember = function(id,fname,lname,nname,gravatar_link){ - var members = YUD.get('review_members'); - var tmpl = '
  • '+ + var members = YUD.get('review_members'); + var tmpl = '
  • '+ '
    '+ '
    gravatar
    '+ '
    {1}
    '+ ''+ ''+ '
    '+ - '
    • ' ; + '' ; var displayname = "{0} {1} ({2})".format(fname,lname,nname); - var element = tmpl.format(gravatar_link,displayname,id); - // check if we don't have this ID already in - var ids = []; - var _els = YUQ('#review_members li'); - for (el in _els){ - ids.push(_els[el].id) - } - if(ids.indexOf('reviewer_'+id) == -1){ - //only add if it's not there - members.innerHTML += element; - } - + var element = tmpl.format(gravatar_link,displayname,id); + // check if we don't have this ID already in + var ids = []; + var _els = YUQ('#review_members li'); + for (el in _els){ + ids.push(_els[el].id) + } + if(ids.indexOf('reviewer_'+id) == -1){ + //only add if it's not there + members.innerHTML += element; + } + } var removeReviewMember = function(reviewer_id, repo_name, pull_request_id){ - var el = YUD.get('reviewer_{0}'.format(reviewer_id)); - if (el.parentNode !== undefined){ - el.parentNode.removeChild(el); - } + var el = YUD.get('reviewer_{0}'.format(reviewer_id)); + if (el.parentNode !== undefined){ + el.parentNode.removeChild(el); + } } var updateReviewers = function(reviewers_ids, repo_name, pull_request_id){ - if (reviewers_ids === undefined){ - var reviewers_ids = []; - var ids = YUQ('#review_members input'); - for(var i=0; i -1) || - ((contact.lname+"").toLowerCase().indexOf(query) > -1) || - ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) { + if (((contact.fname+"").toLowerCase().indexOf(query) > -1) || + ((contact.lname+"").toLowerCase().indexOf(query) > -1) || + ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) { matches[matches.length] = contact; } } @@ -1767,37 +1767,37 @@ reviewerAC.resultTypeList = false; reviewerAC.suppressInputUpdate = true; reviewerAC.animVert = false; - reviewerAC.animHoriz = false; + reviewerAC.animHoriz = false; reviewerAC.animSpeed = 0.1; - + // Helper highlight function for the formatter var highlightMatch = function (full, snippet, matchindex) { - return full.substring(0, matchindex) - + "" - + full.substr(matchindex, snippet.length) + return full.substring(0, matchindex) + + "" + + full.substr(matchindex, snippet.length) + "" + full.substring(matchindex + snippet.length); }; // Custom formatter to highlight the matching letters reviewerAC.formatResult = function (oResultData, sQuery, sResultMatch) { - var org_sQuery = sQuery; - if(this.dataSource.mentionQuery != null){ - sQuery = this.dataSource.mentionQuery; - } + var org_sQuery = sQuery; + if(this.dataSource.mentionQuery != null){ + sQuery = this.dataSource.mentionQuery; + } var query = sQuery.toLowerCase(); var _gravatar = function(res, em, group){ - if (group !== undefined){ - em = '/images/icons/group.png' - } - tmpl = '
    {1}
    ' - return tmpl.format(em,res) + if (group !== undefined){ + em = '/images/icons/group.png' + } + tmpl = '
    {1}
    ' + return tmpl.format(em,res) } if (oResultData.nname != undefined) { var fname = oResultData.fname || ""; var lname = oResultData.lname || ""; var nname = oResultData.nname; - + // Guard against null value var fnameMatchIndex = fname.toLowerCase().indexOf(query), lnameMatchIndex = lname.toLowerCase().indexOf(query), @@ -1827,26 +1827,26 @@ return ''; } }; - + //members cache to catch duplicates reviewerAC.dataSource.cache = []; // hack into select event if(reviewerAC.itemSelectEvent){ - reviewerAC.itemSelectEvent.subscribe(function (sType, aArgs) { + reviewerAC.itemSelectEvent.subscribe(function (sType, aArgs) { var myAC = aArgs[0]; // reference back to the AC instance var elLI = aArgs[1]; // reference to the selected LI element var oData = aArgs[2]; // object literal of selected item's result data - + //fill the autocomplete with value if (oData.nname != undefined) { - addReviewMember(oData.id, oData.fname, oData.lname, oData.nname, - oData.gravatar_lnk); - myAC.dataSource.cache.push(oData.id); - YUD.get('user').value = '' + addReviewMember(oData.id, oData.fname, oData.lname, oData.nname, + oData.gravatar_lnk); + myAC.dataSource.cache.push(oData.id); + YUD.get('user').value = '' } - }); + }); } return { ownerDS: ownerDS, @@ -1881,13 +1881,13 @@ // returns a node from given html; var fromHTML = function(html){ - var _html = document.createElement('element'); - _html.innerHTML = html; - return _html; + var _html = document.createElement('element'); + _html.innerHTML = html; + return _html; } var get_rev = function(node){ var n = node.firstElementChild.firstElementChild; - + if (n===null){ return -1 } @@ -1898,56 +1898,56 @@ } var get_name = function(node){ - var name = node.firstElementChild.children[2].innerHTML; - return name + var name = node.firstElementChild.children[2].innerHTML; + return name } var get_group_name = function(node){ - var name = node.firstElementChild.children[1].innerHTML; - return name + var name = node.firstElementChild.children[1].innerHTML; + return name } var get_date = function(node){ - var date_ = YUD.getAttribute(node.firstElementChild,'date'); - return date_ + var date_ = YUD.getAttribute(node.firstElementChild,'date'); + return date_ } var get_age = function(node){ - return node + return node } var get_link = function(node){ - return node.firstElementChild.text; + return node.firstElementChild.text; } var revisionSort = function(a, b, desc, field) { - - var a_ = fromHTML(a.getData(field)); - var b_ = fromHTML(b.getData(field)); - - // extract revisions from string nodes - a_ = get_rev(a_) - b_ = get_rev(b_) - - var comp = YAHOO.util.Sort.compare; - var compState = comp(a_, b_, desc); - return compState; + + var a_ = fromHTML(a.getData(field)); + var b_ = fromHTML(b.getData(field)); + + // extract revisions from string nodes + a_ = get_rev(a_) + b_ = get_rev(b_) + + var comp = YAHOO.util.Sort.compare; + var compState = comp(a_, b_, desc); + return compState; }; var ageSort = function(a, b, desc, field) { var a_ = fromHTML(a.getData(field)); var b_ = fromHTML(b.getData(field)); - + // extract name from table a_ = get_date(a_) - b_ = get_date(b_) - + b_ = get_date(b_) + var comp = YAHOO.util.Sort.compare; var compState = comp(a_, b_, desc); return compState; }; var lastLoginSort = function(a, b, desc, field) { - var a_ = a.getData('last_login_raw') || 0; + var a_ = a.getData('last_login_raw') || 0; var b_ = b.getData('last_login_raw') || 0; - + var comp = YAHOO.util.Sort.compare; var compState = comp(a_, b_, desc); return compState; @@ -1959,8 +1959,8 @@ // extract name from table a_ = get_name(a_) - b_ = get_name(b_) - + b_ = get_name(b_) + var comp = YAHOO.util.Sort.compare; var compState = comp(a_, b_, desc); return compState; @@ -1972,8 +1972,8 @@ // extract name from table a_ = a_.children[0].innerHTML; - b_ = b_.children[0].innerHTML; - + b_ = b_.children[0].innerHTML; + var comp = YAHOO.util.Sort.compare; var compState = comp(a_, b_, desc); return compState; @@ -1982,11 +1982,11 @@ var groupNameSort = function(a, b, desc, field) { var a_ = fromHTML(a.getData(field)); var b_ = fromHTML(b.getData(field)); - + // extract name from table a_ = get_group_name(a_) - b_ = get_group_name(b_) - + b_ = get_group_name(b_) + var comp = YAHOO.util.Sort.compare; var compState = comp(a_, b_, desc); return compState; @@ -1994,26 +1994,26 @@ var dateSort = function(a, b, desc, field) { var a_ = fromHTML(a.getData(field)); var b_ = fromHTML(b.getData(field)); - + // extract name from table a_ = get_date(a_) - b_ = get_date(b_) - + b_ = get_date(b_) + var comp = YAHOO.util.Sort.compare; var compState = comp(a_, b_, desc); return compState; }; var usernamelinkSort = function(a, b, desc, field) { - var a_ = fromHTML(a.getData(field)); - var b_ = fromHTML(b.getData(field)); - - // extract url text from string nodes - a_ = get_link(a_) - b_ = get_link(b_) - var comp = YAHOO.util.Sort.compare; - var compState = comp(a_, b_, desc); - return compState; + var a_ = fromHTML(a.getData(field)); + var b_ = fromHTML(b.getData(field)); + + // extract url text from string nodes + a_ = get_link(a_) + b_ = get_link(b_) + var comp = YAHOO.util.Sort.compare; + var compState = comp(a_, b_, desc); + return compState; } var addPermAction = function(_html, users_list, groups_list){ @@ -2025,15 +2025,15 @@ last_node.innerHTML = _html; YUD.setStyle(last_node, 'display', ''); YUD.removeClass(last_node, 'last_new_member'); - MembersAutoComplete("perm_new_member_name_"+next_id, - "perm_container_"+next_id, users_list, groups_list); + MembersAutoComplete("perm_new_member_name_"+next_id, + "perm_container_"+next_id, users_list, groups_list); //create new last NODE var el = document.createElement('tr'); el.id = 'add_perm_input'; YUD.addClass(el,'last_new_member'); YUD.addClass(el,'new_members'); YUD.insertAfter(el, last_node); - } + } } /* Multi selectors */ @@ -2041,156 +2041,155 @@ var MultiSelectWidget = function(selected_id, available_id, form_id){ - //definition of containers ID's - var selected_container = selected_id; - var available_container = available_id; - - //temp container for selected storage. - var cache = new Array(); - var av_cache = new Array(); - var c = YUD.get(selected_container); - var ac = YUD.get(available_container); - - //get only selected options for further fullfilment - for(var i = 0;node =c.options[i];i++){ - if(node.selected){ - //push selected to my temp storage left overs :) - cache.push(node); - } - } - - //get all available options to cache - for(var i = 0;node =ac.options[i];i++){ - //push selected to my temp storage left overs :) - av_cache.push(node); - } - - //fill available only with those not in chosen - ac.options.length=0; - tmp_cache = new Array(); - - for(var i = 0;node = av_cache[i];i++){ - var add = true; - for(var i2 = 0;node_2 = cache[i2];i2++){ - if(node.value == node_2.value){ - add=false; - break; - } - } - if(add){ - tmp_cache.push(new Option(node.text, node.value, false, false)); - } - } - - for(var i = 0;node = tmp_cache[i];i++){ - ac.options[i] = node; - } - - function prompts_action_callback(e){ - - var chosen = YUD.get(selected_container); - var available = YUD.get(available_container); - - //get checked and unchecked options from field - function get_checked(from_field){ - //temp container for storage. - var sel_cache = new Array(); - var oth_cache = new Array(); - - for(var i = 0;node = from_field.options[i];i++){ - if(node.selected){ - //push selected fields :) - sel_cache.push(node); - } - else{ - oth_cache.push(node) - } - } - - return [sel_cache,oth_cache] - } - - //fill the field with given options - function fill_with(field,options){ - //clear firtst - field.options.length=0; - for(var i = 0;node = options[i];i++){ - field.options[i]=new Option(node.text, node.value, - false, false); - } - - } - //adds to current field - function add_to(field,options){ - for(var i = 0;node = options[i];i++){ - field.appendChild(new Option(node.text, node.value, - false, false)); - } - } - - // add action - if (this.id=='add_element'){ - var c = get_checked(available); - add_to(chosen,c[0]); - fill_with(available,c[1]); - } - // remove action - if (this.id=='remove_element'){ - var c = get_checked(chosen); - add_to(available,c[0]); - fill_with(chosen,c[1]); - } - // add all elements - if(this.id=='add_all_elements'){ - for(var i=0; node = available.options[i];i++){ - chosen.appendChild(new Option(node.text, - node.value, false, false)); - } - available.options.length = 0; - } - //remove all elements - if(this.id=='remove_all_elements'){ - for(var i=0; node = chosen.options[i];i++){ - available.appendChild(new Option(node.text, - node.value, false, false)); - } - chosen.options.length = 0; - } - - } - - YUE.addListener(['add_element','remove_element', - 'add_all_elements','remove_all_elements'],'click', - prompts_action_callback) - if (form_id !== undefined) { - YUE.addListener(form_id,'submit',function(){ - var chosen = YUD.get(selected_container); - for (var i = 0; i < chosen.options.length; i++) { - chosen.options[i].selected = 'selected'; - } - }); - } + //definition of containers ID's + var selected_container = selected_id; + var available_container = available_id; + + //temp container for selected storage. + var cache = new Array(); + var av_cache = new Array(); + var c = YUD.get(selected_container); + var ac = YUD.get(available_container); + + //get only selected options for further fullfilment + for(var i = 0;node =c.options[i];i++){ + if(node.selected){ + //push selected to my temp storage left overs :) + cache.push(node); + } + } + + //get all available options to cache + for(var i = 0;node =ac.options[i];i++){ + //push selected to my temp storage left overs :) + av_cache.push(node); + } + + //fill available only with those not in chosen + ac.options.length=0; + tmp_cache = new Array(); + + for(var i = 0;node = av_cache[i];i++){ + var add = true; + for(var i2 = 0;node_2 = cache[i2];i2++){ + if(node.value == node_2.value){ + add=false; + break; + } + } + if(add){ + tmp_cache.push(new Option(node.text, node.value, false, false)); + } + } + + for(var i = 0;node = tmp_cache[i];i++){ + ac.options[i] = node; + } + + function prompts_action_callback(e){ + + var chosen = YUD.get(selected_container); + var available = YUD.get(available_container); + + //get checked and unchecked options from field + function get_checked(from_field){ + //temp container for storage. + var sel_cache = new Array(); + var oth_cache = new Array(); + + for(var i = 0;node = from_field.options[i];i++){ + if(node.selected){ + //push selected fields :) + sel_cache.push(node); + } + else{ + oth_cache.push(node) + } + } + + return [sel_cache,oth_cache] + } + + //fill the field with given options + function fill_with(field,options){ + //clear firtst + field.options.length=0; + for(var i = 0;node = options[i];i++){ + field.options[i]=new Option(node.text, node.value, + false, false); + } + + } + //adds to current field + function add_to(field,options){ + for(var i = 0;node = options[i];i++){ + field.appendChild(new Option(node.text, node.value, + false, false)); + } + } + + // add action + if (this.id=='add_element'){ + var c = get_checked(available); + add_to(chosen,c[0]); + fill_with(available,c[1]); + } + // remove action + if (this.id=='remove_element'){ + var c = get_checked(chosen); + add_to(available,c[0]); + fill_with(chosen,c[1]); + } + // add all elements + if(this.id=='add_all_elements'){ + for(var i=0; node = available.options[i];i++){ + chosen.appendChild(new Option(node.text, + node.value, false, false)); + } + available.options.length = 0; + } + //remove all elements + if(this.id=='remove_all_elements'){ + for(var i=0; node = chosen.options[i];i++){ + available.appendChild(new Option(node.text, + node.value, false, false)); + } + chosen.options.length = 0; + } + + } + + YUE.addListener(['add_element','remove_element', + 'add_all_elements','remove_all_elements'],'click', + prompts_action_callback) + if (form_id !== undefined) { + YUE.addListener(form_id,'submit',function(){ + var chosen = YUD.get(selected_container); + for (var i = 0; i < chosen.options.length; i++) { + chosen.options[i].selected = 'selected'; + } + }); + } } // global hooks after DOM is loaded YUE.onDOMReady(function(){ - YUE.on(YUQ('.diff-collapse-button'), 'click', function(e){ - var button = e.currentTarget; - var t = YUD.get(button).getAttribute('target'); - console.log(t); - if(YUD.hasClass(t, 'hidden')){ - YUD.removeClass(t, 'hidden'); - YUD.get(button).innerHTML = "↑ {0} ↑".format(_TM['Collapse diff']); - } - else if(!YUD.hasClass(t, 'hidden')){ - YUD.addClass(t, 'hidden'); - YUD.get(button).innerHTML = "↓ {0} ↓".format(_TM['Expand diff']); - } - }); - - - + YUE.on(YUQ('.diff-collapse-button'), 'click', function(e){ + var button = e.currentTarget; + var t = YUD.get(button).getAttribute('target'); + console.log(t); + if(YUD.hasClass(t, 'hidden')){ + YUD.removeClass(t, 'hidden'); + YUD.get(button).innerHTML = "↑ {0} ↑".format(_TM['Collapse diff']); + } + else if(!YUD.hasClass(t, 'hidden')){ + YUD.addClass(t, 'hidden'); + YUD.get(button).innerHTML = "↓ {0} ↓".format(_TM['Expand diff']); + } + }); + + + }); -