kallithea Changeset - 40871e0eb13a

Changeset - 40871e0eb13a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 10 years ago 2015-07-31 15:44:07
madski@unity3d.com

style: add trailing newline to files

3 files changed with 5 insertions and 3 deletions:

kallithea/public/css/bootstrap.css

kallithea/public/js/base.js

whitespacecleanup.sh

0 comments (0 inline, 0 general)

kallithea/public/css/bootstrap.css

➞

Show inline comments

@@ @@ -6613,193 +6613,193 @@ td.hidden-sm { @@
+}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-sm.hidden-md {
     display: none !important;
+  }
   tr.hidden-sm.hidden-md {
     display: none !important;
+  }
   th.hidden-sm.hidden-md,
   td.hidden-sm.hidden-md {
     display: none !important;
+  }
+}
 @media (min-width: 1200px) {
   .hidden-sm.hidden-lg {
     display: none !important;
+  }
   tr.hidden-sm.hidden-lg {
     display: none !important;
+  }
   th.hidden-sm.hidden-lg,
   td.hidden-sm.hidden-lg {
     display: none !important;
+  }
+}
 .hidden-md {
   display: block !important;
+}
 tr.hidden-md {
   display: table-row !important;
+}
 th.hidden-md,
 td.hidden-md {
   display: table-cell !important;
+}
 @media (max-width: 767px) {
   .hidden-md.hidden-xs {
     display: none !important;
+  }
   tr.hidden-md.hidden-xs {
     display: none !important;
+  }
   th.hidden-md.hidden-xs,
   td.hidden-md.hidden-xs {
     display: none !important;
+  }
+}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-md.hidden-sm {
     display: none !important;
+  }
   tr.hidden-md.hidden-sm {
     display: none !important;
+  }
   th.hidden-md.hidden-sm,
   td.hidden-md.hidden-sm {
     display: none !important;
+  }
+}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md {
     display: none !important;
+  }
   tr.hidden-md {
     display: none !important;
+  }
   th.hidden-md,
   td.hidden-md {
     display: none !important;
+  }
+}
 @media (min-width: 1200px) {
   .hidden-md.hidden-lg {
     display: none !important;
+  }
   tr.hidden-md.hidden-lg {
     display: none !important;
+  }
   th.hidden-md.hidden-lg,
   td.hidden-md.hidden-lg {
     display: none !important;
+  }
+}
 .hidden-lg {
   display: block !important;
+}
 tr.hidden-lg {
   display: table-row !important;
+}
 th.hidden-lg,
 td.hidden-lg {
   display: table-cell !important;
+}
 @media (max-width: 767px) {
   .hidden-lg.hidden-xs {
     display: none !important;
+  }
   tr.hidden-lg.hidden-xs {
     display: none !important;
+  }
   th.hidden-lg.hidden-xs,
   td.hidden-lg.hidden-xs {
     display: none !important;
+  }
+}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-lg.hidden-sm {
     display: none !important;
+  }
   tr.hidden-lg.hidden-sm {
     display: none !important;
+  }
   th.hidden-lg.hidden-sm,
   td.hidden-lg.hidden-sm {
     display: none !important;
+  }
+}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-lg.hidden-md {
     display: none !important;
+  }
   tr.hidden-lg.hidden-md {
     display: none !important;
+  }
   th.hidden-lg.hidden-md,
   td.hidden-lg.hidden-md {
     display: none !important;
+  }
+}
 @media (min-width: 1200px) {
   .hidden-lg {
     display: none !important;
+  }
   tr.hidden-lg {
     display: none !important;
+  }
   th.hidden-lg,
   td.hidden-lg {
     display: none !important;
+  }
+}
 .visible-print {
   display: none !important;
+}
 tr.visible-print {
   display: none !important;
+}
 th.visible-print,
 td.visible-print {
   display: none !important;
+}
 @media print {
   .visible-print {
     display: block !important;
+  }
   tr.visible-print {
     display: table-row !important;
+  }
   th.visible-print,
   td.visible-print {
     display: table-cell !important;
+  }
   .hidden-print {
     display: none !important;
+  }
   tr.hidden-print {
     display: none !important;
+  }
   th.hidden-print,
   td.hidden-print {
     display: none !important;
+  }
+}
@@ \ No newline at end of file @@
+}

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1250,385 +1250,385 @@ var SimpleUserAutoComplete = function (i @@
     var matchUsers = function (sQuery) {
         return autocompleteMatchUsers(sQuery, users_list);
+    }
     var userAC = autocompleteCreate(inputElement, container, matchUsers);
     // Handler for selection of an entry
     var itemSelectHandler = 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
         myAC.getInputEl().value = oData.nname;
     };
     userAC.itemSelectEvent.subscribe(itemSelectHandler);
+}
 var MembersAutoComplete = function (inputElement, container, users_list, groups_list) {
     var matchAll = function (sQuery) {
         var u = autocompleteMatchUsers(sQuery, users_list);
         var g = autocompleteMatchGroups(sQuery, groups_list);
         return u.concat(g);
     };
     var membersAC = autocompleteCreate(inputElement, container, matchAll);
     // Handler for selection of an entry
     var itemSelectHandler = function (sType, aArgs) {
         var nextId = inputElement.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
         //fill the autocomplete with value
         if (oData.nname != undefined) {
             //users
             myAC.getInputEl().value = oData.nname;
             $('#perm_new_member_type_'+nextId).val('user');
         } else {
             //groups
             myAC.getInputEl().value = oData.grname;
             $('#perm_new_member_type_'+nextId).val('users_group');
+        }
     };
     membersAC.itemSelectEvent.subscribe(itemSelectHandler);
+}
 var MentionsAutoComplete = function (inputElement, container, users_list) {
     var matchUsers = function (sQuery) {
             var org_sQuery = sQuery;
             if(this.mentionQuery == null){
                 return []
+            }
             sQuery = this.mentionQuery;
             return autocompleteMatchUsers(sQuery, users_list);
+    }
     var mentionsAC = autocompleteCreate(inputElement, container, matchUsers);
     mentionsAC.suppressInputUpdate = true;
     // Overwrite formatResult to take into account mentionQuery
     mentionsAC.formatResult = function (oResultData, sQuery, sResultMatch) {
         var org_sQuery = sQuery;
         if (this.dataSource.mentionQuery != null) {
             sQuery = this.dataSource.mentionQuery;
+        }
         return autocompleteFormatter(oResultData, sQuery, sResultMatch);
+    }
     // Handler for selection of an entry
     if(mentionsAC.itemSelectEvent){
         mentionsAC.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
             //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('')
             myAC.getInputEl().focus(); // Y U NO WORK !?
         });
+    }
     // in this keybuffer we will gather current value of search !
     // since we need to get this just when someone does `@` then we do the
     // search
     mentionsAC.dataSource.chunks = [];
     mentionsAC.dataSource.mentionQuery = null;
     mentionsAC.get_mention = function(msg, max_pos) {
         var org = msg;
         // Must match utils2.py MENTIONS_REGEX.
         // Only matching on string up to cursor, so it must end with $
         var re = new RegExp('(?:^|[^a-zA-Z0-9])@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])$')
         var chunks  = [];
         // cut first chunk until current 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
         // 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];
     };
     var $inputElement = $('#'+inputElement);
     $inputElement.keyup(function(e){
             var currentMessage = $inputElement.val();
             var currentCaretPosition = $inputElement[0].selectionStart;
             var unam = mentionsAC.get_mention(currentMessage, currentCaretPosition);
             var curr_search = null;
             if(unam[0]){
                 curr_search = unam[0];
+            }
             mentionsAC.dataSource.chunks = unam[1];
             mentionsAC.dataSource.mentionQuery = curr_search;
         });
