Resolves jshint/test failures with splainer-search upgrade

- Searchers no longer set 'inError' they reject their promise, so an
  explicit failure needs to be handled
- dependencies need to be upgraded to all use angular 1.4.x libs
- jshint errors complaining about underscores instead of camelcase

Author: softwaredoug

.jshintrc

@@ -8,7 +8,7 @@
   "eqeqeq": true,
   "immed": true,
   "indent": 2,
-  "latedef": true,
+  "latedef": "nofunc",
   "newcap": true,
   "noarg": true,
   "quotmark": "single",

app/scripts/controllers/docSelector.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('splain-app')
-  .controller('DocSelectorCtrl', function DocExplainCtrl($scope, spl_searchSvc, solrUrlSvc, settingsStoreSvc) {
+  .controller('DocSelectorCtrl', function DocExplainCtrl($scope, splSearchSvc, solrUrlSvc, settingsStoreSvc) {
     // this controller is a bit silly just because
     // modals need their own controller
 
@@ -25,14 +25,14 @@ angular.module('splain-app')
       // we should be using the solrUrlSvc to do this
       searchSettings.searchArgsStr = addToSolrArgs(searchSettings.searchArgsStr,
                                                    {'explainOther': [altQuery]});
-      var explainOtherSearch = spl_searchSvc.createSearch(searchSettings);
+      var explainOtherSearch = splSearchSvc.createSearch(searchSettings);
       explainOtherSearch.search()
       .then(function() {
         // but we don't get anything but an explain, so let's re-search
         // and try to pull back the right data
         searchSettings = angular.copy(searchSettings);
         searchSettings.searchArgsStr = 'q=' + altQuery;
-        $scope.currSearch = spl_searchSvc.createSearch(searchSettings, explainOtherSearch.searcher.othersExplained);
+        $scope.currSearch = splSearchSvc.createSearch(searchSettings, explainOtherSearch.searcher.othersExplained);
         $scope.currSearch.search();
       });
     };

app/scripts/controllers/searchResults.js

@@ -8,7 +8,7 @@
  * Controller of the frontendApp
  */
 angular.module('splain-app')
-  .controller('SearchResultsCtrl', function ($scope, spl_searchSvc, settingsStoreSvc) {
+  .controller('SearchResultsCtrl', function ($scope, splSearchSvc, settingsStoreSvc) {
 
 
     $scope.search = {};
@@ -27,7 +27,7 @@ angular.module('splain-app')
 
     $scope.search.reset = function() {
       var searchSettings = settingsStoreSvc.settings;
-      $scope.currSearch = spl_searchSvc.createSearch(searchSettings);
+      $scope.currSearch = splSearchSvc.createSearch(searchSettings);
     };
 
     $scope.search.reset();

app/scripts/services/splSearchSvc.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('splain-app')
-  .service('spl_searchSvc', function solrSettingsSvc(solrUrlSvc, fieldSpecSvc, searchSvc, normalDocsSvc) {
+  .service('splSearchSvc', function splSearchSvc(solrUrlSvc, fieldSpecSvc, searchSvc, normalDocsSvc) {
 
     this.states = {
       NO_SEARCH: 0,
@@ -110,13 +110,9 @@ angular.module('splain-app')
 
         var thisSearch = this;
         this.searcher.search()
-        .then(function() {
+        .then(function success() {
           thisSearch.linkUrl = thisSearch.searcher.linkUrl;
           thisSearch.numFound = thisSearch.searcher.numFound;
-          if (thisSearch.searcher.inError) {
-            thisSearch.state = thisSvc.states.IN_ERROR;
-            return;
-          }
           angular.forEach(thisSearch.searcher.docs, function(doc) {
             var overridingExpl = thisSearch.getOverridingExplain(doc, fieldSpec);
             var normalDoc = normalDocsSvc.createNormalDoc(fieldSpec, doc, overridingExpl);
@@ -132,6 +128,9 @@ angular.module('splain-app')
           groupedResultToNormalDocs(fieldSpec, thisSearch.grouped);
           thisSearch.state = thisSvc.states.DID_SEARCH;
           promise.complete();
+        }, function searchFailure() {
+          thisSearch.state = thisSvc.states.IN_ERROR;
+          return;
         });
 
         return promise;

bower.json

@@ -2,21 +2,21 @@
   "name": "splainer",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "~1.2.26",
+    "angular": "~1.4.0",
     "json3": "~3.3.1",
     "es5-shim": "~3.1.0",
     "bootstrap": "~3.2.0",
     "angular-local-storage": "~0.0.5",
     "angular-bootstrap": "~0.11.0",
     "ng-json-explorer": "git://github.com/softwaredoug/ng-json-explorer",
     "splainer-search": "1.3.2",
-    "angular-sanitize": "~1.2.21",
+    "angular-sanitize": "~1.4.0",
     "jquery": "~2.1.1",
     "inspector-gadget": "^0.2.0"
   },
   "devDependencies": {
-    "angular-mocks": "~1.2.26",
-    "angular-scenario": "~1.2.26"
+    "angular-mocks": "~1.4.0",
+    "angular-scenario": "~1.4.0"
   },
   "appPath": "app",
   "resolutions": {