Merge pull request #2444 from jeff1evesque/bug-2443

#2443: Resolve travis jshint, and bootlint introduced via #2413

Author: jeff1evesque

.travis.yml

@@ -50,7 +50,7 @@ script:
   - jshint --verbose src/js/*.js --config test/config/jshint.json --exclude-path test/config/.jshintignore
   - jscs . --config test/config/.jscs.json
   - scss-lint src/scss/*.scss
-  - bootlint interface/templates/*.html
+  - bootlint -d W005 interface/templates/*.html
   - puppet-lint --no-ensure_first_param-check --no-autoloader_layout-check --no-variable_scope-check puppet/environment/development/manifests
   - puppet-lint --no-ensure_first_param-check --no-variable_scope-check puppet/environment/development/modules
   - (cd puppet/environment/development/ && r10k puppetfile check)

src/js/ajax_caller.js

@@ -7,23 +7,21 @@
 // AJAX Process
 function ajaxCaller(callbackDone, callbackFail, args) {
   // define fetch headers
-  if (args.contentType === null || args.contentType == undefined) {
-    var headers = {
+  var fetchHeaders = {
+    'Accept': 'text/javascript',
+    'Content-Type': args.contentType
+  };
+  if (args.contentType === null || args.contentType === undefined) {
+    fetchHeaders = {
       'Accept': 'text/javascript'
-    }
-  }
-  else {
-    var headers = {
-      'Accept': 'text/javascript',
-      'Content-Type': args.contentType
-    }
+    };
   }
 
   // ajax logic
   fetch(args.endpoint, {
     method: 'post',
     body: args.data,
-    headers: headers
+    headers: fetchHeaders
   }).then(function(response) {
     if (response.ok) {
       // asynchronous callback
@@ -33,7 +31,7 @@ function ajaxCaller(callbackDone, callbackFail, args) {
       var error = {
         'statusText': response.statusText,
         'status': response.status
-	  }
+      };
       throw error;
     }
   }).catch(function(e) {