From 252c811dae454760cc4b1e7db50250ab8c5b5e50 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 14 Jun 2017 11:10:09 +0200 Subject: [PATCH] Uses computer_mouse as base name --- .../javascripts/discourse/lib/emoji/groups.js.es6 | 1 - lib/emoji/db.json | 5 +++-- lib/tasks/emoji.rake | 3 +-- public/images/emoji/apple/mouse_three_button.png | Bin 0 -> 734 bytes public/images/emoji/apple/three_button_mouse.png | Bin 0 -> 734 bytes .../images/emoji/emoji_one/mouse_three_button.png | Bin 0 -> 983 bytes .../images/emoji/emoji_one/three_button_mouse.png | Bin 0 -> 983 bytes public/images/emoji/google/mouse_three_button.png | Bin 0 -> 917 bytes public/images/emoji/google/three_button_mouse.png | Bin 0 -> 917 bytes .../images/emoji/twitter/mouse_three_button.png | Bin 0 -> 544 bytes .../images/emoji/twitter/three_button_mouse.png | Bin 0 -> 544 bytes public/images/emoji/win10/mouse_three_button.png | Bin 0 -> 615 bytes public/images/emoji/win10/three_button_mouse.png | Bin 0 -> 615 bytes 13 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 public/images/emoji/apple/mouse_three_button.png create mode 100644 public/images/emoji/apple/three_button_mouse.png create mode 100644 public/images/emoji/emoji_one/mouse_three_button.png create mode 100644 public/images/emoji/emoji_one/three_button_mouse.png create mode 100644 public/images/emoji/google/mouse_three_button.png create mode 100644 public/images/emoji/google/three_button_mouse.png create mode 100644 public/images/emoji/twitter/mouse_three_button.png create mode 100644 public/images/emoji/twitter/three_button_mouse.png create mode 100644 public/images/emoji/win10/mouse_three_button.png create mode 100644 public/images/emoji/win10/three_button_mouse.png diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 index 627513d1cf6..d343ef6723c 100644 --- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 @@ -1466,7 +1466,6 @@ const groups = [ "studio_microphone", "medal_military", "computer_mouse", - "mouse_three_button", "newspaper_roll", "spiral_notepad", "oil_drum", diff --git a/lib/emoji/db.json b/lib/emoji/db.json index d5619dc4964..adbf45fed8d 100644 --- a/lib/emoji/db.json +++ b/lib/emoji/db.json @@ -6344,8 +6344,9 @@ "artificial_satellite": [ "satellite_orbital" ], - "three_button_mouse": [ - "mouse_three_button" + "computer_mouse": [ + "mouse_three_button", + "three_button_mouse" ], "hocho": [ "knife" diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake index 104c096b31c..7bb4038f211 100644 --- a/lib/tasks/emoji.rake +++ b/lib/tasks/emoji.rake @@ -173,7 +173,7 @@ EMOJI_ALIASES ||= { "honeybee" => [ "bee" ], "lion" => [ "lion_face" ], "artificial_satellite" => [ "satellite_orbital" ], - "three_button_mouse" => [ "mouse_three_button" ], + "computer_mouse" => [ "mouse_three_button", "three_button_mouse" ], "hocho" => [ "knife" ], "swimming_man" => [ "swimmer" ], "wind_face" => [ "wind_blowing_face" ], @@ -1677,7 +1677,6 @@ EMOJI_GROUPS ||= [ "studio_microphone", "medal_military", "computer_mouse", - "mouse_three_button", "newspaper_roll", "spiral_notepad", "oil_drum", diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png new file mode 100644 index 0000000000000000000000000000000000000000..3899171edc6b3907926b368cbc2811a3ad1f6fe8 GIT binary patch literal 734 zcmV<40wMj0P)h0m==T!CQHk7;!MVegTY`t>9i+%(aS5$&EAubZRT_D z4vbdDT3zHjEj`G+CnWeU5aK2avVK)-f$88&ZX-gNoc#K=wZL%7l+Wc8f(8m!StLWkh7x zqKr}hMfAP|G>?qINGNSG<}^iJ8t0aaLgP5H7QikSKwFbT0?I4i54mb1s;2_U8U!8Ow$mHvIJf0-vFIzvELqy5M QEC2ui07*qoM6N<$g2N?UEC2ui literal 0 HcmV?d00001 diff --git a/public/images/emoji/apple/three_button_mouse.png b/public/images/emoji/apple/three_button_mouse.png new file mode 100644 index 0000000000000000000000000000000000000000..3899171edc6b3907926b368cbc2811a3ad1f6fe8 GIT binary patch literal 734 zcmV<40wMj0P)h0m==T!CQHk7;!MVegTY`t>9i+%(aS5$&EAubZRT_D z4vbdDT3zHjEj`G+CnWeU5aK2avVK)-f$88&ZX-gNoc#K=wZL%7l+Wc8f(8m!StLWkh7x zqKr}hMfAP|G>?qINGNSG<}^iJ8t0aaLgP5H7QikSKwFbT0?I4i54mb1s;2_U8U!8Ow$mHvIJf0-vFIzvELqy5M QEC2ui07*qoM6N<$g2N?UEC2ui literal 0 HcmV?d00001 diff --git a/public/images/emoji/emoji_one/mouse_three_button.png b/public/images/emoji/emoji_one/mouse_three_button.png new file mode 100644 index 0000000000000000000000000000000000000000..0e9dfa8326aabf4552d1ce456c20f8c05961966a GIT binary patch literal 983 zcmV;|11S87P) z*2mA+o2syGf{B@^uFu%rzr@hX)Y@)=iNws*o2sy?x4omWwzk5^+u`Pin4Ukm#6JK4 z02g#pPE!DmR3`{m=oB{T!;SaZIL4%?bhDdq^8Jp2c>n+d2}wjjRCr$P*V~fXFboFZ z92|lPIS|;&ha|M`|B_8?gVxA6?shuUi`C6u?C{MmSvVp4U+TNcqG`tNFOhn@N&u;a z5PT@V&NLECIjb$c=yc9OihqG(BMi$XAtl!8>onk)Urv|&c)JxXfSi2^wovDkP}ND9 z`ZYOWlSrsxx0zf$oY^=|BB5FqceXgEs?KiH3;;2SM>pZ3)S=qMALyXuwbz%COx5Zf zjd+s~lk_~z=kxna2c@jTS^y$>j5)mSeV~gK8zhJ%=V{RZG9q0bfjR_;B&O;9T!V0T z?4SK-;Yv|N^4MdvJ36H4=KvxYYEfSrG4d+ zkX$9QKUDIYV@jP?s218^!$h3#gk>s)<8=p7BA=w+U6c~vd zSXv}^v$YsW;DF*Ky(#5(0lH@-nKGcCk4WR^-cB}>cr+&W6jOFe+&j0UoszaEcHeVc z*+?aMAPu&;d4U87BMtNs$u~()dKW@Tdc9R{N}Uh_mKl;D?2UO-sy1m{B@C1#X?vUC z!5x?#6URWQy*2(l`C-Vu6govh$iGbLHBxP)LZFnm0PV{~c`*>EKm$rAhA7puCq{mm`GS9 z-;wm_02=AQJbH+>C&>=^4>>PX8wo`n{~_mB!QX_Eg$I!JW`r-=P^i8n0C^Q8RbKfE z)zUchw@I+N=E|Q+(`7qVSJg4{->z7zW7&SO?BCRP{RTX?{f03~)pY;>002ovPDHLk FV1hzK(d7UD literal 0 HcmV?d00001 diff --git a/public/images/emoji/emoji_one/three_button_mouse.png b/public/images/emoji/emoji_one/three_button_mouse.png new file mode 100644 index 0000000000000000000000000000000000000000..0e9dfa8326aabf4552d1ce456c20f8c05961966a GIT binary patch literal 983 zcmV;|11S87P) z*2mA+o2syGf{B@^uFu%rzr@hX)Y@)=iNws*o2sy?x4omWwzk5^+u`Pin4Ukm#6JK4 z02g#pPE!DmR3`{m=oB{T!;SaZIL4%?bhDdq^8Jp2c>n+d2}wjjRCr$P*V~fXFboFZ z92|lPIS|;&ha|M`|B_8?gVxA6?shuUi`C6u?C{MmSvVp4U+TNcqG`tNFOhn@N&u;a z5PT@V&NLECIjb$c=yc9OihqG(BMi$XAtl!8>onk)Urv|&c)JxXfSi2^wovDkP}ND9 z`ZYOWlSrsxx0zf$oY^=|BB5FqceXgEs?KiH3;;2SM>pZ3)S=qMALyXuwbz%COx5Zf zjd+s~lk_~z=kxna2c@jTS^y$>j5)mSeV~gK8zhJ%=V{RZG9q0bfjR_;B&O;9T!V0T z?4SK-;Yv|N^4MdvJ36H4=KvxYYEfSrG4d+ zkX$9QKUDIYV@jP?s218^!$h3#gk>s)<8=p7BA=w+U6c~vd zSXv}^v$YsW;DF*Ky(#5(0lH@-nKGcCk4WR^-cB}>cr+&W6jOFe+&j0UoszaEcHeVc z*+?aMAPu&;d4U87BMtNs$u~()dKW@Tdc9R{N}Uh_mKl;D?2UO-sy1m{B@C1#X?vUC z!5x?#6URWQy*2(l`C-Vu6govh$iGbLHBxP)LZFnm0PV{~c`*>EKm$rAhA7puCq{mm`GS9 z-;wm_02=AQJbH+>C&>=^4>>PX8wo`n{~_mB!QX_Eg$I!JW`r-=P^i8n0C^Q8RbKfE z)zUchw@I+N=E|Q+(`7qVSJg4{->z7zW7&SO?BCRP{RTX?{f03~)pY;>002ovPDHLk FV1hzK(d7UD literal 0 HcmV?d00001 diff --git a/public/images/emoji/google/mouse_three_button.png b/public/images/emoji/google/mouse_three_button.png new file mode 100644 index 0000000000000000000000000000000000000000..606ada2ed4ff45c2a4842c993f7e5783edcc23c2 GIT binary patch literal 917 zcmV;G18V$S+!otbP$=BD{ySuy3&(BIqN^NazLPA1+F7h=1000kkQchC4kIk=KY^@?S{|{15IG0)k^a_ zXry%XVK)@AUl}2OZm>45s85FY0{L^-j!AA17ZS&py zOlnJHs#f^+a-_=klewq^5z4f~-gQLv`2K=5+qN|Y6YmbT=0Sg5Q{U5c>6WPQ{)jts z;j^s)EEYfwGrzFphK|7mGQ*3r z$e^PMGtN9gVmKM|&NAH~*vfJPf+$Oh)cVOfNsfb{ykbfq$VswGxkcoN9_MmVcDwG` z5b{zlqR^VV^CHJV)R1e*L(>>NyW73)eLX22GvC#S+-AhLKFeYzXn^kjP7NShhpMc$6VwUtog$;YCL|{hp%Z zp+hp@Ly*5PzJl6yrC&u4QAYO)M;q=JUUnqfoZ4}aLclQ?6GFEOezfxt0@_Jf;0-pvQWFS90BjlItdCR?QJl5?0p2y+>m3?c^l&M1106R ztrW=cIa1VS5){w>2gxKzav4b)WC`GB3uEI@W0j0X*(L^MMGB;CkwqaeDjE%Oh=El~ zM#=(SMj(ro&?jGHX_kbu@&oxC*A;it4@^=YhcD1MjBnPcbzl7X6K zi77~WQRoy|Y6M9y;+=HKK4UC8B70AIMnUbJ^sr{9tik2}SY#TOy&X{y1@;yo#Asm0b84k$00000NkvXXu0mjf8JN3L literal 0 HcmV?d00001 diff --git a/public/images/emoji/google/three_button_mouse.png b/public/images/emoji/google/three_button_mouse.png new file mode 100644 index 0000000000000000000000000000000000000000..606ada2ed4ff45c2a4842c993f7e5783edcc23c2 GIT binary patch literal 917 zcmV;G18V$S+!otbP$=BD{ySuy3&(BIqN^NazLPA1+F7h=1000kkQchC4kIk=KY^@?S{|{15IG0)k^a_ zXry%XVK)@AUl}2OZm>45s85FY0{L^-j!AA17ZS&py zOlnJHs#f^+a-_=klewq^5z4f~-gQLv`2K=5+qN|Y6YmbT=0Sg5Q{U5c>6WPQ{)jts z;j^s)EEYfwGrzFphK|7mGQ*3r z$e^PMGtN9gVmKM|&NAH~*vfJPf+$Oh)cVOfNsfb{ykbfq$VswGxkcoN9_MmVcDwG` z5b{zlqR^VV^CHJV)R1e*L(>>NyW73)eLX22GvC#S+-AhLKFeYzXn^kjP7NShhpMc$6VwUtog$;YCL|{hp%Z zp+hp@Ly*5PzJl6yrC&u4QAYO)M;q=JUUnqfoZ4}aLclQ?6GFEOezfxt0@_Jf;0-pvQWFS90BjlItdCR?QJl5?0p2y+>m3?c^l&M1106R ztrW=cIa1VS5){w>2gxKzav4b)WC`GB3uEI@W0j0X*(L^MMGB;CkwqaeDjE%Oh=El~ zM#=(SMj(ro&?jGHX_kbu@&oxC*A;it4@^=YhcD1MjBnPcbzl7X6K zi77~WQRoy|Y6M9y;+=HKK4UC8B70AIMnUbJ^sr{9tik2}SY#TOy&X{y1@;yo#Asm0b84k$00000NkvXXu0mjf8JN3L literal 0 HcmV?d00001 diff --git a/public/images/emoji/twitter/mouse_three_button.png b/public/images/emoji/twitter/mouse_three_button.png new file mode 100644 index 0000000000000000000000000000000000000000..3a71c800c689e3e7f9e47f56ca8e4cb737eff101 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~Wq?nJt9yZun}6ucRa=2*#;R>V za@v~BGgfW2a&!ZWY=KAt$)4HEQVT1iQnD-BCur&$i!0P?01e?S3GxeO_^~-qxm)Dp zzua3FPn4YNXJueu?DTYT45^5Fd+F|^W(A&xz<0XLM fOU@qK@O=z2CuS8skWl>wj4cLFS3j3^P6V za@v~BGgfW2a&!ZWY=KAt$)4HEQVT1iQnD-BCur&$i!0P?01e?S3GxeO_^~-qxm)Dp zzua3FPn4YNXJueu?DTYT45^5Fd+F|^W(A&xz<0XLM fOU@qK@O=z2CuS8skWl>wj4cLFS3j3^P6srwF=)ojcs}~aj=Wb$Y3O?31*J_@?z1fr7Y}PFatjhU* zEPJl^S@{o>8a{JhI@P=H_+L?Fk*<#Pe;@Yt|9()N_j3M8=DGK~j_a?wBDwEoROUOb zXA@^@pHa@`y2>-F*XnFfUh4(fAU>lPM}i&gczIU^EjuC1$;Z4{ZjyS$mujoWEV7@b z_D9`0?zB=hNb8{9{ol(u=eewM(0UtC^*nazkvk5@1wQTUe)riRj4kM9kGX8{y|ksd z3*YhC@0gtRrf&O%>1N+!Leg(-zhLp~gllLTA5*)YP|KzXOiR0GEdG}=M|qvgeD(P2 zi%z_?{YfRI}*cPX=nz{Xai zfM2^AHV827UU2TruN5qfYlD)zPB>^P)!T2aV0kRW=5RcI|LrvgB&ISomR7X3JA4e~ zY>=G)L;Dv)lqlQsoQkVX%cAD`RyXJ0a#<3uXBw7})?PhN^Zqk;?%GGYCr!^zxo(iV z>EYs{xxd+NJ$(_k!?K_2^2ynk^*1lFQVtZEY5(fM@-Dw#$GW+vAM<>S*^w$&CvoE0 yD|NRO5z>7O`F|73B}XZ&t;ucLK6U}2n{*_ literal 0 HcmV?d00001 diff --git a/public/images/emoji/win10/three_button_mouse.png b/public/images/emoji/win10/three_button_mouse.png new file mode 100644 index 0000000000000000000000000000000000000000..3e39c0f398b892bd2b1f96b6c53cad795f2ce89d GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI73<7*YT-^(N*x1;BJWNnpT54fo z0TkEP)|Qu-_w)0Mi;L?z@yrw`#90#L7tHWmo&Cka^Nl`lIFy$%FfiWrba4!+hsrwF=)ojcs}~aj=Wb$Y3O?31*J_@?z1fr7Y}PFatjhU* zEPJl^S@{o>8a{JhI@P=H_+L?Fk*<#Pe;@Yt|9()N_j3M8=DGK~j_a?wBDwEoROUOb zXA@^@pHa@`y2>-F*XnFfUh4(fAU>lPM}i&gczIU^EjuC1$;Z4{ZjyS$mujoWEV7@b z_D9`0?zB=hNb8{9{ol(u=eewM(0UtC^*nazkvk5@1wQTUe)riRj4kM9kGX8{y|ksd z3*YhC@0gtRrf&O%>1N+!Leg(-zhLp~gllLTA5*)YP|KzXOiR0GEdG}=M|qvgeD(P2 zi%z_?{YfRI}*cPX=nz{Xai zfM2^AHV827UU2TruN5qfYlD)zPB>^P)!T2aV0kRW=5RcI|LrvgB&ISomR7X3JA4e~ zY>=G)L;Dv)lqlQsoQkVX%cAD`RyXJ0a#<3uXBw7})?PhN^Zqk;?%GGYCr!^zxo(iV z>EYs{xxd+NJ$(_k!?K_2^2ynk^*1lFQVtZEY5(fM@-Dw#$GW+vAM<>S*^w$&CvoE0 yD|NRO5z>7O`F|73B}XZ&t;ucLK6U}2n{*_ literal 0 HcmV?d00001