+}
 var addReviewMember = function(id,fname,lname,nname,gravatar_link,gravatar_size){
     var displayname = nname;
     if ((fname != "") && (lname != "")) {
         displayname = "{0} {1} ({2})".format(fname, lname, nname);
+    }
     var gravatarelm = gravatar(gravatar_link, gravatar_size, "");
     // WARNING: the HTML below is duplicate with
     // kallithea/templates/pullrequests/pullrequest_show.html
     // If you change something here it should be reflected in the template too.
     var element = (
         '     <li id="reviewer_{2}">\n'+
         '       <div class="reviewers_member">\n'+
         '           <div class="reviewer_status tooltip" title="not_reviewed">\n'+
         '             <i class="icon-circle changeset-status-not_reviewed"></i>\n'+
         '           </div>\n'+
         '         <div class="reviewer_gravatar gravatar">{0}</div>\n'+
         '         <div style="float:left;">{1}</div>\n'+
         '         <input type="hidden" value="{2}" name="review_members" />\n'+
         '         <div class="reviewer_member_remove action_button" onclick="removeReviewMember({2})">\n'+
         '             <i class="icon-minus-circled"></i>\n'+
         '         </div> (add not saved)\n'+
         '       </div>\n'+
         '     </li>\n'
         ).format(gravatarelm, displayname, id);
     // check if we don't have this ID already in
     var ids = [];
     $('#review_members').find('li').each(function() {
             ids.push(this.id);
         });
     if(ids.indexOf('reviewer_'+id) == -1){
         //only add if it's not there
         $('#review_members').append(element);
+    }
+}
 var removeReviewMember = function(reviewer_id, repo_name, pull_request_id){
     var $li = $('#reviewer_{0}'.format(reviewer_id));
     $li.find('div div').css("text-decoration", "line-through");
     $li.find('input').attr('name', 'review_members_removed');
     $li.find('.reviewer_member_remove').replaceWith('&nbsp;(remove not saved)');
+}
 /* activate auto completion of users as PR reviewers */
 var PullRequestAutoComplete = function (inputElement, container, users_list) {
     var matchUsers = function (sQuery) {
         return autocompleteMatchUsers(sQuery, users_list);
     };
     var reviewerAC = autocompleteCreate(inputElement, container, matchUsers);
     reviewerAC.suppressInputUpdate = true;
     // Handler for selection of an entry
     if(reviewerAC.itemSelectEvent){
         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
             addReviewMember(oData.id, oData.fname, oData.lname, oData.nname,
                             oData.gravatar_lnk, oData.gravatar_size);
             myAC.getInputEl().value = '';
         });
