Browse Source

bump eslint version to 1.10.3

bumps the eslint version to 1.10.3 which fixes a lot of
issues, especially rules not working as expected
or being ignored and brings the js code up to date to
comply with those rules.

Change-Id: I1234e7991f98d4ceb0c5333dc036c6a30206ff64
changes/49/282249/8
Itxaka 5 years ago
committed by Itxaka Serrano Garcia
parent
commit
9697a9f580
12 changed files with 61 additions and 61 deletions
  1. +1
    -1
      .eslintignore
  2. +3
    -3
      horizon/static/auth/login/login.spec.js
  3. +2
    -2
      horizon/static/framework/util/i18n/i18n.js
  4. +3
    -3
      horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js
  5. +4
    -4
      horizon/static/framework/widgets/load-edit/load-edit.directive.spec.js
  6. +3
    -3
      horizon/static/framework/widgets/magic-search/hz-magic-search-bar.directive.js
  7. +2
    -2
      horizon/static/framework/widgets/table/hz-select-all.directive.js
  8. +2
    -2
      horizon/static/horizon/js/horizon.quota.js
  9. +6
    -6
      openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.spec.js
  10. +32
    -32
      openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
  11. +2
    -2
      openstack_dashboard/static/app/core/openstack-service-api/glance.service.js
  12. +1
    -1
      package.json

+ 1
- 1
.eslintignore View File

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

+ 3
- 3
horizon/static/auth/login/login.spec.js View File

@ -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;
}


+ 2
- 2
horizon/static/framework/util/i18n/i18n.js View File

@ -43,8 +43,8 @@
function getText($window) {
// If no global function, revert to just returning given text.
var gettextFunc = $window.gettext || function (x) {
return x;
};
return x;
};
// Eventually, could delete the window gettext references here,
// or provide an appropriate method.


+ 3
- 3
horizon/static/framework/util/promise-toggle/hz-promise-toggle.directive.js View File

@ -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);


+ 4
- 4
horizon/static/framework/widgets/load-edit/load-edit.directive.spec.js View File

@ -28,10 +28,10 @@
readFileService = {};
$provide.provider('horizon.framework.util.file.file-reader',
function () {
this.$get = function () {
return readFileService;
};
});
this.$get = function () {
return readFileService;
};
});
}));
beforeEach(inject(function ($injector) {
$scope = $injector.get('$rootScope').$new();


+ 3
- 3
horizon/static/framework/widgets/magic-search/hz-magic-search-bar.directive.js View File

@ -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;


+ 2
- 2
horizon/static/framework/widgets/table/hz-select-all.directive.js View File

@ -86,8 +86,8 @@
* on sort, filter and pagination
*/
var unWatchTableState = scope.$watch(function() {
return stTableCtrl.tableState();
},
return stTableCtrl.tableState();
},
updateSelectAll,
true
);


+ 2
- 2
horizon/static/horizon/js/horizon.quota.js View File

@ -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>');
}


+ 6
- 6
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/keypair/keypair.controller.spec.js View File

@ -26,12 +26,12 @@
beforeEach(module('horizon.dashboard.project'));
beforeEach(function() {
settings = {
OPENSTACK_HYPERVISOR_FEATURES: {
requires_keypair: false
}
};
});
settings = {
OPENSTACK_HYPERVISOR_FEATURES: {
requires_keypair: false
}
};
});
beforeEach(module(function ($provide) {
$provide.value('$modal', $modal);


+ 32
- 32
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js View File

@ -25,50 +25,50 @@
var novaExtensionsEnabled = false;
var novaApi = {
createServer: function(finalSpec) {
return {
then: function () {
return finalSpec;
}
};
},
return {
then: function () {
return finalSpec;
}
};
},
getAvailabilityZones: function() {
var zones = [
{ zoneName: 'zone-1', zoneState: { available: true } },
{ zoneName: 'zone-2', zoneState: { available: true } },
{ zoneName: 'invalid-zone-1' },
{ zoneName: 'invalid-zone-2' }
];
var zones = [
{ zoneName: 'zone-1', zoneState: { available: true } },
{ zoneName: 'zone-2', zoneState: { available: true } },
{ zoneName: 'invalid-zone-1' },
{ zoneName: 'invalid-zone-2' }
];
var deferred = $q.defer();
deferred.resolve({ data: { items: zones } });
var deferred = $q.defer();
deferred.resolve({ data: { items: zones } });
return deferred.promise;
},
return deferred.promise;
},
getFlavors: function() {
var flavors = [ 'flavor-1', 'flavor-2' ];
var flavors = [ 'flavor-1', 'flavor-2' ];
var deferred = $q.defer();
deferred.resolve({ data: { items: flavors } });
var deferred = $q.defer();
deferred.resolve({ data: { items: flavors } });
return deferred.promise;
},
return deferred.promise;
},
getKeypairs: function() {
var keypairs = [ { keypair: { name: 'key-1' } },
{ keypair: { name: 'key-2' } } ];
var keypairs = [ { keypair: { name: 'key-1' } },
{ keypair: { name: 'key-2' } } ];
var deferred = $q.defer();
deferred.resolve({ data: { items: keypairs } });
var deferred = $q.defer();
deferred.resolve({ data: { items: keypairs } });
return deferred.promise;
},
return deferred.promise;
},
getLimits: function() {
var limits = { maxTotalInstances: 10, totalInstancesUsed: 0 };
var limits = { maxTotalInstances: 10, totalInstancesUsed: 0 };
var deferred = $q.defer();
deferred.resolve({ data: limits });
var deferred = $q.defer();
deferred.resolve({ data: limits });
return deferred.promise;
}
return deferred.promise;
}
};
beforeEach(module('horizon.dashboard.project.workflow.launch-instance'));


+ 2
- 2
openstack_dashboard/static/app/core/openstack-service-api/glance.service.js View File

@ -358,8 +358,8 @@
var promise = apiService.get('/api/glance/metadefs/namespaces/', config);
return suppressError ? promise : promise.error(function() {
toastService.add('error', gettext('Unable to retrieve the namespaces.'));
});
toastService.add('error', gettext('Unable to retrieve the namespaces.'));
});
}
/**


+ 1
- 1
package.json View File

@ -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",


Loading…
Cancel
Save