diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-10-05 17:08:52 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-06 11:41:48 +0100 |
commit | 8df56061f63b63b77a0c7a7ddd75812e3b5a88c4 (patch) | |
tree | 2dcc9498e3fe3d345476659122ffee0d61a32110 | |
parent | 5e9b40556713dc41090497f3c3d9c6a8d6b83b59 (diff) | |
download | poky-8df56061f63b63b77a0c7a7ddd75812e3b5a88c4.tar.gz |
bitbake: toaster: importlayer Fix layer dependencies button state toggle
Fix regression introduced by switching typeahead library. Make sure we
enable and disable the add button based on whether the selection event
has fired or not.
[YOCTO #9936]
(Bitbake rev: cfef79e98b023252cd116d6cc4f90d261d47d13f)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: bavery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/importlayer.js | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index 570ca3369b..30dc28280e 100644 --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js | |||
@@ -21,21 +21,11 @@ function importLayerPageInit (ctx) { | |||
21 | libtoaster.ctx.layersTypeAheadUrl, | 21 | libtoaster.ctx.layersTypeAheadUrl, |
22 | { include_added: "true" }, function(item){ | 22 | { include_added: "true" }, function(item){ |
23 | currentLayerDepSelection = item; | 23 | currentLayerDepSelection = item; |
24 | layerDepBtn.removeAttr("disabled"); | ||
24 | }); | 25 | }); |
25 | 26 | ||
26 | // choices available in the typeahead | 27 | layerDepInput.on("typeahead:select", function(event, data){ |
27 | var layerDepsChoices = {}; | 28 | currentLayerDepSelection = data; |
28 | |||
29 | // when the typeahead choices change, store an array of the available layer | ||
30 | // choices locally, to use for enabling/disabling the "Add layer" button | ||
31 | layerDepInput.on("typeahead-choices-change", function (event, data) { | ||
32 | layerDepsChoices = {}; | ||
33 | |||
34 | if (data.choices) { | ||
35 | data.choices.forEach(function (item) { | ||
36 | layerDepsChoices[item.name] = item; | ||
37 | }); | ||
38 | } | ||
39 | }); | 29 | }); |
40 | 30 | ||
41 | // Disable local dir repo when page is loaded. | 31 | // Disable local dir repo when page is loaded. |
@@ -43,18 +33,8 @@ function importLayerPageInit (ctx) { | |||
43 | 33 | ||
44 | // disable the "Add layer" button when the layer input typeahead is empty | 34 | // disable the "Add layer" button when the layer input typeahead is empty |
45 | // or not in the typeahead choices | 35 | // or not in the typeahead choices |
46 | layerDepInput.on("input change", function () { | 36 | layerDepInput.on("input change", function(){ |
47 | // get the choices from the typeahead | 37 | layerDepBtn.attr("disabled","disabled"); |
48 | var choice = layerDepsChoices[$(this).val()]; | ||
49 | |||
50 | if (choice) { | ||
51 | layerDepBtn.removeAttr("disabled"); | ||
52 | currentLayerDepSelection = choice; | ||
53 | } | ||
54 | else { | ||
55 | layerDepBtn.attr("disabled","disabled"); | ||
56 | currentLayerDepSelection = undefined; | ||
57 | } | ||
58 | }); | 38 | }); |
59 | 39 | ||
60 | /* We automatically add "openembedded-core" layer for convenience as a | 40 | /* We automatically add "openembedded-core" layer for convenience as a |