X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Flsl.js;fp=public%2Fjavascripts%2Flsl.js;h=7ca9c80847484985eddfb16fb3628232c8d3ea23;hb=948c49fb7f8fabddc217fcedc3e88a9e315ba661;hp=46eebf710524ffd374e0c4b48f91855c0577b516;hpb=5cb11f0acdc2a0b808e0f0a51097b3dd44208f7d;p=lsl.git

diff --git a/public/javascripts/lsl.js b/public/javascripts/lsl.js
index 46eebf7..7ca9c80 100644
--- a/public/javascripts/lsl.js
+++ b/public/javascripts/lsl.js
@@ -80,15 +80,14 @@ function select_list(new_selected_list) {
 
     selected_list = new_selected_list;
 }
-function edit_list(li) {
-    li.addClass('editing');
-
+function edit_list() {
     var d = $('<div>')
         .append(
             $('<fieldset>')
                 .append(
                     $('<legend>').text('List name'),
-                    $('<input type="text" size="40">').val(li.data('lsl-name'))
+                    $('<input type="text" size="40">')
+                    .val(selected_list.data('lsl-name'))
                 )
         );
 
@@ -96,9 +95,6 @@ function edit_list(li) {
         autoOpen: true,
         modal: true,
         title: 'Edit list',
-        close: ()=>{
-            li.removeClass('editing');
-        },
         width: 'max-content',
         buttons: [
             {
@@ -106,7 +102,7 @@ function edit_list(li) {
                 icon: 'ui-icon-trash',
                 text: 'Delete',
                 click: () => {
-                    delete_list(li, d);
+                    delete_list(d);
                 },
             },
             {
@@ -117,38 +113,41 @@ function edit_list(li) {
                 icon: 'ui-icon-disk',
                 text: 'OK',
                 click: () => {
-                    save_list(li, d);
+                    save_list(d);
                 },
             },
         ],
     });
 }
-function delete_list(li, dlg) {
-    // TODO: fetch all list items and store all data in a "Deleted"
+function delete_list(dlg) {
+    // TODO: store all data including list items in a "Deleted"
     // pop-up with an "Undo" link that can be used to restore the list
     var lists_ver = lists_version;
-    $.ajax( li.data('lsl-uri'),
+    $.ajax( selected_list.data('lsl-uri'),
         { type: 'DELETE' }
     )
     .done((d)=>{
         lists_version = lists_ver + 1;
-        if (li.hasClass('selected')) {
-            var new_selected = li.next();
+        var deleted_list = selected_list;
+
+        var new_selected = deleted_list.next();
+        if (new_selected.length) {
+            select_list(new_selected)
+        }
+        else {
+            new_selected = deleted_list.prev();
             if (new_selected.length) {
-                select_list(new_selected)
+                select_list(new_selected);
             }
             else {
-                new_selected = li.prev();
-                if (new_selected.length) {
-                    select_list(new_selected);
-                }
-                else {
-                    $('#page').removeClass('have-lists');
-                }
+                $('#page').removeClass('have-lists');
             }
         }
 
-        li.remove();
+        deleted_list.remove();
+        dlg.dialog('destroy');
+        got_lists_version(d.lists_version);
+    });
         dlg.dialog('destroy');
         got_lists_version(d.lists_version);
     });
@@ -199,10 +198,6 @@ function load_lists() {
                     .append(
                         $('<span class="list-name">')
                         .text(list.name)
-                    )
-                    .append(
-                        $('<span class="list-edit-trigger">')
-                        .append('<span class="ui-icon ui-icon-pencil">')
                     );
                 lists.append(list_item);
             }
@@ -320,14 +315,14 @@ $(function(){
 
         return true;
     });
-    $('ul#lists')
+    $('#lists')
         .on('click', 'li', ev=>{
             select_list($(ev.target).closest('li'));
-        })
-        .on('click', 'li > span.list-edit-trigger', ev => {
-            edit_list($(ev.target).closest('li'));
-            return false;
         });
+    $('#list-edit-trigger').on('click', ev => {
+        edit_list();
+        return false;
+    });
     $('#new-list-item button').on('click', handle_new_list_item_submission);
     $('#new-list-item input').on('keypress', ev => {
         if (13 == ev.keyCode) {