@magic-xpa/angular 4.801.0-dev481.313 → 4.801.0-dev481.317
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/src/services/magic-color.service.mjs +14 -4
- package/fesm2015/magic-xpa-angular.mjs +13 -3
- package/fesm2015/magic-xpa-angular.mjs.map +1 -1
- package/fesm2020/magic-xpa-angular.mjs +13 -3
- package/fesm2020/magic-xpa-angular.mjs.map +1 -1
- package/package.json +3 -3
- package/src/services/magic-color.service.d.ts +1 -0
|
@@ -12,6 +12,7 @@ export class MagicColorService {
|
|
|
12
12
|
constructor(http, colorFile1 = 'clr_rnt.eng') {
|
|
13
13
|
this.http = http;
|
|
14
14
|
this.colorFileName = 'clr_rnt.eng';
|
|
15
|
+
this.fileNotFound = false;
|
|
15
16
|
if (colorFile1)
|
|
16
17
|
this.colorFileName = colorFile1;
|
|
17
18
|
else
|
|
@@ -24,10 +25,13 @@ export class MagicColorService {
|
|
|
24
25
|
if (!this.colorsData) {
|
|
25
26
|
this.http.get(this.getColorFilePath(), { responseType: 'text' }).subscribe(resp => {
|
|
26
27
|
this.colorsData = resp.replace(/\n/g, '@').split('@');
|
|
28
|
+
}, error1 => {
|
|
29
|
+
console.error('File not found ' + this.colorFileName);
|
|
30
|
+
this.fileNotFound = true;
|
|
27
31
|
});
|
|
28
32
|
}
|
|
29
33
|
}
|
|
30
|
-
hexToRgba(hex) {
|
|
34
|
+
hexToRgba(hex, isTransperent) {
|
|
31
35
|
let shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])([a-f\d])$/i;
|
|
32
36
|
hex = hex.replace(shorthandRegex, function (m, r, g, b, a) {
|
|
33
37
|
return a + a + r + r + g + g + b + b;
|
|
@@ -39,16 +43,22 @@ export class MagicColorService {
|
|
|
39
43
|
'blue': parseInt(result[2], 16),
|
|
40
44
|
'alpha': (255 - parseInt(result[1], 16)) / 255
|
|
41
45
|
};
|
|
46
|
+
if (isTransperent)
|
|
47
|
+
rgb.alpha = 0;
|
|
42
48
|
return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';
|
|
43
49
|
}
|
|
44
50
|
getColor(colorIndex, colorType) {
|
|
45
|
-
|
|
51
|
+
let isTransperent = false;
|
|
52
|
+
if (!this.colorsData && !this.fileNotFound)
|
|
46
53
|
this.getColorData();
|
|
47
54
|
if (this.colorsData) {
|
|
48
55
|
if (this.colorsData[colorIndex - 1]) {
|
|
49
56
|
let hex = '';
|
|
50
57
|
const grayHashCode = '00808080';
|
|
51
58
|
let color = this.colorsData[colorIndex - 1].split(',');
|
|
59
|
+
if (+color[3] || 1 == +color[3]) {
|
|
60
|
+
isTransperent = true;
|
|
61
|
+
}
|
|
52
62
|
if (+color[3] <= 1) {
|
|
53
63
|
switch (colorType) {
|
|
54
64
|
case MAGIC_FG_COLOR:
|
|
@@ -64,7 +74,7 @@ export class MagicColorService {
|
|
|
64
74
|
}
|
|
65
75
|
else
|
|
66
76
|
hex = grayHashCode;
|
|
67
|
-
return this.hexToRgba('#' + hex);
|
|
77
|
+
return this.hexToRgba('#' + hex, isTransperent);
|
|
68
78
|
}
|
|
69
79
|
else
|
|
70
80
|
console.log('Could not get color for number ' + colorIndex);
|
|
@@ -83,4 +93,4 @@ MagicColorService.ɵprov = i0.ɵɵdefineInjectable({ token: MagicColorService, f
|
|
|
83
93
|
type: Inject,
|
|
84
94
|
args: [COLOR_FILE_NAME]
|
|
85
95
|
}] }]; }, null); })();
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"magic-color.service.js","sourceRoot":"","sources":["../../../../../../projects/angular/src/services/magic-color.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, InjectionToken } from '@angular/core';\nimport { HttpClient } from '@angular/common/http';\n\n\nexport let COLOR_FILE_NAME = new InjectionToken<string>('colorFile', {\n  providedIn: 'root',\n  factory: () => 'clr_rnt.eng'\n});\nexport const MAGIC_FG_COLOR: number = 1;\nexport const MAGIC_BG_COLOR: number = 2;\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class MagicColorService {\n  public colorFileName = 'clr_rnt.eng';\n\n  public getColorFilePath() {\n    return 'assets/' + this.colorFileName;\n  }\n\n  private colorsData;\n  private fileNotFound = false;\n\n  // public static FILE_NAME;\n  constructor(private http: HttpClient, @Inject(COLOR_FILE_NAME) colorFile1: string = 'clr_rnt.eng') {\n    if (colorFile1)\n      this.colorFileName = colorFile1;\n    else\n      this.colorFileName = 'clr_rnt.eng';\n  }\n\n  private getColorData() {\n\n    if (!this.colorsData) {\n      this.http.get(this.getColorFilePath(), { responseType: 'text' }).subscribe(resp => {\n          this.colorsData = resp.replace(/\\n/g, '@').split('@');\n        },\n        error1 => {\n          console.error('File not found ' + this.colorFileName);\n          this.fileNotFound = true;\n        });\n\n    }\n\n  }\n\n  private hexToRgba(hex: any , isTransperent: boolean): any {\n    let shorthandRegex = /^#?([a-f\\d])([a-f\\d])([a-f\\d])([a-f\\d])$/i;\n    // convert it to format : aarrggbb\n    hex = hex.replace(shorthandRegex, function(m: any, r: any, g: any, b: any, a: any) {\n      return a + a + r + r + g + g + b + b;\n    });\n\n    let result = /^#?([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})$/i.exec(hex);\n\n    let rgb = {\n      'red': parseInt(result![4], 16),\n      'green': parseInt(result![3], 16),\n      'blue': parseInt(result![2], 16),\n      'alpha': (255 - parseInt(result![1], 16)) / 255\n    };\n    if(isTransperent)\n      rgb.alpha = 0;\n\n    return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';\n  }\n\n  /**\n   * Returns the rgba value of specified color\n   * @returns : value in format rgba(128,128,128,1)\n   * @param : colorNumber -0 based index of color for which RGBA values are returned\n   * @param: colorType : 1-MAGIC_FG_COLOR, 2-MAGIC_BG_COLOR\n   */\n  public getColor(colorIndex: number, colorType: number) {\n    let isTransperent = false;\n    if (!this.colorsData && !this.fileNotFound)\n      this.getColorData();\n    if (this.colorsData) { // color exists\n      if (this.colorsData[colorIndex - 1]) {\n        let hex = '';\n        const grayHashCode = '00808080';\n        let color: string[] = this.colorsData[colorIndex - 1].split(','); // get the color details\n        if(+color[3] || 1 == +color[3])\n        {\n          isTransperent = true;\n        }\n\n        // color[0] - name, color[1] - FG color, color[2] - BG color\n        // color[3] - attr flags (1 - transperent, 2 - system FG, 4 - system bg)\n        if (+color[3] <= 1) { // for non-system color or transperent color\n\n          switch (colorType) {\n            case MAGIC_FG_COLOR:\n              hex = (color[1]);\n              break;\n            case MAGIC_BG_COLOR:\n              hex = (color[2]);\n              break;\n            default:\n              console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);\n              return '';\n          }\n        } else\n          hex = grayHashCode;\n\n        return this.hexToRgba('#' + hex, isTransperent);\n      } else\n        console.log('Could not get color for number ' + colorIndex);\n    }\n    // console.log('Could not get color for number ' + colorIndex);\n    return '';\n  }\n}\n"]}
|
|
@@ -2309,6 +2309,7 @@ class MagicColorService {
|
|
|
2309
2309
|
constructor(http, colorFile1 = 'clr_rnt.eng') {
|
|
2310
2310
|
this.http = http;
|
|
2311
2311
|
this.colorFileName = 'clr_rnt.eng';
|
|
2312
|
+
this.fileNotFound = false;
|
|
2312
2313
|
if (colorFile1)
|
|
2313
2314
|
this.colorFileName = colorFile1;
|
|
2314
2315
|
else
|
|
@@ -2321,10 +2322,13 @@ class MagicColorService {
|
|
|
2321
2322
|
if (!this.colorsData) {
|
|
2322
2323
|
this.http.get(this.getColorFilePath(), { responseType: 'text' }).subscribe(resp => {
|
|
2323
2324
|
this.colorsData = resp.replace(/\n/g, '@').split('@');
|
|
2325
|
+
}, error1 => {
|
|
2326
|
+
console.error('File not found ' + this.colorFileName);
|
|
2327
|
+
this.fileNotFound = true;
|
|
2324
2328
|
});
|
|
2325
2329
|
}
|
|
2326
2330
|
}
|
|
2327
|
-
hexToRgba(hex) {
|
|
2331
|
+
hexToRgba(hex, isTransperent) {
|
|
2328
2332
|
let shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])([a-f\d])$/i;
|
|
2329
2333
|
hex = hex.replace(shorthandRegex, function (m, r, g, b, a) {
|
|
2330
2334
|
return a + a + r + r + g + g + b + b;
|
|
@@ -2336,16 +2340,22 @@ class MagicColorService {
|
|
|
2336
2340
|
'blue': parseInt(result[2], 16),
|
|
2337
2341
|
'alpha': (255 - parseInt(result[1], 16)) / 255
|
|
2338
2342
|
};
|
|
2343
|
+
if (isTransperent)
|
|
2344
|
+
rgb.alpha = 0;
|
|
2339
2345
|
return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';
|
|
2340
2346
|
}
|
|
2341
2347
|
getColor(colorIndex, colorType) {
|
|
2342
|
-
|
|
2348
|
+
let isTransperent = false;
|
|
2349
|
+
if (!this.colorsData && !this.fileNotFound)
|
|
2343
2350
|
this.getColorData();
|
|
2344
2351
|
if (this.colorsData) {
|
|
2345
2352
|
if (this.colorsData[colorIndex - 1]) {
|
|
2346
2353
|
let hex = '';
|
|
2347
2354
|
const grayHashCode = '00808080';
|
|
2348
2355
|
let color = this.colorsData[colorIndex - 1].split(',');
|
|
2356
|
+
if (+color[3] || 1 == +color[3]) {
|
|
2357
|
+
isTransperent = true;
|
|
2358
|
+
}
|
|
2349
2359
|
if (+color[3] <= 1) {
|
|
2350
2360
|
switch (colorType) {
|
|
2351
2361
|
case MAGIC_FG_COLOR:
|
|
@@ -2361,7 +2371,7 @@ class MagicColorService {
|
|
|
2361
2371
|
}
|
|
2362
2372
|
else
|
|
2363
2373
|
hex = grayHashCode;
|
|
2364
|
-
return this.hexToRgba('#' + hex);
|
|
2374
|
+
return this.hexToRgba('#' + hex, isTransperent);
|
|
2365
2375
|
}
|
|
2366
2376
|
else
|
|
2367
2377
|
console.log('Could not get color for number ' + colorIndex);
|