app/assets/javascripts/chatroom/marks.js in chatroom-0.0.9 vs app/assets/javascripts/chatroom/marks.js in chatroom-0.1.0
- old
+ new
@@ -11,10 +11,17 @@
var emotions = [
"smile", "despressed", "like", "dull", "proud", "cry", "shy", "shut_up",
"nap", "big_cry", "awkward_red", "angry", "naughty", "snag", "surprise", "bad",
"cool", "awkward", "scream", "vomit", "giggle", "lovely", "who_cares", "zhuai",
"hungry", "sleepy", "scared", "sweat", "simper", "solider", "strive", "shout",
- "questionaire", "hiss", "dizzy", "impantient", "be_bombed", "skull", "hit_head", "bye"
+ "questionaire", "hiss", "dizzy", "impantient", "be_bombed", "skull", "hit_head", "bye",
+ "sweat", "pick_nose", "applause", "embarrassed", "cheeky_grin", "not_worth_left", "not_worth_right", "yawn",
+ "contempt", "grievance", "sad", "sinister_smile", "kiss", "startle", "pitiful", "chopper",
+ "watermelon", "beer", "basketball", "pingpong", "coffee", "rice", "pig", "flower",
+ "wither", "love", "heart", "borken_heart", "cake", "light", "bomb", "sword",
+ "football", "insect", "shit", "moon", "sun", "gift", "hug", "good",
+ "Lously", "agree", "Yeal", "greet", "come", "fist", "little_finger",
+ "love_you", "no", "ok"
];
var s = "";
if (str.length == 0) return "";
s = str.replace(/<b>/g, "[bold]");