[ARVADOS] updated: 1.1.2-22-gf61d8bc

Git user git at public.curoverse.com
Wed Jan 3 16:39:52 EST 2018


Summary of changes:
 .../app/assets/javascripts/components/edit_tags.js | 75 +++++++++++-----------
 1 file changed, 39 insertions(+), 36 deletions(-)

       via  f61d8bca07c8792dfd6216119ee63c573810963a (commit)
      from  7c7dae7f8f4ec4e33acf9302152907547200023d (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 f61d8bca07c8792dfd6216119ee63c573810963a
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Jan 3 18:38:34 2018 -0300

    12479: Removed table border. Fixed indentation.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/edit_tags.js b/apps/workbench/app/assets/javascripts/components/edit_tags.js
index 0d7f3b1..04c6711 100644
--- a/apps/workbench/app/assets/javascripts/components/edit_tags.js
+++ b/apps/workbench/app/assets/javascripts/components/edit_tags.js
@@ -57,57 +57,60 @@ window.TagEditorRow = {
         }
         return m("tr", [
             // Erase tag
-            m("td",
-            vnode.attrs.editMode &&
+            m("td", [
+                vnode.attrs.editMode &&
                 m('div.text-center', m('a.btn.btn-default.btn-sm', {
                     style: {
                         align: 'center'
                     },
                     onclick: function(e) { vnode.attrs.removeTag() }
                 }, m('i.fa.fa-fw.fa-trash-o')))
-            ),
+            ]),
             // Tag name
-            m("td",
-            vnode.attrs.editMode ?
-            m("div", {key: 'name-'+vnode.attrs.name()},[m(SelectOrAutocomplete, {
-                options: nameOpts,
-                value: vnode.attrs.name,
-                // Allow any tag name unless "strict" is set to true.
-                create: !vnode.attrs.vocabulary().strict,
-                placeholder: 'new tag',
-                // Focus on tag name field when adding a new tag that's not
-                // the first one.
-                setFocus: !vnode.attrs.firstRow && vnode.attrs.name() === ''
-            })])
-            : vnode.attrs.name),
+            m("td", [
+                vnode.attrs.editMode ?
+                m("div", {key: 'name-'+vnode.attrs.name()},[
+                    m(SelectOrAutocomplete, {
+                        options: nameOpts,
+                        value: vnode.attrs.name,
+                        // Allow any tag name unless "strict" is set to true.
+                        create: !vnode.attrs.vocabulary().strict,
+                        placeholder: 'new tag',
+                        // Focus on tag name field when adding a new tag that's
+                        // not the first one.
+                        setFocus: !vnode.attrs.firstRow && vnode.attrs.name() === ''
+                    })
+                ])
+                : vnode.attrs.name
+            ]),
             // Tag value
-            m("td",
-            vnode.attrs.editMode ?
-            m("div", {key: 'value-'+vnode.attrs.name()}, [m(SelectOrAutocomplete, {
-                options: valueOpts,
-                value: vnode.attrs.value,
-                placeholder: 'new value',
-                // Allow any value on tags not listed on the vocabulary.
-                // Allow any value on tags without values, or the ones that
-                // aren't explicitly declared to be strict.
-                create: !(vnode.attrs.name() in vnode.attrs.vocabulary().tags)
-                    || !vnode.attrs.vocabulary().tags[vnode.attrs.name()].values
-                    || vnode.attrs.vocabulary().tags[vnode.attrs.name()].values.length === 0
-                    || !vnode.attrs.vocabulary().tags[vnode.attrs.name()].strict,
-                // Focus on tag value field when new tag name is set
-                setFocus: vnode.attrs.name() !== '' && vnode.attrs.value() === ''
-                })
+            m("td", [
+                vnode.attrs.editMode ?
+                m("div", {key: 'value-'+vnode.attrs.name()}, [
+                    m(SelectOrAutocomplete, {
+                        options: valueOpts,
+                        value: vnode.attrs.value,
+                        placeholder: 'new value',
+                        // Allow any value on tags not listed on the vocabulary.
+                        // Allow any value on tags without values, or the ones
+                        // that aren't explicitly declared to be strict.
+                        create: !(vnode.attrs.name() in vnode.attrs.vocabulary().tags)
+                            || !vnode.attrs.vocabulary().tags[vnode.attrs.name()].values
+                            || vnode.attrs.vocabulary().tags[vnode.attrs.name()].values.length === 0
+                            || !vnode.attrs.vocabulary().tags[vnode.attrs.name()].strict,
+                        // Focus on tag value field when new tag name is set
+                        setFocus: vnode.attrs.name() !== '' && vnode.attrs.value() === ''
+                    })
+                ])
+                : vnode.attrs.value
             ])
-            : vnode.attrs.value)
         ])
     }
 }
 
 window.TagEditorTable = {
     view: function(vnode) {
-        return m("table.table.table-condensed", {
-            border: "1"
-        }, [
+        return m("table.table.table-condensed", [
             m("colgroup", [
                 m("col", {width:"5%"}),
                 m("col", {width:"25%"}),

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list