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
This commit is contained in:
parent
e1f07e2794
commit
9697a9f580
@ -1 +1 @@
|
||||
horizon/static/horizon/lib/
|
||||
horizon/static/horizon/lib/**
|
@ -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;
|
||||
}
|
||||
|
@ -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.
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
|
||||
|
@ -86,8 +86,8 @@
|
||||
* on sort, filter and pagination
|
||||
*/
|
||||
var unWatchTableState = scope.$watch(function() {
|
||||
return stTableCtrl.tableState();
|
||||
},
|
||||
return stTableCtrl.tableState();
|
||||
},
|
||||
updateSelectAll,
|
||||
true
|
||||
);
|
||||
|
@ -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>');
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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'));
|
||||
|
@ -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.'));
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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…
Reference in New Issue
Block a user