@magic-xpa/angular 4.801.0-dev481.311 → 4.801.0-dev481.317

package/fesm2020/magic-xpa-angular.mjs

@@ -2243,6 +2243,7 @@ class MagicColorService {
     constructor(http, colorFile1 = 'clr_rnt.eng') {
         this.http = http;
         this.colorFileName = 'clr_rnt.eng';
+        this.fileNotFound = false;
         if (colorFile1)
             this.colorFileName = colorFile1;
         else
@@ -2255,10 +2256,13 @@ class MagicColorService {
         if (!this.colorsData) {
             this.http.get(this.getColorFilePath(), { responseType: 'text' }).subscribe(resp => {
                 this.colorsData = resp.replace(/\n/g, '@').split('@');
+            }, error1 => {
+                console.error('File not found ' + this.colorFileName);
+                this.fileNotFound = true;
             });
         }
     }
-    hexToRgba(hex) {
+    hexToRgba(hex, isTransperent) {
         let shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])([a-f\d])$/i;
         hex = hex.replace(shorthandRegex, function (m, r, g, b, a) {
             return a + a + r + r + g + g + b + b;
@@ -2270,33 +2274,42 @@ class MagicColorService {
             'blue': parseInt(result[2], 16),
             'alpha': (255 - parseInt(result[1], 16)) / 255
         };
+        if (isTransperent)
+            rgb.alpha = 0;
         return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';
     }
     getColor(colorIndex, colorType) {
-        if (!this.colorsData)
+        let isTransperent = false;
+        if (!this.colorsData && !this.fileNotFound)
             this.getColorData();
-        if (this.colorsData && this.colorsData[colorIndex - 1]) {
-            let hex = '';
-            const grayHashCode = '00808080';
-            let color = this.colorsData[colorIndex].split(',');
-            if (+color[3] <= 1) {
-                switch (colorType) {
-                    case MAGIC_FG_COLOR:
-                        hex = (color[1]);
-                        break;
-                    case MAGIC_BG_COLOR:
-                        hex = (color[2]);
-                        break;
-                    default:
-                        console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
-                        return '';
+        if (this.colorsData) {
+            if (this.colorsData[colorIndex - 1]) {
+                let hex = '';
+                const grayHashCode = '00808080';
+                let color = this.colorsData[colorIndex - 1].split(',');
+                if (+color[3] || 1 == +color[3]) {
+                    isTransperent = true;
                 }
+                if (+color[3] <= 1) {
+                    switch (colorType) {
+                        case MAGIC_FG_COLOR:
+                            hex = (color[1]);
+                            break;
+                        case MAGIC_BG_COLOR:
+                            hex = (color[2]);
+                            break;
+                        default:
+                            console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
+                            return '';
+                    }
+                }
+                else
+                    hex = grayHashCode;
+                return this.hexToRgba('#' + hex, isTransperent);
             }
             else
-                hex = grayHashCode;
-            return this.hexToRgba('#' + hex);
+                console.log('Could not get color for number ' + colorIndex);
         }
-        console.log('Could not get color for number ' + colorIndex);
         return '';
     }
 }