X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Flsl.js;h=de4104e5bf8b4e723e31cee1f22d0935eafd2903;hb=52688859f55cc3ee271f8e10583f354e1f6eabd8;hp=e5ec5b37300e1c44d5d10f715e728275eaaba2a2;hpb=87af57a93a915b3119b858d74a0611bd699b06db;p=lsl.git

diff --git a/public/javascripts/lsl.js b/public/javascripts/lsl.js
index e5ec5b3..de4104e 100644
--- a/public/javascripts/lsl.js
+++ b/public/javascripts/lsl.js
@@ -1,11 +1,23 @@
 "use strict";
 (function(){
+var uri_base, environment, devel_env;   // filled on page load from an HTML attribute
+var start_time = Date.now();
+
 var ui_icon_class_re = new RegExp('\\bui-icon-\\S+\\b');
-var uri_base;   // filled on page load from an HTML attribute
+var uri_id_re = new RegExp('/(\\d+)$');
 var lists_version = -1;
 var lists = [];
 var selected_list;
 
+function debug(...args) {
+    if (devel_env)
+        console.debug.apply(console, args);
+}
+
+function uri_id(uri) {
+    var m = uri.match(uri_id_re);
+    return m ? m[1] : null;
+}
 function add_list_item(data) {
     var item = $('<li>').addClass('list-item-row').data('item', data);
     var cb = $('<input type="checkbox">');
@@ -14,23 +26,29 @@ function add_list_item(data) {
     item.append($('<span class="description">').text(data.description || ''));
     item.append($('<span class="edit-trigger">').text('…'));
 
-    $('#list-items').append(item).addClass('have-list-items');
+    $('#list-items').append(item);
+    $('#list-contents').addClass('have-list-items');
 }
 function got_lists_version(new_version) {
     if (new_version != lists_version)
         window.setTimeout(load_lists);
 }
 function got_list_version(new_version) {
-    var id_data = selected_list.data('id');
-    if (new_version != id_data.version)
-        window.setTimeout(() => load_list_items(id_data.uri, selected_list));
+    if (new_version != selected_list.attr('lsl-version'))
+        window.setTimeout(
+            () => load_list_items(selected_list.data('lsl-uri'), selected_list));
 }
 function load_list_items(uri, target) {
     $.get(uri)
     .done(item_data => {
         target.data('items', item_data);
 
-        var item_list = $('#list-items').empty().removeClass('have-list-items');
+        // TODO: merge new items into existing ones
+        // keep track of the last existing item, and append new one
+        // after it, prepending if there is no last existing item
+        // the newly prepended/inserted item becomes the last existing
+        $('#list-contents').removeClass('have-list-items');
+        var item_list = $('#list-items').empty();
 
         $.each(item_data.items, (i,item) => {
             add_list_item(item);
@@ -40,52 +58,158 @@ function load_list_items(uri, target) {
     });
 }
 function select_list(new_selected_list) {
-    if (new_selected_list == selected_list)
+    if (new_selected_list && selected_list
+        && new_selected_list.length && selected_list.length
+        && new_selected_list.get(0) == selected_list.get(0)
+    )
         return;
 
-    var id_data = new_selected_list.data('id');
+    if (new_selected_list && !new_selected_list.length)
+        new_selected_list = null;
+
+    $('#page').toggleClass('have-lists', !!new_selected_list);
 
     if (selected_list)
         selected_list.removeClass('selected');
-    load_list_items(id_data.uri, new_selected_list);
+
+    if (new_selected_list) {
+        load_list_items(new_selected_list.data('lsl-uri'), new_selected_list);
+        new_selected_list.addClass('selected');
+        $('#selected-list-name').text(new_selected_list.data('lsl-name'));
+    }
+
     selected_list = new_selected_list;
-    selected_list.addClass('selected');
-    $('#selected-list-name').text(id_data.name);
+}
+function edit_list(li) {
+    li.addClass('editing');
+
+    var d = $('<div>')
+        .append(
+            $('<fieldset>')
+                .append(
+                    $('<legend>').text('List name'),
+                    $('<input type="text" size="40">').val(li.data('lsl-name'))
+                )
+        );
+
+    d.dialog({
+        autoOpen: true,
+        modal: true,
+        title: 'Edit list',
+        close: ()=>{
+            li.removeClass('editing');
+        },
+        width: 'max-content',
+        buttons: [
+            {
+                class: 'btn-delete',
+                icon: 'ui-icon-trash',
+                text: 'Delete',
+                click: () => {
+                    delete_list(li, d);
+                },
+            },
+            {
+                text: 'Cancel',
+                click: ()=>{ d.dialog('destroy'); },
+            },
+            {
+                icon: 'ui-icon-disk',
+                text: 'OK',
+                click: () => {
+                    save_list(li, d);
+                },
+            },
+        ],
+    });
+}
+function delete_list(li, dlg) {
+    var lists_ver = lists_version;
+    $.ajax( li.data('lsl-uri'),
+        { type: 'DELETE' }
+    )
+    .done((d)=>{
+        lists_version = lists_ver + 1;
+        if (li.hasClass('selected')) {
+            var new_selected = li.next();
+            if (new_selected.length) {
+                select_list(new_selected)
+            }
+            else {
+                new_selected = li.prev();
+                if (new_selected.length) {
+                    select_list(new_selected);
+                }
+                else {
+                    $('#page').removeClass('have-lists');
+                }
+            }
+        }
 
+        li.remove();
+        dlg.dialog('destroy');
+        got_lists_version(d.lists_version);
+    });
 }
 function load_lists() {
     $.get(uri_base + '/api/v1/list')
+    .always(()=>{
+        var splash = $('#splash');
+        if (splash.length) {
+            var dur = splash.css('transition-duration');
+            if (dur && dur.endsWith('s')) {
+                dur = 1000 * parseFloat(dur.substring(0, dur.length-1));
+            }
+            else
+                dur = 1000;
+
+            var now = Date.now();
+            window.setTimeout(() => {
+                splash.addClass('done');
+                debug('scheduling splash removal in '+dur+'ms');
+                window.setTimeout(()=>{ splash.remove(); }, dur);
+            },
+                Math.max(0, 500 - (now - start_time))
+            );
+        }
+    })
     .done(data => {
         lists_version = data.lists_version;
 
-        if (data.lists.length) {
-            var lists = $('#lists');
-            var new_selected_list;
+        var lists = $('#lists');
+        lists.find('>li').addClass('old');
 
-            $.each(data.lists, (i, list) => {
-                var my_id = 'shopping-list-id'+i;
+        $.each(data.lists, (i, list) => {
+            var list_id = uri_id(list.uri);
+            var existing = lists.find('li#list-'+list_id);
+            if (existing.length) {
+                existing.data('lsl-version', list.version)
+                .data('lsl-name', list.name)
+                .text(list.name)
+                .removeClass('old');
+            }
+            else {
                 var list_item = $('<li>')
-                    .data('id', list)
-                    .prop('id', my_id)
-                    .text(list.name);
-
+                    .prop('id', 'list-'+list_id)
+                    .data('lsl-uri', list.uri)
+                    .data('lsl-version', list.version)
+                    .data('lsl-name', list.name)
+                    .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);
+            }
+        });
 
-                if (!new_selected_list
-                    ||selected_list && selected_list.uri == list.uri)
-                    new_selected_list = list_item;
-
-            });
-
-            select_list(new_selected_list);
+        if (!selected_list || selected_list.hasClass('old'))
+            select_list(lists.find('>li').eq(0));
 
-            $('#page').addClass('have-lists');
-            selected_list = new_selected_list;
-        }
-        else {
-            $('#page').removeClass('have-lists');
-            selected_list = null;
-        }
+        lists.find('li.old').remove();
     });
 }
 function new_list_submission_done(data) {
@@ -109,14 +233,14 @@ function new_list_item_submission_done(data) {
 
     var item_data = selected_list.data('items');
 
-        var new_item = {
-            description: $('#new-list-item input[type="text"]').val().trim(),
-            done: $('#new-list-item input[type="checkbox"]').prop('checked'),
-            version: 1,
-        };
-        item_data.items.push(new_item);
-        add_list_item(new_item);
+    var new_item = {
+        description: $('#new-list-item input[type="text"]').val().trim(),
+        done: $('#new-list-item input[type="checkbox"]').prop('checked'),
+        version: 1,
+    };
+    item_data.items.push(new_item);
     item_data.version = data.version;
+    add_list_item(new_item);
 
     $('#new-list-item input').val('');
 }
@@ -124,8 +248,7 @@ function handle_new_list_item_submission(){
     var description = $('#new-list-item input[type="text"]').val().trim();
     if (description.length == 0) return;
 
-    var id_data = selected_list.data('id');
-    $.post(id_data.uri,
+    $.post(selected_list.data('lsl-uri'),
         JSON.stringify({
             description: description,
             done: $('#new-list-item input[type="checkbox"]').prop('checked')
@@ -153,6 +276,9 @@ function handle_list_item_state_changed(ev) {
 }
 $(function(){
     uri_base = $('#page').attr('lsl-uri-base');
+    environment = $('#page').attr('lsl-environment');
+    devel_env = environment == 'development';
+
     $(document).ajaxStart(function(){
         $(document).addClass('blocked');
         window.setTimeout(
@@ -185,9 +311,14 @@ $(function(){
 
         return true;
     });
-    $('ul#lists').on('click', 'li', ev=>{
-        select_list($(ev.target));
-    });
+    $('ul#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;
+        });
     $('#new-list-item button').on('click', handle_new_list_item_submission);
     $('#new-list-item input').on('keypress', ev => {
         if (13 == ev.keyCode) {