From 34a58fee0dc8c391b4175e4cd6f281fcc20b740f Mon Sep 17 00:00:00 2001 From: chetan li Date: Sun, 24 Apr 2016 16:37:16 +0530 Subject: [PATCH] emoticons features added --- .meteor/packages | 1 + .meteor/versions | 2 ++ client/lib/spacebars.js | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.meteor/packages b/.meteor/packages index ede3901..4805688 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -39,3 +39,4 @@ mizzao:user-status dburles:eslint kevohagan:sweetalert mizzao:autocomplete +mattimo:emoticons diff --git a/.meteor/versions b/.meteor/versions index ddb771d..edd0331 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -52,6 +52,7 @@ less@2.5.1 livedata@1.0.15 localstorage@1.0.5 logging@1.0.8 +mattimo:emoticons@0.0.4 meteor@1.1.10 meteor-base@1.0.1 meteorhacks:inject-initial@1.0.3 @@ -68,6 +69,7 @@ mongo-id@1.0.1 npm-bcrypt@0.7.8_2 npm-mongo@1.4.39_1 observe-sequence@1.0.7 +ogourment:settings@0.1.4 ordered-dict@1.0.4 promise@0.5.1 random@1.0.5 diff --git a/client/lib/spacebars.js b/client/lib/spacebars.js index dc49f83..f274df2 100644 --- a/client/lib/spacebars.js +++ b/client/lib/spacebars.js @@ -32,6 +32,8 @@ UI.registerHelper('simpleFormat', (text) => { }); }; text = linkify(text); + //filter the emoticons symbol and replace with emo icons images + text = Blaze._globalHelpers.parseEmoticons(text); carriage_returns = /\r\n?/g; paragraphs = /\n\n+/g; newline = /([^\n]\n)(?=[^\n])/g;