Skip to content

Commit 0cfbb9c

Browse files
UI-5: Fox emojis on Linux and Windows
1 parent fdd27d5 commit 0cfbb9c

16 files changed

+983
-46
lines changed

bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
],
1717
"dependencies": {
1818
"angular": "angularjs#^1.7.5",
19-
"emoji-js": "^0.3.0"
19+
"emoji-js": "^0.3.0",
20+
"angular-sanitize": "^1.7.5"
2021
}
2122
}

gruntfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = function(grunt) {
1818
dest: 'public/js/lib.min.js',
1919
src: [
2020
'bower_components/angular/angular.min.js',
21+
'bower_components/angular-sanitize/angular-sanitize.js',
2122
'source/js/lib/emoji.min.js'
2223
]
2324
},

public/css/styles.css

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/styles.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/styles.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js

+26-17
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,34 @@
33
// build: 19/12/2018
44

55
firebase.initializeApp({"apiKey":"AIzaSyBebYtKOqOxENgVbTfiNhWAxh4cr_Vn7Ec","authDomain":"rewards-cee1a.firebaseapp.com","databaseURL":"https://rewards-cee1a.firebaseio.com","projectId":"rewards-cee1a","storageBucket":"rewards-cee1a.appspot.com","messagingSenderId":"376174432289"});
6-
const app = angular.module('rewards', []);
7-
6+
const app = angular.module('rewards', ['ngSanitize']);
87
const emoji = new EmojiConvertor();
9-
10-
app.filter("emojis", function() {
11-
return function(input) {
12-
const emojiReplace = emoji.replace_colons(input);
13-
if (emojiReplace !== input) {
14-
return emojiReplace;
15-
}
16-
return "";
17-
};
18-
});
8+
emoji.replace_mode = 'img';
9+
10+
app.filter("emojis", [
11+
'$sce', function($sce) {
12+
return (input) => {
13+
const emojiReplace = emoji.replace_colons(input);
14+
if (emojiReplace !== input) {
15+
return $sce.trustAsHtml(emojiReplace);
16+
}
17+
return "";
18+
};
19+
}
20+
]);
1921

2022
app.filter("length", function() {
2123
return function(input) {
2224
return Object.keys(input || {}).length;
2325
};
2426
});
2527

28+
app.factory('emojiService', [
29+
() => ({
30+
replace_mode: emoji.replace_mode
31+
})
32+
]);
33+
2634
if (window.location.hostname === 'rewards.io'){
2735
const port = '4201';
2836
var livereload = document.createElement('script');
@@ -31,10 +39,10 @@ if (window.location.hostname === 'rewards.io'){
3139
}
3240

3341
app.controller('LeaderboardController', [
34-
'$scope', '$log', 'leaderboardService', 'configService',
35-
($scope, $log, $leaderboard, $config) => {
42+
'$scope', '$log', 'leaderboardService', 'configService', 'emojiService',
43+
($scope, $log, $leaderboard, $config, $emoji) => {
3644
const images = ['image_1024', 'image_512', 'image_original'];
37-
45+
$scope.emoji = $emoji;
3846
$scope.config = $config;
3947
$scope.fetchLeaderboard = () => {
4048
$leaderboard.getValid().then((leaderboard) => {
@@ -60,8 +68,9 @@ app.controller('LeaderboardController', [
6068
]);
6169

6270
app.controller('RewardsController', [
63-
'$scope', '$log', 'rewardsService',
64-
($scope, $log, $rewards) => {
71+
'$scope', '$log', 'rewardsService', 'emojiService',
72+
($scope, $log, $rewards, $emoji) => {
73+
$scope.emoji = $emoji;
6574
$scope.fetchRewards = () => {
6675
$scope.newReward = null;
6776
$rewards.getAll().then((rewards) => {

public/js/app.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)