[ARVADOS] updated: 1.1.0-146-gcf6ebed

Git user git at public.curoverse.com
Tue Nov 21 16:54:30 EST 2017


Summary of changes:
 .../app/assets/javascripts/components/search.js         | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

       via  cf6ebed6cb9f2cd5e2ef15f8ea02d5d4e3458306 (commit)
      from  fda4715560f9c679df6d08b20c09515fb2c1487f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cf6ebed6cb9f2cd5e2ef15f8ea02d5d4e3458306
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Nov 21 18:52:50 2017 -0300

    12519: Activate every search results' tooltip on creation.
    Removed unnecessary code.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js
index b4b6f63..c593ee1 100644
--- a/apps/workbench/app/assets/javascripts/components/search.js
+++ b/apps/workbench/app/assets/javascripts/components/search.js
@@ -29,10 +29,6 @@ window.SearchResultsTable = {
     },
     onupdate: function(vnode) {
         vnode.state.loader = vnode.attrs.loader
-        // This activates bootstrap tooltip feature
-        $(function () {
-            $('[data-toggle="tooltip"]').tooltip()
-        })
     },
     onremove: function(vnode) {
         window.clearInterval(vnode.state.timer)
@@ -42,8 +38,8 @@ window.SearchResultsTable = {
     view: function(vnode) {
         var loader = vnode.attrs.loader
         var iconsMap = {
-            C: m('i.fa.fa-fw.fa-archive'),
-            P: m('i.fa.fa-fw.fa-folder'),
+            collections: m('i.fa.fa-fw.fa-archive'),
+            projects: m('i.fa.fa-fw.fa-folder'),
         }
         return m('table.table.table-condensed', [
             m('thead', m('tr', [
@@ -62,7 +58,9 @@ window.SearchResultsTable = {
                                     'data-placement': 'top',
                                     'data-toggle': 'tooltip',
                                     href: item.workbenchBaseURL()+'/'+item.objectType.wb_path+'/'+item.uuid,
-                                }, iconsMap[item.objectType.label]),
+                                    // Bootstrap's tooltip feature
+                                    oncreate: function(vnode) { $(vnode.dom).tooltip() },
+                                }, iconsMap[item.objectType.wb_path]),
                         ]),
                         m('td.arvados-uuid', item.uuid),
                         m('td', item.name || '(unnamed)'),
@@ -110,17 +108,15 @@ window.Search = {
                     }
                     var searchable_objects = [
                         {
-                            wb_path: 'groups',
+                            wb_path: 'projects',
                             api_path: 'arvados/v1/groups',
                             filters: [['group_class', '=', 'project']],
-                            label: 'P',
                             description: 'project',
                         },
                         {
                             wb_path: 'collections',
                             api_path: 'arvados/v1/collections',
                             filters: [],
-                            label: 'C',
                             description: 'collection',
                         },
                     ]
@@ -130,7 +126,6 @@ window.Search = {
                         children: searchable_objects.map(function(obj_type) {
                             return new MultipageLoader({
                                 sessionKey: key,
-                                objectKind: obj_type.label,
                                 loadFunc: function(filters) {
                                     var tsquery = to_tsquery(q)
                                     if (tsquery) {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list