From 931877a4d2482a8ec4e31c32b35c5d3356c2b0b3 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 20 Sep 2014 18:11:13 +0900 Subject: [PATCH] Misc cleanup --- client/application.js | 24 +++++++++++++++--------- client/index.html | 33 +++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/client/application.js b/client/application.js index f32d861..6de51f1 100644 --- a/client/application.js +++ b/client/application.js @@ -95,12 +95,21 @@ function onForget() { $('#forgetKeyword').prop('disabled', true); - var query = { - keyword: $('#keywordToForget').val() - }; + $('#forgetError').slideUp(function() { + var query = { + keyword: $('#keywordToForget').val() + }; - $.getJSON('/node/removeKeyword', query, function(results) { - $('#forgetDialog').modal('hide'); + $.getJSON('/node/removeKeyword', query, function(results) { + if (results.success) { + $('#forgetDialog').modal('hide'); + } + else { + $('#forgetError').slideDown(function() { + $('#forgetKeyword').prop('disabled', false); + }); + } + }); }); } @@ -127,7 +136,6 @@ ready: function() { $('#keywordsToSearch').selectpicker(); - $('#keywordToForget').selectpicker(); $.getJSON('/node/getKeywords', function(keywords) { $('#searchKeywords').click(onSearch); @@ -145,15 +153,13 @@ $('#forgetKeyword').click(onForget); $('#forgetDialog').on('show.bs.modal', function() { $.getJSON('/node/getKeywords', function(keywords) { - $('#keywordToForget').empty(); + $('#forgetKeyword').prop('disabled', keywords.length === 0); for (var i = 0, count = keywords.length; i < count; ++i) { $('#keywordToForget').append($('', { value: keywords[i], text: keywords[i] })); } - $('#keywordToForget').selectpicker('refresh'); - $('#forgetKeyword').prop('disabled', keywords.length === 0); }); }); diff --git a/client/index.html b/client/index.html index 8040e64..7870e75 100644 --- a/client/index.html +++ b/client/index.html @@ -10,34 +10,35 @@
+

Reactive Search

- +
- +
- +
- +
- +
@@ -49,17 +50,17 @@
- +