diff options
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/importlayer.js | 30 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/libtoaster.js | 5 |
2 files changed, 34 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index c68f3669f6..5a59799bc5 100644 --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js @@ -18,10 +18,38 @@ function importLayerPageInit (ctx) { libtoaster.makeTypeahead(layerDepInput, libtoaster.ctx.layersTypeAheadUrl, { include_added: "true" }, function(item){ currentLayerDepSelection = item; + }); + + // choices available in the typeahead + var layerDepsChoices = {}; + + // when the typeahead choices change, store an array of the available layer + // choices locally, to use for enabling/disabling the "Add layer" button + layerDepInput.on("typeahead-choices-change", function (event, data) { + layerDepsChoices = {}; - layerDepBtn.removeAttr("disabled"); + if (data.choices) { + data.choices.forEach(function (item) { + layerDepsChoices[item.name] = item; + }); + } }); + // disable the "Add layer" button when the layer input typeahead is empty + // or not in the typeahead choices + layerDepInput.on("input change", function () { + // get the choices from the typeahead + var choice = layerDepsChoices[$(this).val()]; + + if (choice) { + layerDepBtn.removeAttr("disabled"); + currentLayerDepSelection = choice; + } + else { + layerDepBtn.attr("disabled", "disabled"); + currentLayerDepSelection = undefined; + } + }); /* We automatically add "openembedded-core" layer for convenience as a * dependency as pretty much all layers depend on this one diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index 8d1d20f133..43930a2c30 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js @@ -21,6 +21,9 @@ var libtoaster = (function (){ var xhrReq; jQElement.typeahead({ + // each time the typeahead's choices change, a + // "typeahead-choices-change" event is fired with an object + // containing the available choices in a "choices" property source: function(query, process){ xhrParams.search = query; @@ -36,6 +39,8 @@ var libtoaster = (function (){ xhrReq = null; + jQElement.trigger("typeahead-choices-change", {choices: data.results}); + return process(data.results); }); }, |