diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/static/js/importlayer.js')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/importlayer.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index 5a59799bc5..2f59567133 100644 --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js | |||
@@ -46,7 +46,7 @@ function importLayerPageInit (ctx) { | |||
46 | currentLayerDepSelection = choice; | 46 | currentLayerDepSelection = choice; |
47 | } | 47 | } |
48 | else { | 48 | else { |
49 | layerDepBtn.attr("disabled", "disabled"); | 49 | layerDepBtn.attr("disabled","disabled"); |
50 | currentLayerDepSelection = undefined; | 50 | currentLayerDepSelection = undefined; |
51 | } | 51 | } |
52 | }); | 52 | }); |
@@ -70,7 +70,7 @@ function importLayerPageInit (ctx) { | |||
70 | layerDeps[currentLayerDepSelection.id] = currentLayerDepSelection; | 70 | layerDeps[currentLayerDepSelection.id] = currentLayerDepSelection; |
71 | 71 | ||
72 | /* Make a list item for the new layer dependency */ | 72 | /* Make a list item for the new layer dependency */ |
73 | var newLayerDep = $("<li><a></a><span class=\"icon-trash\" data-toggle=\"tooltip\" title=\"Delete\"></span></li>"); | 73 | var newLayerDep = $("<li><a></a><span class=\"glyphicon glyphicon-trash\" data-toggle=\"tooltip\" title=\"Remove\"></span></li>"); |
74 | 74 | ||
75 | newLayerDep.data('layer-id', currentLayerDepSelection.id); | 75 | newLayerDep.data('layer-id', currentLayerDepSelection.id); |
76 | newLayerDep.children("span").tooltip(); | 76 | newLayerDep.children("span").tooltip(); |
@@ -105,7 +105,8 @@ function importLayerPageInit (ctx) { | |||
105 | }, null); | 105 | }, null); |
106 | }); | 106 | }); |
107 | 107 | ||
108 | importAndAddBtn.click(function(){ | 108 | importAndAddBtn.click(function(e){ |
109 | e.preventDefault(); | ||
109 | /* This is a list of the names from layerDeps for the layer deps | 110 | /* This is a list of the names from layerDeps for the layer deps |
110 | * modal dialog body | 111 | * modal dialog body |
111 | */ | 112 | */ |
@@ -262,7 +263,7 @@ function importLayerPageInit (ctx) { | |||
262 | 263 | ||
263 | layerNameInput.on('input', function() { | 264 | layerNameInput.on('input', function() { |
264 | if ($(this).val() && !validLayerName.test($(this).val())){ | 265 | if ($(this).val() && !validLayerName.test($(this).val())){ |
265 | layerNameCtrl.addClass("error") | 266 | layerNameCtrl.addClass("has-error") |
266 | $("#invalid-layer-name-hint").show(); | 267 | $("#invalid-layer-name-hint").show(); |
267 | enable_import_btn(false); | 268 | enable_import_btn(false); |
268 | return; | 269 | return; |
@@ -279,7 +280,7 @@ function importLayerPageInit (ctx) { | |||
279 | * reason. | 280 | * reason. |
280 | */ | 281 | */ |
281 | if (!duplicatedLayerName.is(":visible")) | 282 | if (!duplicatedLayerName.is(":visible")) |
282 | layerNameCtrl.removeClass("error") | 283 | layerNameCtrl.removeClass("has-error") |
283 | 284 | ||
284 | $("#invalid-layer-name-hint").hide(); | 285 | $("#invalid-layer-name-hint").hide(); |
285 | check_form(); | 286 | check_form(); |