Skip to content

Commit cfdb8bd

Browse files
committed
Merge branch 'truncate-text' into trunk
Signed-off-by: Hrishikesh Patil <[email protected]>
2 parents 0a3ead6 + f4aa26d commit cfdb8bd

File tree

4 files changed

+36
-23
lines changed

4 files changed

+36
-23
lines changed

CHANGELOG

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
v2.2.1
22

3+
Add a CSS class to truncate long file names
4+
Update UIKit from 3.5.6 to 3.5.7
5+
Update devDependencies
6+
7+
v2.2.1
8+
39
Fix few CodeClimate issues
410
Publish package from GitLab CI instead of PC
511
Update devDependencies
@@ -45,4 +51,4 @@ Add files to module
4551

4652
v1.0.0
4753

48-
Creation of empty module
54+
Creation of empty module

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "broadcastem-core",
3-
"version": "2.2.1",
3+
"version": "2.2.2",
44
"description": "The core module for Broadcast 'em application",
55
"keywords": [
66
"broadcast",
@@ -28,15 +28,15 @@
2828
"express-easy-zip": "^1.1.5",
2929
"morgan": "^1.10.0",
3030
"multer": "^1.4.2",
31-
"uikit": "^3.5.6",
31+
"uikit": "^3.5.7",
3232
"yargs": "^15.4.1"
3333
},
3434
"devDependencies": {
3535
"chai": "^4.2.0",
3636
"chai-http": "^4.3.0",
3737
"dev-null": "^0.1.1",
3838
"husky": "^4.2.5",
39-
"mocha": "^8.1.2",
39+
"mocha": "^8.1.3",
4040
"mocha-junit-reporter": "^2.0.0",
4141
"prettier": "^2.1.1"
4242
}

public/script/root.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function buttonMaker(file) {
6565
<span uk-icon="icon: ${
6666
file.isFolder ? 'folder' : getIcon(file.name)
6767
}; ratio: 2"></span>
68-
<div class="uk-width-expand" style="padding: 5px">Name: ${
68+
<div class="uk-width-expand uk-text-truncate" style="padding: 5px">Name: ${
6969
file.name
7070
} <br>Size: ${humanFileSize(file.size)}</div>
7171
<div>

yarn.lock

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
integrity sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==
4040

4141
"@types/node@*":
42-
version "14.0.27"
43-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
44-
integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
42+
version "14.6.4"
43+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.4.tgz#a145cc0bb14ef9c4777361b7bbafa5cf8e3acb5a"
44+
integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
4545

4646
"@types/parse-json@^4.0.0":
4747
version "4.0.0"
@@ -1117,9 +1117,9 @@ [email protected]:
11171117
esprima "^4.0.0"
11181118

11191119
json-parse-even-better-errors@^2.3.0:
1120-
version "2.3.0"
1121-
resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz#371873c5ffa44304a6ba12419bcfa95f404ae081"
1122-
integrity sha512-o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q==
1120+
version "2.3.1"
1121+
resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
1122+
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
11231123

11241124
lazystream@^1.0.0:
11251125
version "1.0.0"
@@ -1156,9 +1156,9 @@ locate-path@^6.0.0:
11561156
p-locate "^5.0.0"
11571157

11581158
lodash@^4.8.0:
1159-
version "4.17.19"
1160-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
1161-
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
1159+
version "4.17.20"
1160+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
1161+
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
11621162

11631163
11641164
version "4.0.0"
@@ -1238,10 +1238,10 @@ mocha-junit-reporter@^2.0.0:
12381238
strip-ansi "^4.0.0"
12391239
xml "^1.0.0"
12401240

1241-
mocha@^8.1.2:
1242-
version "8.1.2"
1243-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.1.2.tgz#d67fad13300e4f5cd48135a935ea566f96caf827"
1244-
integrity sha512-I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw==
1241+
mocha@^8.1.3:
1242+
version "8.1.3"
1243+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.1.3.tgz#5e93f873e35dfdd69617ea75f9c68c2ca61c2ac5"
1244+
integrity sha512-ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw==
12451245
dependencies:
12461246
ansi-colors "4.1.1"
12471247
browser-stdout "1.3.1"
@@ -1784,7 +1784,7 @@ superagent@^3.7.0:
17841784
qs "^6.5.1"
17851785
readable-stream "^2.3.5"
17861786

1787-
[email protected], supports-color@^7.1.0:
1787+
17881788
version "7.1.0"
17891789
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
17901790
integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
@@ -1798,6 +1798,13 @@ supports-color@^5.3.0:
17981798
dependencies:
17991799
has-flag "^3.0.0"
18001800

1801+
supports-color@^7.1.0:
1802+
version "7.2.0"
1803+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
1804+
integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
1805+
dependencies:
1806+
has-flag "^4.0.0"
1807+
18011808
to-regex-range@^5.0.1:
18021809
version "5.0.1"
18031810
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -1828,10 +1835,10 @@ typedarray@^0.0.6:
18281835
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
18291836
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
18301837

1831-
uikit@^3.5.6:
1832-
version "3.5.6"
1833-
resolved "https://registry.yarnpkg.com/uikit/-/uikit-3.5.6.tgz#227599121ff61b53d83708fea4c4513efb3eeb16"
1834-
integrity sha512-nAJ/HzfXvkpKhI43g0zUj0ObRIMnlxpGiFKuwnVY/CnVkOgCu3QfgDuOVBwjEDAlwBBTYinRFg2qiam68DIlqw==
1838+
uikit@^3.5.7:
1839+
version "3.5.7"
1840+
resolved "https://registry.yarnpkg.com/uikit/-/uikit-3.5.7.tgz#2376be4272d086eb52be62cc679e55f266a693f2"
1841+
integrity sha512-X9im58e6c7IsQopy80TXizv3LXeBaUKTa5fseE/F8UV0jryPnU7JYBl2/1QGrX5IN9hbOb6UJB4o2wdElGJoxg==
18351842

18361843
[email protected], unpipe@~1.0.0:
18371844
version "1.0.0"

0 commit comments

Comments
 (0)