ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

JS: Fix scrutinizer warnings and indentation for filters

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-10-04 15:32:02 +02:00
committed by Julius Härtl
parent 516e396a58
commit 9014ae1490
4 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/controller/AppController.js
View File

@@ -20,6 +20,7 @@
* *
*/ */
/** global: OC */
app.controller('AppController', function ($scope, $location, $http, $route, $log, $rootScope, $stateParams) { app.controller('AppController', function ($scope, $location, $http, $route, $log, $rootScope, $stateParams) {
$rootScope.sidebar = { $rootScope.sidebar = {
show: false show: false

1
js/controller/BoardController.js
View File

@@ -20,6 +20,7 @@
* *
*/ */
/** global: oc_defaults */
app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter) { app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter) {
$scope.sidebar = $rootScope.sidebar; $scope.sidebar = $rootScope.sidebar;

23
js/filters/iconWhiteFilter.js
View File

@@ -30,7 +30,9 @@ app.filter('iconWhiteFilter', function() {
g: parseInt(result[2], 16), g: parseInt(result[2], 16),
b: parseInt(result[3], 16) b: parseInt(result[3], 16)
} : null; } : null;
if(result !== null) { if (result === null) {
return "";
}
var r = color.r / 255; var r = color.r / 255;
var g = color.g / 255; var g = color.g / 255;
var b = color.b / 255; var b = color.b / 255;
@@ -43,23 +45,22 @@ app.filter('iconWhiteFilter', function() {
var d = max - min; var d = max - min;
s = l > 0.5 ? d / (2 - max - min) : d / (max + min); s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
switch (max) { switch (max) {
case r: h = (g - b) / d + (g < b ? 6 : 0); break; case r:
case g: h = (b - r) / d + 2; break; h = (g - b) / d + (g < b ? 6 : 0);
case b: h = (r - g) / d + 4; break; break;
case g:
h = (b - r) / d + 2;
break;
case b:
h = (r - g) / d + 4;
break;
} }
h /= 6; h /= 6;
} }
// TODO: Maybe just darken/lighten the color
if (l < 0.5) { if (l < 0.5) {
return "-white"; return "-white";
} else { } else {
return ""; return "";
} }
//var rgba = "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
//return rgba;
} else {
return "";
}
} }
}); });

12
js/filters/textColorFilter.js
View File

@@ -43,9 +43,15 @@ app.filter('textColorFilter', function() {
var d = max - min; var d = max - min;
s = l > 0.5 ? d / (2 - max - min) : d / (max + min); s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
switch (max) { switch (max) {
case r: h = (g - b) / d + (g < b ? 6 : 0); break; case r:
case g: h = (b - r) / d + 2; break; h = (g - b) / d + (g < b ? 6 : 0);
case b: h = (r - g) / d + 4; break; break;
case g:
h = (b - r) / d + 2;
break;
case b:
h = (r - g) / d + 4;
break;
} }
h /= 6; h /= 6;
} }