Bladeren bron

Fix incorrect JSON file

The extension of the file modules/UI/side_pannels/chat/smileys.json
suggests that the format of the file is JSON. However, it contains
JavaScript RegExp instances which do not represent valid JSON. Such
discrepancies between file extension and format cause failures in
certain tools such as Webpack. Convert the file (both extension and
format) into a valid ES2015 module.
master
Lyubomir Marinov 9 jaren geleden
bovenliggende
commit
2ff77676e2

+ 1
- 1
modules/UI/side_pannels/chat/Chat.js Bestand weergeven

8
 import UIUtil from '../../util/UIUtil';
8
 import UIUtil from '../../util/UIUtil';
9
 import UIEvents from '../../../../service/UI/UIEvents';
9
 import UIEvents from '../../../../service/UI/UIEvents';
10
 
10
 
11
-var smileys = require("./smileys.json").smileys;
11
+import { smileys } from './smileys';
12
 
12
 
13
 var unreadMessages = 0;
13
 var unreadMessages = 0;
14
 
14
 

+ 5
- 6
modules/UI/side_pannels/chat/Replacement.js Bestand weergeven

1
 /* jshint -W101 */
1
 /* jshint -W101 */
2
-var Smileys = require("./smileys.json");
2
+import { regexes } from './smileys';
3
 
3
 
