Merge "bump eslint version to 1.10.3"

.eslintignore

@@ -1 +1 @@
-horizon/static/horizon/lib/
+horizon/static/horizon/lib/**

horizon/static/auth/login/login.spec.js

@@ -43,9 +43,9 @@
               var pass = actual.css('display') !== 'none';
               var result = {
                 pass: pass,
-                message: pass ?
-                  'Expected element to be visible' :
-                  'Expected element to be visible, but it is hidden'
+                message: pass
+                  ? 'Expected element to be visible'
+                  : 'Expected element to be visible, but it is hidden'
               };
               return result;
             }

horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js

@@ -114,9 +114,9 @@
       function resolvePromises(scope, iterStartElement) {
         var resolvedInput = input(scope);
 
-        var promiseResolver = angular.isArray(resolvedInput) ?
-            multiPromiseResolver(singlePromiseResolver, resolvedInput) :
-            singlePromiseResolver(resolvedInput);
+        var promiseResolver = angular.isArray(resolvedInput)
+          ? multiPromiseResolver(singlePromiseResolver, resolvedInput)
+          : singlePromiseResolver(resolvedInput);
 
         promiseResolver.then(linkContent, removeContent);
 

horizon/static/framework/widgets/magic-search/hz-magic-search-bar.directive.js

@@ -108,9 +108,9 @@
         cancel: gettext('Cancel'),
         prompt: gettext('Click here for filters.'),
         remove: gettext('Remove'),
-        text: (scope.clientFullTextSearch ?
-          gettext('Search in current results') :
-          gettext('Full Text Search'))
+        text: (scope.clientFullTextSearch
+            ? gettext('Search in current results')
+            : gettext('Full Text Search'))
       };
       scope.filterStrings = scope.filterStrings || defaultFilterStrings;
 

horizon/static/horizon/js/horizon.quota.js

@@ -100,8 +100,8 @@ horizon.Quota = {
    */
   noteDisabledFlavors: function(allDisabled) {
     if ($('#some_flavors_disabled').length === 0) {
-      var message = allDisabled ? horizon.Quota.allFlavorsDisabledMessage :
-        horizon.Quota.disabledFlavorMessage;
+      var message = allDisabled ? horizon.Quota.allFlavorsDisabledMessage
+        : horizon.Quota.disabledFlavorMessage;
       $('#id_flavor').parent().append("<span id='some_flavors_disabled'>" +
         message + '</span>');
     }

package.json

@@ -6,7 +6,7 @@
   "repository": "none",
   "license": "Apache 2.0",
   "devDependencies": {
-    "eslint": "1.2.1",
+    "eslint": "1.10.3",
     "eslint-config-openstack": "1.2.3",
     "eslint-plugin-angular": "0.15.0",
     "jasmine-core": "2.2.0",