diff --git a/.versions b/.versions
index 3dc7b904d..3ddd71448 100644
--- a/.versions
+++ b/.versions
@@ -14,7 +14,7 @@ ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.7.1
ecmascript-runtime-server@0.7.0
ejson@1.1.0
-emojione:emojione@4.0.0
+emojione:emojione@4.5.1
html-tools@1.0.11
htmljs@1.0.11
http@1.4.1
diff --git a/bower.json b/bower.json
index b9851fdb1..f5ce62b79 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "emojione",
- "version": "4.0.0",
+ "version": "4.5.1",
"main": [
"extras/css/emojione.css",
"lib/js/emojione.js"
@@ -24,4 +24,4 @@
"unicode",
"emoji set"
]
-}
\ No newline at end of file
+}
diff --git a/lib/js/emojione.js b/lib/js/emojione.js
index 7fcb24d1b..866f14f1b 100644
--- a/lib/js/emojione.js
+++ b/lib/js/emojione.js
@@ -140,6 +140,7 @@
};
ns.asciiRegexp = '(\\*\\\\0\\/\\*|\\*\\\\O\\/\\*|\\-___\\-|\\:\'\\-\\)|\'\\:\\-\\)|\'\\:\\-D|\\>\\:\\-\\)|>\\:\\-\\)|\'\\:\\-\\(|\\>\\:\\-\\(|>\\:\\-\\(|\\:\'\\-\\(|O\\:\\-\\)|0\\:\\-3|0\\:\\-\\)|0;\\^\\)|O;\\-\\)|0;\\-\\)|O\\:\\-3|\\-__\\-|\\:\\-Þ|\\:\\-Þ|\\<\\/3|<\\/3|\\:\'\\)|\\:\\-D|\'\\:\\)|\'\\=\\)|\'\\:D|\'\\=D|\\>\\:\\)|>\\:\\)|\\>;\\)|>;\\)|\\>\\=\\)|>\\=\\)|;\\-\\)|\\*\\-\\)|;\\-\\]|;\\^\\)|\'\\:\\(|\'\\=\\(|\\:\\-\\*|\\:\\^\\*|\\>\\:P|>\\:P|X\\-P|\\>\\:\\[|>\\:\\[|\\:\\-\\(|\\:\\-\\[|\\>\\:\\(|>\\:\\(|\\:\'\\(|;\\-\\(|\\>\\.\\<|>\\.<|#\\-\\)|%\\-\\)|X\\-\\)|\\\\0\\/|\\\\O\\/|0\\:3|0\\:\\)|O\\:\\)|O\\=\\)|O\\:3|B\\-\\)|8\\-\\)|B\\-D|8\\-D|\\-_\\-|\\>\\:\\\\|>\\:\\\\|\\>\\:\\/|>\\:\\/|\\:\\-\\/|\\:\\-\\.|\\:\\-P|\\:Þ|\\:Þ|\\:\\-b|\\:\\-O|O_O|\\>\\:O|>\\:O|\\:\\-X|\\:\\-#|\\:\\-\\)|\\(y\\)|\\<3|<3|\\:D|\\=D|;\\)|\\*\\)|;\\]|;D|\\:\\*|\\=\\*|\\:\\(|\\:\\[|\\=\\(|\\:@|;\\(|D\\:|\\:\\$|\\=\\$|#\\)|%\\)|X\\)|B\\)|8\\)|\\:\\/|\\:\\\\|\\=\\/|\\=\\\\|\\:L|\\=L|\\:P|\\=P|\\:b|\\:O|\\:X|\\:#|\\=X|\\=#|\\:\\)|\\=\\]|\\=\\)|\\:\\])';
+ ns.htmlRegexp = '|]*>.*?|<(?:object|embed|svg|img|div|span|p|a)[^>]*>';
ns.emojiVersion = '4.5'; // you can [optionally] modify this to load alternate emoji versions. see readme for backwards compatibility and version options
ns.emojiSize = '32';
@@ -154,11 +155,14 @@
ns.ascii = false; // change to true to convert ascii smileys
ns.riskyMatchAscii = false; // set true to match ascii without leading/trailing space char
- ns.regShortNames = new RegExp("