+    }
+}
 /**
  * Activate .quick_repo_menu
  */
 var quick_repo_menu = function(){
     $(".quick_repo_menu").mouseenter(function(e) {
             var $menu = $(e.currentTarget).children().first().children().first();
             if($menu.hasClass('hidden')){
                 $menu.removeClass('hidden').addClass('active');
                 $(e.currentTarget).removeClass('hidden').addClass('active');
+            }
         })
     $(".quick_repo_menu").mouseleave(function(e) {
             var $menu = $(e.currentTarget).children().first().children().first();
             if($menu.hasClass('active')){
                 $menu.removeClass('active').addClass('hidden');
                 $(e.currentTarget).removeClass('active').addClass('hidden');
+            }
         })
 };
 /**
  * TABLE SORTING
  */
 var revisionSort = function(a, b, desc, field) {
     var a_ = parseInt(a.getData('last_rev_raw') || 0);
     var b_ = parseInt(b.getData('last_rev_raw') || 0);
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
 var ageSort = function(a, b, desc, field) {
     // data is like: <span class="tooltip" date="2014-06-04 18:18:55.325474" title="Wed, 04 Jun 2014 18:18:55">1 day and 23 hours ago</span>
     var a_ = $(a.getData(field)).attr('date');
     var b_ = $(b.getData(field)).attr('date');
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
 var lastLoginSort = function(a, b, desc, field) {
     var a_ = parseFloat(a.getData('last_login_raw') || 0);
     var b_ = parseFloat(b.getData('last_login_raw') || 0);
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
 var nameSort = function(a, b, desc, field) {
     var a_ = a.getData('raw_name') || 0;
     var b_ = b.getData('raw_name') || 0;
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
 var dateSort = function(a, b, desc, field) {
     var a_ = parseFloat(a.getData('raw_date') || 0);
     var b_ = parseFloat(b.getData('raw_date') || 0);
     return YAHOO.util.Sort.compare(a_, b_, desc);
 };
 var addPermAction = function(_html, users_list, groups_list){
     var $last_node = $('.last_new_member').last(); // empty tr between last and add
     var next_id = $('.new_members').length;
     $last_node.before($('<tr class="new_members">').append(_html.format(next_id)));
     MembersAutoComplete("perm_new_member_name_"+next_id,
             "perm_container_"+next_id, users_list, groups_list);
+}
 function ajaxActionRevokePermission(url, obj_id, obj_type, field_id, extra_data) {
     var success = function (o) {
             $('#' + field_id).remove();
         };
     var failure = function (o) {
             alert(_TM['Failed to revoke permission'] + ": " + o.status);
         };
     var query_params = {
         '_method': 'delete'
+    }
     // put extra data into POST
     if (extra_data !== undefined && (typeof extra_data === 'object')){
         for(var k in extra_data){
             query_params[k] = extra_data[k];
+        }
+    }
     if (obj_type=='user'){
         query_params['user_id'] = obj_id;
         query_params['obj_type'] = 'user';
+    }
     else if (obj_type=='user_group'){
         query_params['user_group_id'] = obj_id;
         query_params['obj_type'] = 'user_group';
+    }
     ajaxPOST(url, query_params, success, failure);
 };
 /* Multi selectors */
 var MultiSelectWidget = function(selected_id, available_id, form_id){
     var $availableselect = $('#' + available_id);
     var $selectedselect = $('#' + selected_id);
     //fill available only with those not in selected
     var $selectedoptions = $selectedselect.children('option');
     $availableselect.children('option').filter(function(i, e){
             for(var j = 0, node; node = $selectedoptions[j]; j++){
                 if(node.value == e.value){
                     return true;
+                }
+            }
             return false;
         }).remove();
     $('#add_element').click(function(e){
             $selectedselect.append($availableselect.children('option:selected'));
         });
     $('#remove_element').click(function(e){
             $availableselect.append($selectedselect.children('option:selected'));
         });
     $('#'+form_id).submit(function(){
             $selectedselect.children('option').each(function(i, e){
                 e.selected = 'selected';
             });
         });
+}
 // custom paginator
 var YUI_paginator = function(links_per_page, containers){
     (function () {
         var Paginator = YAHOO.widget.Paginator,
             l         = YAHOO.lang,
             setId     = YAHOO.util.Dom.generateId;
         Paginator.ui.MyFirstPageLink = function (p) {
             this.paginator = p;
             p.subscribe('recordOffsetChange',this.update,this,true);
             p.subscribe('rowsPerPageChange',this.update,this,true);
             p.subscribe('totalRecordsChange',this.update,this,true);
             p.subscribe('destroy',this.destroy,this,true);
             // TODO: make this work
             p.subscribe('firstPageLinkLabelChange',this.update,this,true);
             p.subscribe('firstPageLinkClassChange',this.update,this,true);
         };
         Paginator.ui.MyFirstPageLink.init = function (p) {
             p.setAttributeConfig('firstPageLinkLabel', {
                 value : 1,
                 validator : l.isString
             });
             p.setAttributeConfig('firstPageLinkClass', {
                 value : 'yui-pg-first',
                 validator : l.isString
             });
             p.setAttributeConfig('firstPageLinkTitle', {
                 value : 'First Page',
                 validator : l.isString
             });
         };
         // Instance members and methods
         Paginator.ui.MyFirstPageLink.prototype = {
             current   : null,
             leftmost_page: null,
             rightmost_page: null,
             link      : null,
             span      : null,
             dotdot    : null,
             getPos    : function(cur_page, max_page, items){
                 var edge = parseInt(items / 2) + 1;
                 if (cur_page <= edge){
                     var radius = Math.max(parseInt(items / 2), items - cur_page);
+                }
                 else if ((max_page - cur_page) < edge) {
                     var radius = (items - 1) - (max_page - cur_page);
+                }
                 else{
                     var radius = parseInt(items / 2);
+                }

whitespacecleanup.sh

➞

Show inline comments

 #!/bin/bash -x
 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
 files=`hg loc '*.py' '*.html' '*.css' '*.rst' '*.txt' '*.js' | egrep -v '/lockfiles.py|LICENSE-MERGELY.html|/codemirror/|/fontello/|(graph|mergely|native.history|select2/select2|yui.flot)\.js$'`
+files=`hg loc '*.py' '*.html' '*.css' '*.rst' '*.txt' '*.js' | egrep -v '/lockfiles.py|LICENSE-MERGELY.html|/codemirror/|/fontello/|(graph|mergely|native.history|select2/select2|yui.flot|yui.2.9)\.js$'`
 sed -i "s,`printf '\t'`,    ,g" $files
 sed -i "s,  *$,,g" $files
 # add trailing newline if missing:
 sed -i '$a\' $files
 sed -i 's,\([^ /]\){,\1 {,g' `hg loc '*.css'`
 sed -i 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'`
 sed -i 's/^\(    [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css
 sed -i '1s|, |,|g' kallithea/public/css/{style,contextbar}.css
 sed -i 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css
 sed -i 's/^\([^ ,/].*\)   */\1 /g' kallithea/public/css/{style,contextbar}.css
 sed -i 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt
 hg diff

0 comments (0 inline, 0 general)