4
 /**
4
 /**
5
  * Processes links and smileys in "body"
5
  * Processes links and smileys in "body"
29
     replacePattern2 = /(^|[^\/])(www\.[\S]+(\b|$))/gim;
29
     replacePattern2 = /(^|[^\/])(www\.[\S]+(\b|$))/gim;
30
     replacedText = replacedText.replace(replacePattern2, '$1<a href="http://$2" target="_blank">$2</a>');
30
     replacedText = replacedText.replace(replacePattern2, '$1<a href="http://$2" target="_blank">$2</a>');
31
 
31
 
32
-    //Change email addresses to mailto:: links.
32
+    //Change email addresses to mailto: links.
33
     replacePattern3 = /(([a-zA-Z0-9\-\_\.])+@[a-zA-Z\_]+?(\.[a-zA-Z]{2,6})+)/gim;
33
     replacePattern3 = /(([a-zA-Z0-9\-\_\.])+@[a-zA-Z\_]+?(\.[a-zA-Z]{2,6})+)/gim;
34
     replacedText = replacedText.replace(replacePattern3, '<a href="mailto:$1">$1</a>');
34
     replacedText = replacedText.replace(replacePattern3, '<a href="mailto:$1">$1</a>');
35
 
35
 
44
         return body;
44
         return body;
45
     }
45
     }
46
 
46
 
47
-    var regexs = Smileys.regexs;
48
-    for(var smiley in regexs) {
49
-        if(regexs.hasOwnProperty(smiley)) {
50
-            body = body.replace(regexs[smiley],
47
+    for(var smiley in regexes) {
48
+        if(regexes.hasOwnProperty(smiley)) {
49
+            body = body.replace(regexes[smiley],
51
                     '<img class="smiley" src="images/smileys/' + smiley + '.svg">');
50
                     '<img class="smiley" src="images/smileys/' + smiley + '.svg">');
52
         }
51
         }
53
     }
52
     }

+ 47
- 0
modules/UI/side_pannels/chat/smileys.js Bestand weergeven

1
+export const smileys = {
2
+    smiley1: ":)",
3
+    smiley2: ":(",
4
+    smiley3: ":D",
5
+    smiley4: "(y)",
6
+    smiley5: " :P",
7
+    smiley6: "(wave)",
8
+    smiley7: "(blush)",
9
+    smiley8: "(chuckle)",
10
+    smiley9: "(shocked)",
11
+    smiley10: ":*",
12
+    smiley11: "(n)",
13
+    smiley12: "(search)",
14
+    smiley13: " <3",
15
+    smiley14: "(oops)",
16
+    smiley15: "(angry)",
17
+    smiley16: "(angel)",
18
+    smiley17: "(sick)",
19
+    smiley18: ";(",
20
+    smiley19: "(bomb)",
21
+    smiley20: "(clap)",
22
+    smiley21: " ;)"
23
+};
24
+
25
+export const regexes = {
26
+    smiley2: /(:-\(\(|:-\(|:\(\(|:\(|\(sad\))/gi,
27
+    smiley3: /(:-\)\)|:\)\)|\(lol\)|:-D|:D)/gi,
28
+    smiley1: /(:-\)|:\))/gi,
29
+    smiley4: /(\(y\)|\(Y\)|\(ok\))/gi,
30
+    smiley5: /(:-P|:P|:-p|:p)/gi,
31
+    smiley6: /(\(wave\))/gi,
32
+    smiley7: /(\(blush\))/gi,
33
+    smiley8: /(\(chuckle\))/gi,
34
+    smiley9: /(:-0|\(shocked\))/gi,
35
+    smiley10: /(:-\*|:\*|\(kiss\))/gi,
36
+    smiley11: /(\(n\))/gi,
37
+    smiley12: /(\(search\))/g,
38
+    smiley13: /(<3|&lt;3|&amp;lt;3|\(L\)|\(l\)|\(H\)|\(h\))/gi,
39
+    smiley14: /(\(oops\))/gi,
40
+    smiley15: /(\(angry\))/gi,
41
+    smiley16: /(\(angel\))/gi,
42
+    smiley17: /(\(sick\))/gi,
43
+    smiley18: /(;-\(\(|;\(\(|;-\(|;\(|:"\(|:"-\(|:~-\(|:~\(|\(upset\))/gi,
44
+    smiley19: /(\(bomb\))/gi,
45
+    smiley20: /(\(clap\))/gi,
46
+    smiley21: /(;-\)|;\)|;-\)\)|;\)\)|;-D|;D|\(wink\))/gi
47
+};

+ 0
- 48
modules/UI/side_pannels/chat/smileys.json Bestand weergeven

1
-{
2
-    "smileys": {
3
-        "smiley1": ":)",
4
-        "smiley2": ":(",
5
-        "smiley3": ":D",
6
-        "smiley4": "(y)",
7
-        "smiley5": " :P",
8
-        "smiley6": "(wave)",
9
-        "smiley7": "(blush)",
10
-        "smiley8": "(chuckle)",
11
-        "smiley9": "(shocked)",
12
-        "smiley10": ":*",
13
-        "smiley11": "(n)",
14
-        "smiley12": "(search)",
15
-        "smiley13": " <3",
16
-        "smiley14": "(oops)",
17
-        "smiley15": "(angry)",
18
-        "smiley16": "(angel)",
19
-        "smiley17": "(sick)",
20
-        "smiley18": ";(",
21
-        "smiley19": "(bomb)",
22
-        "smiley20": "(clap)",
23
-        "smiley21": " ;)"
24
-    },
25
-    "regexs": {
26
-        "smiley2": /(:-\(\(|:-\(|:\(\(|:\(|\(sad\))/gi,
27
-        "smiley3": /(:-\)\)|:\)\)|\(lol\)|:-D|:D)/gi,
28
-        "smiley1": /(:-\)|:\))/gi,
29
-        "smiley4": /(\(y\)|\(Y\)|\(ok\))/gi,
30
-        "smiley5": /(:-P|:P|:-p|:p)/gi,
31
-        "smiley6": /(\(wave\))/gi,
32
-        "smiley7": /(\(blush\))/gi,
33
-        "smiley8": /(\(chuckle\))/gi,
34
-        "smiley9": /(:-0|\(shocked\))/gi,
35
-        "smiley10": /(:-\*|:\*|\(kiss\))/gi,
36
-        "smiley11": /(\(n\))/gi,
37
-        "smiley12": /(\(search\))/g,
38
-        "smiley13": /(<3|&lt;3|&amp;lt;3|\(L\)|\(l\)|\(H\)|\(h\))/gi,
39
-        "smiley14": /(\(oops\))/gi,
40
-        "smiley15": /(\(angry\))/gi,
41
-        "smiley16": /(\(angel\))/gi,
42
-        "smiley17": /(\(sick\))/gi,
43
-        "smiley18": /(;-\(\(|;\(\(|;-\(|;\(|:"\(|:"-\(|:~-\(|:~\(|\(upset\))/gi,
44
-        "smiley19": /(\(bomb\))/gi,
45
-        "smiley20": /(\(clap\))/gi,
46
-        "smiley21": /(;-\)|;\)|;-\)\)|;\)\)|;-D|;D|\(wink\))/gi
47
-    }
48
-}

Laden…
Annuleren
Opslaan