From 0b813d6a50ff22552d58915cb1b6538cabe0e899 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 11 Aug 2017 17:50:27 +0200
Subject: [PATCH] user color functions refactored
common implementation is used when color for user is not defined and
system value must be used
---
frontend-js/src/main/js/ServerConnector.js | 49 ++++++-------------
.../main/js/gui/admin/EditProjectDialog.js | 2 +-
2 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index e965871d68..4e0172311e 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -59,14 +59,17 @@ ServerConnector.registerListenerType("onDataLoadStop");
ServerConnector.init();
ServerConnector.getMinOverlayColorInt = function () {
var self = this;
- var userColor;
- return self.getLoggedUser().then(function (user) {
- userColor = user.getMinColor();
- return self.getConfigurationParam(ConfigurationType.MIN_COLOR_VAL);
- }).then(function (systemMinColor) {
+ return self.getLoggedUser().then(function(user) {
+ var userColor = user.getMinColor();
+ return self.returnUserOrSystemColor(userColor, self.getConfigurationParam(ConfigurationType.MIN_COLOR_VAL));
+ });
+};
+
+ServerConnector.returnUserOrSystemColor = function(userColor, systemPromisedColor) {
+ return systemPromisedColor.then(function(systemColor) {
var color = userColor;
if (userColor === null || userColor === undefined || userColor === "") {
- color = systemMinColor;
+ color = systemColor;
}
color = parseInt(color, 16);
/* jslint bitwise: true */
@@ -77,37 +80,17 @@ ServerConnector.getMinOverlayColorInt = function () {
ServerConnector.getSimpleOverlayColorInt = function () {
var self = this;
- var userColor;
- return self.getLoggedUser().then(function (user) {
- userColor = user.getSimpleColor();
- return self.getConfigurationParam(ConfigurationType.SIMPLE_COLOR_VAL);
- }).then(function (systemSimpleColor) {
- var color = userColor;
- if (userColor === null || userColor === undefined || userColor === "") {
- color = systemSimpleColor;
- }
- color = parseInt(color, 16);
- /* jslint bitwise: true */
- color = (color & 0xFFFFFF);
- return color;
+ return self.getLoggedUser().then(function(user) {
+ var userColor = user.getSimpleColor();
+ return self.returnUserOrSystemColor(userColor, self.getConfigurationParam(ConfigurationType.SIMPLE_COLOR_VAL));
});
};
-ServerConnector.getMaxOverlayColorInt = function () {
+ServerConnector.getMaxOverlayColorInt = function() {
var self = this;
- var userColor;
- return self.getLoggedUser().then(function (user) {
- userColor = user.getMaxColor();
- return self.getConfigurationParam(ConfigurationType.MAX_COLOR_VAL);
- }).then(function (systemMaxColor) {
- var color = userColor;
- if (userColor === null || userColor === undefined || userColor === "") {
- color = systemMaxColor;
- }
- color = parseInt(color, 16);
- /* jslint bitwise: true */
- color = (color & 0xFFFFFF);
- return color;
+ return self.getLoggedUser().then(function(user) {
+ var userColor = user.getMaxColor();
+ return self.returnUserOrSystemColor(userColor, self.getConfigurationParam(ConfigurationType.MAX_COLOR_VAL));
});
};
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index 1c70a7d3bd..2e000de1e9 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -5,7 +5,7 @@
var AbstractGuiElement = require('../AbstractGuiElement');
var GuiConnector = require('../../GuiConnector');
-var Functions = require('../../functions');
+var Functions = require('../../Functions');
var logger = require('../../logger');
var guiUtils = new (require('../leftPanel/GuiUtils'))();
--
GitLab