X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Flsl.js;h=f7efa52f72236622f57796a2b84a501f4ec95e6e;hb=0753df8cb1a2c3d9bd1a3b36c7d1b71ca529bdd3;hp=d1656d4f1320aedd2e680cb77690154e9d122eeb;hpb=082a91fa76feab7dc6d4e4a033169b2dbaea1c49;p=lsl.git diff --git a/public/javascripts/lsl.js b/public/javascripts/lsl.js index d1656d4..f7efa52 100644 --- a/public/javascripts/lsl.js +++ b/public/javascripts/lsl.js @@ -1,6 +1,8 @@ "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_id_re = new RegExp('/(\\d+)$'); var lists_version = -1; @@ -17,7 +19,11 @@ function uri_id(uri) { return m ? m[1] : null; } function add_list_item(data) { - var item = $('
  • ').addClass('list-item-row').data('item', data); + var item = $('
  • ').addClass('list-item-row').data({ + 'lsl-uri': data.uri, + 'lsl-version': data.version, + 'lsl-description': data.description, + 'lsl-done': data.done}); var cb = $(''); if (data.done) cb.prop('checked', true); item.append(cb); @@ -32,14 +38,15 @@ function got_lists_version(new_version) { window.setTimeout(load_lists); } function got_list_version(new_version) { - if (new_version != selected_list.attr('lsl-version')) + if (new_version != selected_list.data('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); + target.data('lsl-items', item_data.items); + target.data('lsl-version', item_data.version); // TODO: merge new items into existing ones // keep track of the last existing item, and append new one @@ -78,8 +85,125 @@ function select_list(new_selected_list) { selected_list = new_selected_list; } +function edit_list() { + var d = $('
    ') + .append( + $('
    ') + .append( + $('').text('List name'), + $('') + .on('keypress', (ev) => { + if (13 == ev.keyCode) { + save_list(d); + return false; + } + + return true; + }) + .val(selected_list.data('lsl-name')) + ) + ); + + d.dialog({ + dialogClass: 'edit-list-dialog', + autoOpen: true, + modal: true, + title: 'Edit list', + width: 'min(calc(100% - 2em), 20em)', + close: (ev) => { + $(ev.target).dialog('destroy'); + }, + buttons: [ + { + class: 'btn-delete', + icon: 'ui-icon-trash', + click: () => { + delete_list(d); + }, + }, + { + icon: 'ui-icon-disk', + text: 'OK', + click: () => { + save_list(d); + }, + }, + ], + }); +} +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( selected_list.data('lsl-uri'), + { type: 'DELETE' } + ) + .done((d)=>{ + lists_version = lists_ver + 1; + 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); + } + else { + $('#page').removeClass('have-lists'); + } + } + + deleted_list.remove(); + dlg.dialog('destroy'); + got_lists_version(d.lists_version); + }); +} +function save_list(dlg) { + var lists_ver = lists_version; + var new_name = dlg.find('input[type="text"]').val(); + + $.ajax( selected_list.data('lsl-uri'), + { type: 'PUT', + data: JSON.stringify({ name: new_name, + version: selected_list.data('lsl-version')}) + } + ) + .done((d)=>{ + lists_version = lists_ver + 1; + + selected_list.find('.list-name').text(new_name); + selected_list.data('lsl-name', new_name); + $('#selected-list-name').text(new_name); + + dlg.dialog('destroy'); + got_lists_version(d.lists_version); + }); +} function load_lists() { - $.get(uri_base + '/api/v1/list') + return $.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; @@ -92,8 +216,8 @@ function load_lists() { if (existing.length) { existing.data('lsl-version', list.version) .data('lsl-name', list.name) - .text(list.name) .removeClass('old'); + existing.find('span.list-name').text(list.name); } else { var list_item = $('
  • ') @@ -101,7 +225,10 @@ function load_lists() { .data('lsl-uri', list.uri) .data('lsl-version', list.version) .data('lsl-name', list.name) - .text(list.name); + .append( + $('') + .text(list.name) + ); lists.append(list_item); } }); @@ -113,8 +240,15 @@ function load_lists() { }); } function new_list_submission_done(data) { + $('input[name="list_name"]').val('').trigger('change'); + if (data.lists_version != lists_version) { - load_lists(); + load_lists() + .done((d)=>{ + var new_list = $('li#list-'+uri_id(data.uri)); + if (new_list.length) + select_list(new_list); + }); return; } @@ -129,21 +263,104 @@ function handle_new_list_submission(){ } function new_list_item_submission_done(data) { got_lists_version(data.lists_version); + selected_list.data('lsl-version', selected_list.data('lsl-version') + 1 ); got_list_version(data.list_version); - 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, + uri: data.uri, }; - item_data.items.push(new_item); - item_data.version = data.version; + selected_list.data('lsl-items').push(new_item); add_list_item(new_item); $('#new-list-item input').val(''); } +function delete_list_item(dlg, li) { + $.ajax(li.data('lsl-uri'), + { type: 'DELETE' }) + .done((resp) => { + li.remove(); + dlg.dialog('destroy'); + selected_list.data('lsl-version', selected_list.data('lsl-version')+1); + got_list_version(resp.list_version); + got_lists_version(resp.lists_version); + }); +} +function save_list_item(dlg,li) { + var new_description = dlg.find('input[type="text"]').val(); + + $.ajax( li.data('lsl-uri'), + { type: 'PUT', + data: JSON.stringify({ + description: new_description, + version: li.data('lsl-version')}) + } + ) + .done((d)=>{ + selected_list.data('lsl-version', selected_list.data('lsl-version') + 1); + + li.data('lsl-description', new_description); + li.data('lsl-version', d.version); + li.find('.description').text(new_description); + + dlg.dialog('destroy'); + got_list_version(d.list_version); + got_lists_version(d.lists_version); + }); +} +function edit_list_item(li) { + var d = $('
    ') + .append( + $('
    ') + .append( + $('').text('Item name'), + $('') + .on('keypress', (ev) => { + if (13 == ev.keyCode) { + save_list_item(d, li); + return false; + } + + return true; + }) + .val(li.data('lsl-description')) + ) + ); + + d.dialog({ + dialogClass: 'edit-item-dialog', + autoOpen: true, + modal: true, + title: 'Edit item', + width: 'min(calc(100% - 2em), 20em)', + close: (ev) => { + $(ev.target).dialog('destroy'); + }, + buttons: [ + { + class: 'btn-delete', + icon: 'ui-icon-trash', + click: () => { + delete_list_item(d, li); + }, + }, + { + icon: 'ui-icon-disk', + text: 'OK', + click: () => { + save_list_item(d, li); + }, + }, + ], + }); +} +function handle_list_item_edit(ev) { + var li = $(ev.target).closest('li'); + edit_list_item(li); + return false; +} function handle_new_list_item_submission(){ var description = $('#new-list-item input[type="text"]').val().trim(); if (description.length == 0) return; @@ -159,18 +376,18 @@ function handle_new_list_item_submission(){ function handle_list_item_state_changed(ev) { var item = $(ev.target).closest('li'); var cb = item.find('input[type="checkbox"]'); - var item_data = item.data('item'); - $.ajax(item_data.uri, + $.ajax(item.data('lsl-uri'), { type: 'PUT', data: JSON.stringify({ - version: item_data.version, + version: item.data('lsl-version'), done: cb.prop('checked')}) } ) .done(function(resp){ - item_data.version = resp.version; + item.data('lsl-version', resp.version); got_lists_version(resp.lists_version); + selected_list.data('lsl-version', selected_list.data('lsl-version')+1); got_list_version(resp.list_version); }); } @@ -211,9 +428,15 @@ $(function(){ return true; }); - $('ul#lists').on('click', 'li', ev=>{ - select_list($(ev.target)); + $('#lists') + .on('click', 'li', ev=>{ + select_list($(ev.target).closest('li')); + }); + $('#list-edit-trigger').on('click', ev => { + edit_list(); + return false; }); + $('#list-items').on('click', '>li .edit-trigger', handle_list_item_edit); $('#new-list-item button').on('click', handle_new_list_item_submission); $('#new-list-item input').on('keypress', ev => { if (13 == ev.keyCode) { @@ -224,5 +447,8 @@ $(function(){ }); $('#list-items').on('change', '.list-item-row input[type="checkbox"]', handle_list_item_state_changed); load_lists(); + $('body').on('click', '.ui-widget-overlay', (ev) => { + $(ev.target).siblings('.ui-dialog').find('.ui-dialog-content').dialog('close'); + }); }); })();