Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-31 08:20:37 +01:00
Code Issues Projects Releases Wiki Activity

lint fixes

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-25 16:01:04 -04:00
parent cae8beaa8f
commit a57110b935
12 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/config.js
View File

@ -4,7 +4,9 @@ angular
.config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, jwtOptionsProvider,
$uibTooltipProvider, toastrConfig, $locationProvider, $qProvider, appSettings
// @if !selfHosted
/* jshint ignore:start */
, stripeProvider
/* jshint ignore:end */
// @endif
) {
angular.extend(appSettings, window.bitwardenAppSettings);

2
src/app/organization/organizationBillingChangePaymentController.js
View File

@ -4,7 +4,9 @@
.controller('organizationBillingChangePaymentController', function ($scope, $state, $uibModalInstance, apiService,
$analytics, toastr, existingPaymentMethod
// @if !selfHosted
/* jshint ignore:start */
, stripe
/* jshint ignore:end */
// @endif
) {
$analytics.eventTrack('organizationBillingChangePaymentController', { category: 'Modal' });

2
src/app/organization/organizationBillingController.js
View File

@ -215,7 +215,7 @@
var url = appSettings.apiUri + '/organizations/' + $state.params.orgId +
'/billing-invoice/' + charge.invoiceId + '?access_token=' + tokenService.getToken();
$window.open(url);
}
};
function load() {
apiService.organizations.getBilling({ id: $state.params.orgId }, function (org) {

1
src/app/organization/organizationSettingsExportController.js
View File

@ -88,7 +88,6 @@
break;
default:
continue;
break;
}
exportCiphers.push(cipher);

5
src/app/organization/organizationVaultController.js
View File

@ -87,15 +87,16 @@
});
editModel.result.then(function (returnVal) {
var index;
if (returnVal.action === 'edit') {
var index = $scope.ciphers.indexOf(cipher);
index = $scope.ciphers.indexOf(cipher);
if (index > -1) {
returnVal.data.collectionIds = $scope.ciphers[index].collectionIds;
$scope.ciphers[index] = returnVal.data;
}
}
else if (returnVal.action === 'delete') {
var index = $scope.ciphers.indexOf(cipher);
index = $scope.ciphers.indexOf(cipher);
if (index > -1) {
$scope.ciphers.splice(index, 1);
}

6
src/app/services/importService.js
View File

@ -307,7 +307,7 @@
case 'login': case null: case undefined:
cipher.type = constants.cipherType.login;
var totp = value.login_totp || value.totp
var totp = value.login_totp || value.totp;
var uri = value.login_uri || value.uri;
var username = value.login_username || value.username;
var password = value.login_password || value.password;
@ -434,7 +434,7 @@
case 'login': case null: case undefined:
cipher.type = constants.cipherType.login;
var totp = value.login_totp || value.totp
var totp = value.login_totp || value.totp;
var uri = value.login_uri || value.uri;
var username = value.login_username || value.username;
var password = value.login_password || value.password;
@ -2319,6 +2319,7 @@
}
var fields = [];
/* jshint ignore:start */
$.each(outterTable.find('table td:not(.subcaption)'), function (indexInArray, valueOfElement) {
$(valueOfElement).find('br').replaceWith('\n');
var t = $(valueOfElement).text();
@ -2326,6 +2327,7 @@
fields.push(t.split('\\n').join('\n'));
}
});
/* jshint ignore:end */
if (fields.length && (fields.length % 2 === 0))
for (var j = 0; j < fields.length; j += 2) {

2
src/app/settings/settingsBillingChangePaymentController.js
View File

@ -4,7 +4,9 @@
.controller('settingsBillingChangePaymentController', function ($scope, $state, $uibModalInstance, apiService,
$analytics, toastr, existingPaymentMethod, appSettings, $timeout
// @if !selfHosted
/* jshint ignore:start */
, stripe
/* jshint ignore:end */
// @endif
) {
$analytics.eventTrack('settingsBillingChangePaymentController', { category: 'Modal' });

2
src/app/settings/settingsCreateOrganizationController.js
View File

@ -4,7 +4,9 @@
.controller('settingsCreateOrganizationController', function ($scope, $state, apiService, cryptoService,
toastr, $analytics, authService, constants, appSettings, validationService
// @if !selfHosted
/* jshint ignore:start */
, stripe
/* jshint ignore:end */
// @endif
) {
$scope.plans = constants.plans;

2
src/app/settings/settingsPremiumController.js
View File

@ -4,7 +4,9 @@
.controller('settingsPremiumController', function ($scope, $state, apiService, toastr, $analytics, authService,
constants, $timeout, appSettings, validationService
// @if !selfHosted
/* jshint ignore:start */
, stripe
/* jshint ignore:end */
// @endif
) {
var profile = null;

1
src/app/tools/toolsExportController.js
View File

@ -79,7 +79,6 @@
break;
default:
continue;
break;
}
exportCiphers.push(cipher);

2
src/app/vault/vaultShareCipherController.js
View File

@ -112,6 +112,7 @@
var attachmentSharePromises = [];
if ($scope.cipher.attachments) {
for (var i = 0; i < $scope.cipher.attachments.length; i++) {
/* jshint ignore:start */
(function (attachment) {
var promise = cipherService.downloadAndDecryptAttachment(null, attachment, false)
.then(function (decData) {
@ -136,6 +137,7 @@
});
attachmentSharePromises.push(promise);
})($scope.cipher.attachments[i]);
/* jshint ignore:end */
}
}

7
src/app/vault/vaultSharedController.js
View File

@ -142,10 +142,11 @@
});
editModel.result.then(function (returnVal) {
var rootCipher = findRootCipher(cipher) || { meta: {} };
var rootCipher = findRootCipher(cipher) || { meta: {} },
index;
if (returnVal.action === 'edit') {
var index = $scope.ciphers.indexOf(cipher);
index = $scope.ciphers.indexOf(cipher);
if (index > -1) {
returnVal.data.collectionIds = $scope.ciphers[index].collectionIds;
$scope.ciphers[index] = returnVal.data;
@ -163,7 +164,7 @@
cipher.favorite = rootCipher.favorite = returnVal.data.favorite;
}
else if (returnVal.action === 'delete') {
var index = $scope.ciphers.indexOf(cipher);
index = $scope.ciphers.indexOf(cipher);
if (index > -1) {
$scope.ciphers.splice(index, 1);
}