Skip to content
Snippets Groups Projects
Commit abe8b199 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

promise chain fixed (when rejected/exception occured)

parent 45a0273b
No related branches found
No related tags found
1 merge request!11Resolve "Rest API should follow google guidlines"
This commit is part of merge request !11. Comments created here will be created in the context of that merge request.
...@@ -166,52 +166,50 @@ Functions.isDomElement = function(o) { ...@@ -166,52 +166,50 @@ Functions.isDomElement = function(o) {
Functions.overlayToColor = function(elementOverlay) { Functions.overlayToColor = function(elementOverlay) {
var self = this; var self = this;
return new Promise(function(resolve, reject) { /* jslint bitwise: true */
/* jslint bitwise: true */ if (elementOverlay === null || elementOverlay === undefined) {
if (elementOverlay === null || elementOverlay === undefined) { return Promise.reject("elementOverlay cannot be null!");
reject("elementOverlay cannot be null!"); } else if (elementOverlay.color !== undefined && elementOverlay.color !== null) {
} else if (elementOverlay.color !== undefined && elementOverlay.color !== null) { return Promise.resolve(self.intToColorString(elementOverlay.color.value));
resolve(self.intToColorString(elementOverlay.color.value)); } else if (elementOverlay.value !== undefined && elementOverlay.value !== null) {
} else if (elementOverlay.value !== undefined && elementOverlay.value !== null) { var ratio = 0;
var ratio = 0; var promiseColor = null;
var promiseColor = null; if (elementOverlay.value < 0) {
if (elementOverlay.value < 0) { ratio = -elementOverlay.value;
ratio = -elementOverlay.value; promiseColor = ServerConnector.getMinOverlayColorInt();
promiseColor = ServerConnector.getMinOverlayColorInt(); } else {
} else { ratio = elementOverlay.value;
ratio = elementOverlay.value; promiseColor = ServerConnector.getMaxOverlayColorInt();
promiseColor = ServerConnector.getMaxOverlayColorInt(); }
} return promiseColor.then(function(color) {
return promiseColor.then(function(color) {
ratio = 1 - ratio; ratio = 1 - ratio;
var MAX_RED = 0xFF0000; var MAX_RED = 0xFF0000;
var MAX_GREEN = 0x00FF00; var MAX_GREEN = 0x00FF00;
var MAX_BLUE = 0x0000FF; var MAX_BLUE = 0x0000FF;
var red = color & MAX_RED; var red = color & MAX_RED;
red = red + (MAX_RED - red) * ratio; red = red + (MAX_RED - red) * ratio;
red = parseInt(red); red = parseInt(red);
red = red & 0xFF0000; red = red & 0xFF0000;
var green = color & MAX_GREEN; var green = color & MAX_GREEN;
green = green + (MAX_GREEN - green) * ratio; green = green + (MAX_GREEN - green) * ratio;
green = parseInt(green); green = parseInt(green);
green = green & MAX_GREEN; green = green & MAX_GREEN;
var blue = color & MAX_BLUE; var blue = color & MAX_BLUE;
blue = blue + (MAX_BLUE - blue) * ratio; blue = blue + (MAX_BLUE - blue) * ratio;
blue = parseInt(blue); blue = parseInt(blue);
blue = blue & MAX_BLUE; blue = blue & MAX_BLUE;
color = red | green | blue; color = red | green | blue;
resolve(self.intToColorString(color)); return self.intToColorString(color);
}); });
} else { } else {
reject("elementOverlay doesn't have neither color nor value set!"); return Promise.reject("elementOverlay doesn't have neither color nor value set!");
} }
});
}; };
Functions.getElementByName = function(element, name) { Functions.getElementByName = function(element, name) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment