code clean

3 files changed, 251 insertions, 229 deletions

diff --git a/public/js/aports.api.js b/public/js/aports.api.js
index db61dff..2e47fde 100644
--- a/public/js/aports.api.js
+++ b/public/js/aports.api.js
@@ -45,56 +45,56 @@ for (a in config.api.resources) {
 temp = {}
 
     asyncReq = function(url, callback, callback2) {
-	  var request = $.ajax({
-	      url : url,
-	      xhrFields: {
-	        withCredentials: true
-	      },
-	      method: 'GET',
-	      cache: true,
-	      dataType: "jsonp", //CORS
-	      jsonp: callback, // defaults to 'callback'
-	      success: callback2
-	  });
-	  return request;
-	}
+        var request = $.ajax({
+            url : url,
+            xhrFields: {
+              withCredentials: true
+            },
+            method: 'GET',
+            cache: true,
+            dataType: "jsonp", //CORS
+            jsonp: callback, // defaults to 'callback'
+            success: callback2
+        });
+        return request;
+    }
 
     fmtData = function(data, field, type) {
-      if(data[field] == null) return '';
-      if('data' == type) {
-        if('name' == field) {
-          var u_ = []; //['packages']
-          var v_ = { 'name':  data[field], 'branch': data['branch'],
-                     'arch': data['arch'], 'repo': data['repo'] };
-          var url_ = app.baseurl.replace(/packages/, 'package') + '?' + buildReq(u_, v_, packages.fields);
-          return makeElm( 'a', data[field], {'title':data['description'], 'href':url_} );
-        }
-        if('version' == field) {
-          return makeElm( 'a', data[field], {'title':'Flag this package out of date', 'href':''} );
+        if(data[field] == null) return '';
+        if('data' == type) {
+            if('name' == field) {
+                var u_ = []; //['packages']
+                var v_ = { 'name':  data[field], 'branch': data['branch'],
+                           'arch': data['arch'], 'repo': data['repo'] };
+                var url_ = app.baseurl.replace(/packages/, 'package') + '?' + buildReq(u_, v_, packages.fields);
+                return makeElm( 'a', data[field], {'title':data['description'], 'href':url_} );
+            }
+            if('version' == field) {
+                return makeElm( 'a', data[field], {'title':'Flag this package out of date', 'href':''} );
+            }
+            if('url' == field) {
+                return makeElm( 'a', 'URL', {'title':'', 'href':data[field]} )
+            }
+            if('build_time' == field) { return fmtDate(data[field], "yyyy-mm-dd HH:MM:ss") }
+            if('maintainer' == field) { return data[field].split(/\</)[0] }
+            if('origin' == field) {
+                var u_ = [''];
+                var v_ = { 'name':  data[field], 'branch': data['branch'],
+                           'arch': data['arch'], 'repo': data['repo'] };
+                var url_ = app.baseurl + '?' + buildReq(u_, v_, packages.fields);
+                return makeElm( 'a', data[field], {'title':'', 'href':url_} )
+            }
         }
-        if('url' == field) {
-          return makeElm( 'a', 'URL', {'title':'', 'href':data[field]} )
+        if('meta' == type) {
         }
-        if('build_time' == field) { return fmtDate(data[field], "yyyy-mm-dd HH:MM:ss") }
-        if('maintainer' == field) { return data[field].split(/\</)[0] }
-        if('origin' == field) {
-          var u_ = [''];
-          var v_ = { 'name':  data[field], 'branch': data['branch'],
-                     'arch': data['arch'], 'repo': data['repo'] };
-          var url_ = app.baseurl + '?' + buildReq(u_, v_, packages.fields);
-          return makeElm( 'a', data[field], {'title':'', 'href':url_} )
+        if('links' == type) {
+            var text = field;
+            //if ('last' == field) { text = '&gt;&gt;' }
+            //if ('next' == field) { text = '&gt;' }
+            //if ('first' == field) { text = '&lt;&lt;' }
+            return '<a title="'+'" href="'+data[field]+'">'+text+'</a>'
         }
-      }
-      if('meta' == type) {
-      }
-      if('links' == type) {
-        var text = field;
-        //if ('last' == field) { text = '&gt;&gt;' }
-        //if ('next' == field) { text = '&gt;' }
-        //if ('first' == field) { text = '&lt;&lt;' }
-        return '<a title="'+'" href="'+data[field]+'">'+text+'</a>'
-      }
-      return data[field];
+        return data[field];
     };
 
     makePgn = function(data) {
@@ -104,17 +104,17 @@ temp = {}
         app.query = (app.query).split(/\&page.*/)[0];
         pgr = $('#api-active-pager');
         setTimeout(function() {
-          $(pgr).twbsPagination({
-            startPage: (currPg <= data.meta['total-pages']) ? currPg : 1,
-            totalPages: (pgs) ? pgs : 1,   visiblePages: 4,
-            prev: '&lt;',      next: '&gt;',
-            first: '&lt;&lt;', last: '&gt;&gt;',
-            onPageClick: function(event, page) {
-              var query = (app.query !== '') ? '?'+app.query+'&' : '?';
-              var url = app.baseurl+query+'page='+page;
-              window.location = url;
-            }
-          });
+            $(pgr).twbsPagination({
+                startPage: (currPg <= data.meta['total-pages']) ? currPg : 1,
+                totalPages: (pgs) ? pgs : 1,   visiblePages: 4,
+                prev: '&lt;',      next: '&gt;',
+                first: '&lt;&lt;', last: '&gt;&gt;',
+                onPageClick: function(event, page) {
+                  var query = (app.query !== '') ? '?'+app.query+'&' : '?';
+                  var url = app.baseurl+query+'page='+page;
+                  window.location = url;
+                }
+            });
         }, 600);
     }
 
@@ -122,9 +122,9 @@ temp = {}
        var items = [];
        for(n in fields) {
            if(data) {
-             val = (data[fields[n]]) ? fmtData(data, fields[n], cls) : '';
+               val = (data[fields[n]]) ? fmtData(data, fields[n], cls) : '';
            } else {
-             val = fields[n];
+               val = fields[n];
            }
            if(elm) items.push(makeElm(elm, val, {}));
        }
@@ -137,39 +137,39 @@ temp = {}
         var a_ = [];
         a_.push('<'+elm);
         if (typeof attr == 'object') {
-          for (a in attr) { a_.push(a+"='"+attr[a]+"'") }
+            for (a in attr) { a_.push(a+"='"+attr[a]+"'") }
         }
         if('img' == elm) {
-          a_.push(' />'); var end_ = '';
+            a_.push(' />'); var end_ = '';
         } else {
-          a_.push('>'); var end_ = '</'+elm+'>';
+            a_.push('>'); var end_ = '</'+elm+'>';
         }
         return a_.join(' ')+val+end_;
     };
 
     buildReq = function(resource, reqs, fields) {
-      var url_ = resource.join('/');
-      var items = [];
-      for(var i=0; i<fields.length; i++) {
-        o = fields[i];
-        if(reqs[o]) { items.push(o+'='+reqs[o]); }
-      }
-      var req_ = items.join("&");
-      url_ = (url_) ? url_+'&' : '';
-      return url_+req_;
+        var url_ = resource.join('/');
+        var items = [];
+        for(var i=0; i<fields.length; i++) {
+            o = fields[i];
+            if(reqs[o]) { items.push(o+'='+reqs[o]); }
+        }
+        var req_ = items.join("&");
+        url_ = (url_) ? url_+'&' : '';
+        return url_+req_;
     }
 
     fmtDate = function(epoch, fmt) {
-      fmt = fmt ? fmt : "ddd, mmm dS, yyyy, h:MM TT";
-      now = new Date();
-      var mEpoch = parseInt(epoch);
-      if(mEpoch < 10000000000) { mEpoch *= 1000; }
-      now.setTime(mEpoch);
-      return dateFormat(now, fmt);
+        fmt = fmt ? fmt : "ddd, mmm dS, yyyy, h:MM TT";
+        now = new Date();
+        var mEpoch = parseInt(epoch);
+        if(mEpoch < 10000000000) { mEpoch *= 1000; }
+        now.setTime(mEpoch);
+        return dateFormat(now, fmt);
     };
    
     titleCase = function(string) {
-      if(string) return string.charAt(0).toUpperCase() + string.slice(1);
+        if(string) return string.charAt(0).toUpperCase() + string.slice(1);
     }
 
 
diff --git a/public/js/aports.package.js b/public/js/aports.package.js
index 7989973..5c1d675 100644
--- a/public/js/aports.package.js
+++ b/public/js/aports.package.js
@@ -9,69 +9,91 @@
  *
  */
 
-   getPackage = function(data) {
-       //----- data.data -----
-       var d = data.data[0]; var d_ = d['attributes']; var ln = '';
-       var name = d['attributes']['name'];
-       var version = d['attributes']['version'];
-       var repo = d['attributes']['repo'];
-       var arch = d['attributes']['arch'];
-       var branch = d['attributes']['branch'];
-       var items = [];
-       
-       ln = 'http://git.alpinelinux.org/cgit/aports/tree';
-       var gr = (makeElm('a', 'Git repository', {
-         'href': ln+'/'+repo+'/'+name+'?h=master'
-       }));
-       d['attributes']['git_repository'] = gr;
-       
-       ln = 'http://build.alpinelinux.org/buildlogs';
-       var bl = (makeElm('a', 'Bluid log', {
-         'href': ln+'/'+'build-'+branch+'-'+arch+'/'+repo+'/'+name+'/'+name+'-'+version+'.log'
-       }));
-       d['attributes']['build_log'] = bl;
-       
-       ln = 'http://pkgs.alpinelinux.org/contents';
-       var ct = (makeElm('a', 'Contents of package', {
-         'href': ln+'?branch='+branch+'&name='+name+'&arch='+arch+'&repo='+repo+''
-       }));
-       d['attributes']['contents'] = ct;
-       
-       $.each( d['attributes'], function( key, val ) {
-         key_ = key;
-         if ('name' == key_) { key_ = 'Package' };
-         if ('url' == key_) { key_ = 'Project' };
-         if ('repo' == key_) { key_ = 'Repository' };
-         if ('arch' == key_) { key_ = 'Architecture' };
-         if ('checksum' == key_) { key = '' };
-         if ('fid' == key_) { key = '' };
-         if ('commit' == key_) {
-             d['attributes']['commit'] = (makeElm('a', val, {
-               'href':'http://git.alpinelinux.org/cgit/aports/commit/?id='+val
-             }));
-         };
+    fmtData = function(data, field, type) {
+        if(data[field] == null) return '';
+        if('data' == type) {
+            if('version' == field) {
+                return makeElm( 'a', data[field], {'title':'Flag this package out of date', 'href':''} );
+            }
+            if('url' == field) {
+                return makeElm( 'a', data[field], {'title':'', 'href':data[field]} )
+            }
+            if('build_time' == field) { return fmtDate(data[field], "yyyy-mm-dd HH:MM:ss") }
+            if('maintainer' == field) { return data[field].split(/\</)[0] }
+            if('origin' == field) {
+                var u_ = [''];
+                var v_ = { 'name':  data[field], 'branch': data['branch'],
+                           'arch': data['arch'], 'repo': data['repo'] };
+                var url_ = app.baseurl + '?' + buildReq(u_, v_, packages.fields);
+                return makeElm( 'a', data[field], {'title':'', 'href':url_} )
+            }
+        }
+        return data[field];
+    };
+
+    getPackage = function(data) {
+        //----- data.data -----
+        var d = data.data[0]; var d_ = d['attributes']; var ln = '';
+        var name = d['attributes']['name'];
+        var version = d['attributes']['version'];
+        var branch = d['attributes']['branch'];
+        var repo = d['attributes']['repo'];
+        var arch = d['attributes']['arch'];
+        var items = [];
+        
+        ln = 'http://git.alpinelinux.org/cgit/aports/tree';
+        var gr = (makeElm('a', 'Git repository', {
+          'href': ln+'/'+repo+'/'+name+'?h=master'
+        }));
+        d['attributes']['git_repository'] = gr;
+        
+        ln = 'http://build.alpinelinux.org/buildlogs';
+        var bl = (makeElm('a', 'Bluid log', {
+          'href': ln+'/'+'build-'+branch+'-'+arch+'/'+repo+'/'+name+'/'+name+'-'+version+'.log'
+        }));
+        d['attributes']['build_log'] = bl;
+        
+        ln = 'http://pkgs.alpinelinux.org/contents';
+        var ct = (makeElm('a', 'Contents of package', {
+          'href': ln+'?branch='+branch+'&name='+name+'&arch='+arch+'&repo='+repo+''
+        }));
+        d['attributes']['contents'] = ct;
+        
+        $.each( d['attributes'], function( key, val ) {
+            key_ = key;
+            if('name' == key_) { key_ = 'Package' };
+            if('url' == key_) { key_ = 'Project' };
+            if('repo' == key_) { key_ = 'Repository' };
+            if('arch' == key_) { key_ = 'Architecture' };
+            if('checksum' == key_) { key = '' };
+            if('fid' == key_) { key = '' };
+            if('commit' == key_) {
+                d['attributes']['commit'] = (makeElm('a', val, {
+                  'href':'http://git.alpinelinux.org/cgit/aports/commit/?id='+val
+                }));
+            };
 
-         items.push('<tr>');
-         if(key !== '') {
-             items.push(makeElm('th', titleCase(key_).replace(/\_/, ' '), {'class': 'text-nowrap'}) );
-             items.push(makeElm('td', fmtData(d['attributes'], key, 'data'), {}) );
-         }
-         items.push('</tr>');
-       });
-       var tbl = "\n" + '' + "\n" + items.join( "\n" );
-       $( "<table/>", {
-          "id": "package",
-          "class": "packages",
-          //"class": "table table-striped table-bordered table-condensed",
-          html: tbl
-       }).appendTo( "body .container" );
-   };
+            items.push('<tr>');
+            if(key !== '') {
+                items.push(makeElm('th', titleCase(key_).replace(/\_/, ' '), {'class': 'text-nowrap'}) );
+                items.push(makeElm('td', fmtData(d['attributes'], key, 'data'), {}) );
+            }
+            items.push('</tr>');
+        });
+        var tbl = "\n" + '' + "\n" + items.join( "\n" );
+        $( "<table/>", {
+           "id": "package",
+           "class": "packages",
+           //"class": "table table-striped table-bordered table-condensed",
+           html: tbl
+        }).appendTo( "body .container" );
+    };
 
 
    _getPackage = function(url) {
         var p = new Poly9.URLParser(url);
         var q = p.getQueryarray();
-        if( ! q['name'] ) { $('<span>no data</span>').appendTo( "body .container" ); return; }
+        if( ! q['name'] ) { $('<span>no data</span>').appendTo( "body .container" ); return; };
         asyncReq(url, 'callback', getPackage);
     };
 
diff --git a/public/js/aports.packages.js b/public/js/aports.packages.js
index 2b70249..cc6ba11 100644
--- a/public/js/aports.packages.js
+++ b/public/js/aports.packages.js
@@ -10,108 +10,108 @@
  */
 
     get_packages = function(data) {
-       //----- data.data -----
-       var items = [];
-       var h = getTblRow('', packages.tblHdrs, 'data', 'th', 'tr');
-       $.each( data.data, function( key, val ) {
-         items.push( getTblRow(val['attributes'], packages.fields, 'data', 'td', 'tr') );
-       });
-       var tbl = "\n" + h + "\n" + items.join( "\n" );
-       $( "<table/>", {
-          "id": "packages",
-          "class": "packages sortable",
-          //"class": "table table-striped table-bordered table-condensed",
-          html: tbl
-       }).appendTo( "body .container" );
-       //setTimeout(function() { sortables_init(); }, 1600);
-
-       //----- data.links -----
-       var links = [];
-       links.push( getTblRow(data.links, link.fields, 'links', 'td', 'tr') );
-       var tbl = links.join( "\n" );
-       $( "<div/>", {
-          "id": "api-active-pager",
-          "class": "packages page-pager",
-          html: "\n"
-       }).appendTo( "body .container" );
-       makePgn(data);
-
-       //----- data.meta -----
-       var stats = [];
-       var h = getTblRow('', meta.stats, 'meta', 'th', 'tr');
-       stats.push( getTblRow(data.meta, meta.stats, 'meta', 'td', 'tr') );
-       var tbl = "\n" + h + "\n" + stats.join( "\n" );
-       $( "<table/>", {
-          "class": "packages meta",
-          html: tbl
-       }).appendTo( "body .container" );
-
-       //----- data.meta.search -----
-       var stats = []; var f = [];
-       for (a in data.meta.search) f.push(a);
-       var h = getTblRow('', f, 'meta', 'th', 'tr');
-       stats.push( getTblRow(data.meta.search, f, 'meta', 'td', 'tr') );
-       var tbl = "\n" + h + "\n" + stats.join( "\n" );
-       $( "<table/>", {
-          "class": "packages meta-search",
-          html: tbl
-       }).appendTo( "body .container" );
+        //----- data.data -----
+        var items = [];
+        var h = getTblRow('', packages.tblHdrs, 'data', 'th', 'tr');
+        $.each( data.data, function( key, val ) {
+          items.push( getTblRow(val['attributes'], packages.fields, 'data', 'td', 'tr') );
+        });
+        var tbl = "\n" + h + "\n" + items.join( "\n" );
+        $( "<table/>", {
+           "id": "packages",
+           "class": "packages sortable",
+           //"class": "table table-striped table-bordered table-condensed",
+           html: tbl
+        }).appendTo( "body .container" );
+        //setTimeout(function() { sortables_init(); }, 1600);
+
+        //----- data.links -----
+        var links = [];
+        links.push( getTblRow(data.links, link.fields, 'links', 'td', 'tr') );
+        var tbl = links.join( "\n" );
+        $( "<div/>", {
+           "id": "api-active-pager",
+           "class": "packages page-pager",
+           html: "\n"
+        }).appendTo( "body .container" );
+        makePgn(data);
+
+        //----- data.meta -----
+        var stats = [];
+        var h = getTblRow('', meta.stats, 'meta', 'th', 'tr');
+        stats.push( getTblRow(data.meta, meta.stats, 'meta', 'td', 'tr') );
+        var tbl = "\n" + h + "\n" + stats.join( "\n" );
+        $( "<table/>", {
+           "class": "packages meta",
+           html: tbl
+        }).appendTo( "body .container" );
+
+        //----- data.meta.search -----
+        var stats = []; var f = [];
+        for (a in data.meta.search) f.push(a);
+        var h = getTblRow('', f, 'meta', 'th', 'tr');
+        stats.push( getTblRow(data.meta.search, f, 'meta', 'td', 'tr') );
+        var tbl = "\n" + h + "\n" + stats.join( "\n" );
+        $( "<table/>", {
+           "class": "packages meta-search",
+           html: tbl
+        }).appendTo( "body .container" );
 
     };
 
     get_categories = function(data) {
-       //----- data.data -----
-       var items = [];
-       items.push(makeElm('option', '', {}) );
-       $.each( data.data.branch, function( key, val ) {
-         items.push(makeElm('option', val, {}) );
-       });
-       var opt1 = (makeElm('select', items.join( "\n" ), {
-         'name':'branch', 'data-placeholder':'Branch',
-         'class':'form-control chosen-select', 'id':'branch'
-       }));
-       var items = [];
-       items.push(makeElm('option', '', {}) );
-       $.each( data.data.repo, function( key, val ) {
-         items.push(makeElm('option', val, {}) );
-       });
-       var opt2 = (makeElm('select', items.join( "\n" ), {
-         'name':'repo', 'data-placeholder':'Repository',
-         'class':'form-control chosen-select', 'id':'repo'
-       }));
-       var items = [];
-       items.push(makeElm('option', '', {}) );
-       $.each( data.data.arch, function( key, val ) {
-         items.push(makeElm('option', val, {}) );
-       });
-       var opt3 = (makeElm('select', items.join( "\n" ), {
-         'name':'arch', 'data-placeholder':'Arch',
-         'class':'form-control chosen-select', 'id':'arch'
-       }));
-       attr = {'class': 'form-group'}
-       var html = "\n"+(makeElm('div', opt1, attr))
-            +"\n"+(makeElm('div', opt2, attr))
-            +"\n"+(makeElm('div', opt3, attr))
-       $( html ).appendTo( "body #search" );
+        //----- data.data -----
+        var items = [];
+        items.push(makeElm('option', '', {}) );
+        $.each( data.data.branch, function( key, val ) {
+            items.push(makeElm('option', val, {}) );
+        });
+        var opt1 = (makeElm('select', items.join( "\n" ), {
+          'name':'branch', 'data-placeholder':'Branch',
+          'class':'form-control chosen-select', 'id':'branch'
+        }));
+        var items = [];
+        items.push(makeElm('option', '', {}) );
+        $.each( data.data.repo, function( key, val ) {
+            items.push(makeElm('option', val, {}) );
+        });
+        var opt2 = (makeElm('select', items.join( "\n" ), {
+          'name':'repo', 'data-placeholder':'Repository',
+          'class':'form-control chosen-select', 'id':'repo'
+        }));
+        var items = [];
+        items.push(makeElm('option', '', {}) );
+        $.each( data.data.arch, function( key, val ) {
+            items.push(makeElm('option', val, {}) );
+        });
+        var opt3 = (makeElm('select', items.join( "\n" ), {
+          'name':'arch', 'data-placeholder':'Arch',
+          'class':'form-control chosen-select', 'id':'arch'
+        }));
+        attr = {'class': 'form-group'}
+        var html = "\n"+(makeElm('div', opt1, attr))
+             +"\n"+(makeElm('div', opt2, attr))
+             +"\n"+(makeElm('div', opt3, attr))
+        $( html ).appendTo( "body #search" );
     };
 
     get_maintainers = function(data) {
-       //----- data.data -----
-       var items = [];
-       items.push(makeElm('option', '', {}) );
-       $.each( data.data, function( key, val ) {
-         items.push( getTblRow(val['attributes'], ['name'], 'data', 'option', '') );
-       });
-       var opt4 = (makeElm('select', items.join( "\n" ), {
-         'name':'maintainer', 'data-placeholder':'Branch',
-         'class':'form-control chosen-select', 'id':'maintainer'
-       }));
-       var btn = (makeElm('button', 'Search', {
-         'type':'submit', 'class':'btn btn-primary'
-       }));
-       attr = {'class': 'form-group'}
-       var html = "\n"+(makeElm('div', opt4, attr))+"\n"+btn
-       $( html ).appendTo( "body #search" );
+        //----- data.data -----
+        var items = [];
+        items.push(makeElm('option', '', {}) );
+        $.each( data.data, function( key, val ) {
+            items.push( getTblRow(val['attributes'], ['name'], 'data', 'option', '') );
+        });
+        var opt4 = (makeElm('select', items.join( "\n" ), {
+          'name':'maintainer', 'data-placeholder':'Branch',
+          'class':'form-control chosen-select', 'id':'maintainer'
+        }));
+        var btn = (makeElm('button', 'Search', {
+          'type':'submit', 'class':'btn btn-primary'
+        }));
+        attr = {'class': 'form-group'}
+        var html = "\n"+(makeElm('div', opt4, attr))+"\n"+btn
+        $( html ).appendTo( "body #search" );
     };
 
     query = (app.query) ? '&'+app.query : ''