diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-03-27 15:49:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-17 11:53:34 +0100 |
commit | 8652fbaf5e8c56d9d28b7da57432f37313a19b4a (patch) | |
tree | 6a1a42802bfea09548f390cc6b96412838b9166a | |
parent | 380a3fb372c8b0a53dd7528562e6e7a222dc76ef (diff) | |
download | bitbake-8652fbaf5e8c56d9d28b7da57432f37313a19b4a.tar.gz |
toaster: base.js minor jshint fixes
Fixing errors identified by jshint, some missing semicolons and
preference for === operator. Also pass the urldata in libtoaster as an
object rather than constructing a query string.
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
-rw-r--r-- | lib/toaster/toastergui/static/js/base.js | 19 | ||||
-rw-r--r-- | lib/toaster/toastergui/static/js/libtoaster.js | 9 |
2 files changed, 13 insertions, 15 deletions
diff --git a/lib/toaster/toastergui/static/js/base.js b/lib/toaster/toastergui/static/js/base.js index 777ab432c..241c5d2e0 100644 --- a/lib/toaster/toastergui/static/js/base.js +++ b/lib/toaster/toastergui/static/js/base.js @@ -6,7 +6,7 @@ function basePageInit (ctx) { /* Hide the button if we're on the project,newproject or importlyaer page * or if there are no projects yet defined */ - if (ctx.numProjects == 0 || ctx.currentUrl.search('newproject|project/\\d/$|importlayer/$') > 0){ + if (ctx.numProjects === 0 || ctx.currentUrl.search('newproject|project/\\d/$|importlayer/$') > 0){ newBuildButton.hide(); return; } @@ -18,17 +18,17 @@ function basePageInit (ctx) { newBuildButton.show().removeAttr("disabled"); - _checkProjectBuildable() + _checkProjectBuildable(); _setupNewBuildButton(); function _checkProjectBuildable(){ - if (ctx.projectId == undefined) + if (ctx.projectId === undefined) return; libtoaster.getProjectInfo(ctx.projectInfoUrl, ctx.projectId, function(data){ - if (data.machine.name == undefined || data.layers.length == 0) { + if (data.machine.name === undefined || data.layers.length === 0) { /* we can't build anything with out a machine and some layers */ $("#new-build-button #targets-form").hide(); $("#new-build-button .alert").show(); @@ -51,7 +51,7 @@ function basePageInit (ctx) { /* If we don't have a current project then present the set project * form. */ - if (ctx.projectId == undefined) { + if (ctx.projectId === undefined) { $('#change-project-form').show(); $('#project .icon-pencil').hide(); } @@ -72,13 +72,13 @@ function basePageInit (ctx) { * the value that has been set by selecting a suggestion from the typeahead */ newBuildProjectInput.on('input', function(event) { - if (event.keyCode == 13) + if (event.keyCode === 13) return; newBuildProjectSaveBtn.attr("disabled", "disabled"); }); newBuildTargetInput.on('input', function() { - if ($(this).val().length == 0) + if ($(this).val().length === 0) newBuildTargetBuildBtn.attr("disabled", "disabled"); else newBuildTargetBuildBtn.removeAttr("disabled"); @@ -96,7 +96,7 @@ function basePageInit (ctx) { }); newBuildProjectSaveBtn.click(function() { - ctx.projectId = selectedProject.id + ctx.projectId = selectedProject.id; /* Update the typeahead project_id paramater */ _checkProjectBuildable(); newBuildTargetInput.data('typeahead').options.xhrParams.project_id = ctx.projectId; @@ -131,6 +131,5 @@ function basePageInit (ctx) { $(".new-build").click (function(event) { event.stopPropagation(); }); - }; - + } } diff --git a/lib/toaster/toastergui/static/js/libtoaster.js b/lib/toaster/toastergui/static/js/libtoaster.js index fcf82ac65..ae9e4556a 100644 --- a/lib/toaster/toastergui/static/js/libtoaster.js +++ b/lib/toaster/toastergui/static/js/libtoaster.js @@ -67,12 +67,11 @@ var libtoaster = (function (){ /* * url - the url of the xhr build */ function _startABuild (url, project_id, targets, onsuccess, onfail) { - var data; - if (project_id) - data = 'project_id='+project_id+'&targets='+targets; - else - data = 'targets='+targets; + var data = { + project_id : project_id, + targets : targets, + } $.ajax( { type: "POST", |