[ARVADOS] updated: 1.1.1-155-g01cea11

Git user git at public.curoverse.com
Wed Dec 20 11:00:51 EST 2017


Summary of changes:
 .../app/assets/javascripts/components/edit_tags.js | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

       via  01cea11ce0cb0e8df2907e66c71540658ed02d45 (commit)
      from  4fed183482e37ad80e97e841d2f0b825ef0d2570 (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 01cea11ce0cb0e8df2907e66c71540658ed02d45
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Wed Dec 20 13:00:21 2017 -0300

    12479: WIP making the save objject show the save state
    
    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 939692a..0ed4b3f 100644
--- a/apps/workbench/app/assets/javascripts/components/edit_tags.js
+++ b/apps/workbench/app/assets/javascripts/components/edit_tags.js
@@ -13,7 +13,7 @@ window.SelectOrAutocomplete = {
         }, vnode.attrs.value)
     },
     oncreate: function(vnode) {
-        vnode.state.selector = $(vnode.dom).selectize({
+        $(vnode.dom).selectize({
             labelField: 'value',
             valueField: 'value',
             searchField: 'value',
@@ -28,9 +28,8 @@ window.SelectOrAutocomplete = {
             }),
             onChange: function(val) {
                 vnode.attrs.value(val)
-                m.redraw()
             }
-        }).data('selectize')
+        })
     }
 }
 
@@ -120,7 +119,6 @@ window.TagEditorTable = {
 
 window.TagEditorApp = {
     oninit: function(vnode) {
-        vnode.state.saveLabel = m.stream(' Save ')
         vnode.state.sessionDB = new SessionDB()
         // Get vocabulary
         vnode.state.vocabulary = m.stream({"strict":false, "types":{}})
@@ -128,6 +126,7 @@ window.TagEditorApp = {
         vnode.state.editMode = vnode.attrs.targetEditable
         // Get tags
         vnode.state.tags = []
+        vnode.state.isDirty = false
         vnode.state.objPath = '/arvados/v1/'+vnode.attrs.targetController+'/'+vnode.attrs.targetUuid
         vnode.state.sessionDB.request(
             vnode.state.sessionDB.loadLocal(), vnode.state.objPath, {
@@ -144,10 +143,17 @@ window.TagEditorApp = {
                 })
                 vnode.state.dirty = m.stream(null)
                 vnode.state.tags.map(function(tag) {
-                  tag.name.map(m.redraw)
-                  tag.name.map(vnode.state.dirty)
-                  tag.value.map(vnode.state.dirty)
+                    console.log('connecting events for tag: '+tag.name())
+                    tag.name.map(m.redraw)
+                    tag.name.map(vnode.state.dirty)
+                    tag.value.map(vnode.state.dirty)
                 })
+                vnode.state.dirty.map(function() {
+                    vnode.state.isDirty = true
+                    console.log('dirty!')
+                })
+                console.log('Setting up isDirty to false')
+                vnode.state.isDirty = false
             }
         )
     },
@@ -176,10 +182,8 @@ window.TagEditorApp = {
                     ])
                 ]),
                 m("div.pull-right", [
-                    // Save button
                     m("a.btn.btn-primary.btn-sm", {
                         onclick: function(e) {
-                            vnode.state.saveLabel('Saving...')
                             var tags = {}
                             vnode.state.tags.forEach(function(t) {
                                 tags[t.name()] = t.value()
@@ -191,11 +195,11 @@ window.TagEditorApp = {
                                     data: {properties: JSON.stringify(tags)}
                                 }
                             ).then(function(v) {
-                                vnode.state.saveLabel(' Save ')
                                 console.log('ok!')
+                                vnode.state.isDirty = false
                             })
                         }
-                    }, vnode.state.saveLabel)
+                    }, vnode.state.isDirty ? ' Save changes ' : ' Saved ')
                 ])
             ])
         ]

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list