Skip to content

Add twimoji #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add twimoji #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a235f0
Add twemoji support
reunan Apr 23, 2016
55c6da8
resolve conflicts
reunan Apr 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"moment": "^2.12.0",
"mousetrap": "^1.4.10",
"ngAutocomplete": "^1.0.0",
"ng-range-slider": "^0.2.0"
"ng-range-slider": "^0.2.0",
"twemoji": "^2.0.5"
}
}
5 changes: 5 additions & 0 deletions desktop-app/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,11 @@ ul.from-to li input {
outline: none;
}

.emoji {
width: 20px;
padding-left: 5px;
}


/* Templates - settings */

Expand Down
7 changes: 3 additions & 4 deletions desktop-app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<title>Tinder Desktop</title>
<meta name="description" content="A cross-platform desktop Tinder client">

<link rel="stylesheet" href="css/normalize.min.css"/>
<link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/font-awesome.min.css">
<link rel="stylesheet" href="css/app.css"/>
<link rel="stylesheet" href="css/sweet-alert.css"/>

<script src="js/error_handler.js"></script>

<script src="js/vendor/angular.min.js"></script>
<script src="js/vendor/angular-sanitize.min.js"></script>
<script src="js/vendor/angular-translate.min.js"></script>
Expand All @@ -26,7 +25,7 @@
<script src="js/vendor/moment-with-locales.min.js"></script>
<script>window.jQuery = window.$ = module.exports;</script>
<script src="js/vendor/mousetrap.min.js"></script>

<script src="js/vendor/twemoji.js"></script>
<script src="js/tinder-desktop.api.js"></script>
<script src="js/tinder-desktop.common.js"></script>
<script src="js/tinder-desktop.controls.js"></script>
Expand Down
9 changes: 8 additions & 1 deletion desktop-app/js/tinder-desktop.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,11 @@
return moment(time).format('L HH:mm');
};
});
})();

module.filter('twemoji', function() {
return function(string) {
return twemoji.parse(string);
};
});

})();
4 changes: 2 additions & 2 deletions desktop-app/templates/messages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
{{message.sentDate | timeToLocalized}}
</div>
<div ng-if="message.text"
ng-bind-html="message.text"></div>
ng-bind-html="message.text | twemoji"></div>
</div>
</div>
<div ng-repeat-end class="messages-in-chat" scroll-to-last></div>
Expand All @@ -71,4 +71,4 @@
</div>
</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions desktop-app/templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h3 class="status fader">{{user.distance_mi | distanceToUnits}} {{'PROFILE.AWAY'
{{job.title.name}} {{job.company && job.title ? ('PROFILE.AT' | translate) : ''}} {{job.company.name}}
</i>
</p>
<p ng-show="user.bio" class="bio fader" ng-bind-html="user.bio"></p>
<p ng-if="user.bio" class="bio fader" ng-bind-html="user.bio | twemoji"></p>
</div>
<div class="small-photos fader">
<div ng-repeat="photo in user.photos">
Expand All @@ -34,4 +34,4 @@ <h3 class="status fader">{{user.distance_mi | distanceToUnits}} {{'PROFILE.AWAY'
</div>
</div>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions desktop-app/templates/swipe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h3 class="status fader">{{allPeople[peopleIndex].distance_mi | distanceToUnits}
{{job.title.name}} {{job.company && job.title ? ('SWIPE.AT' | translate) : ''}} {{job.company.name}}
</i>
</p>
<p ng-show="allPeople[peopleIndex].bio" class="bio fader">{{ allPeople[peopleIndex].bio }}</p>
<p ng-if="allPeople[peopleIndex].bio" ng-bind-html="allPeople[peopleIndex].bio | twemoji" class="bio fader"></p>
</div>
<!-- small inactive photos -->
<div class="small-photos fader">
Expand All @@ -50,4 +50,4 @@ <h3 class="status fader">{{allPeople[peopleIndex].distance_mi | distanceToUnits}
</div>
</div>
</div>
</div>
</div>
3 changes: 2 additions & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ var PATHS = {
'bower_components/moment/min/moment-with-locales.min.js',
'bower_components/mousetrap/mousetrap.min.js',
'bower_components/ngAutocomplete/src/ngAutocomplete.js',
'bower_components/ng-range-slider/dist/ng-range-slider.min.js'
'bower_components/ng-range-slider/dist/ng-range-slider.min.js',
'bower_components/twemoji/twemoji.js'
],
stylesheets: [
'bower_components/font-awesome/css/font-awesome.min.css'
Expand Down