Merge branch 'release/1.0.1'

Author: hassankhan

README.md

@@ -42,11 +42,11 @@ emojify.js is now available on cdnjs - https://cdnjs.com/libraries/emojify.js
 
 Add this to the rest of your stylesheet imports:
 
-`<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/emojify.js/1.0/emojify.min.css" />`
+`<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/emojify.js/1.0.1/emojify.min.css" />`
 
 Then add this to your Javascript code:
 
-`<script src="//cdnjs.cloudflare.com/ajax/libs/emojify.js/1.0/emojify.min.js"></script>`
+`<script src="//cdnjs.cloudflare.com/ajax/libs/emojify.js/1.0.1/emojify.min.js"></script>`
 
 ### Via Bower
 
@@ -153,18 +153,23 @@ emojify.replace('I am happy :)', replacer);
 
 Please read [CONTRIBUTING.md](CONTRIBUTING.md).
 
+## Credits
+
+- [All Contributors](https://github.com/hassankhan/emojify.js/contributors)
+- [Hassan Khan](https://github.com/hassankhan)
+
 ## License
 
 Please read [LICENSE.md](LICENSE.md). For image attributions, please read [LICENSE-IMAGES.md](LICENSE-IMAGES.md)
 
 [travis]: https://travis-ci.org/hassankhan/emojify.js
-[appveyor]: https://ci.appveyor.com/project/adam-lynch/emojify-js
+[appveyor]: https://ci.appveyor.com/project/hassankhan/emojify-js
 [package-bower]: http://bower.io/search/?q=emojify.js
 [package-npm]: https://www.npmjs.org/package/emojify.js
 [ico-build]: http://img.shields.io/travis/hassankhan/emojify.js.svg?style=flat-square
 [ico-build-dev]: http://img.shields.io/travis/hassankhan/emojify.js/develop.svg?style=flat-square
-[ico-windows-build]: https://ci.appveyor.com/api/projects/status/6umkf6gc7dq64c2g/branch/master?svg=true
-[ico-windows-build-dev]: https://ci.appveyor.com/api/projects/status/6umkf6gc7dq64c2g/branch/develop?svg=true
+[ico-windows-build]: https://ci.appveyor.com/api/projects/status/908bymld8nm3ykxm?svg=true
+[ico-windows-build-dev]: https://ci.appveyor.com/api/projects/status/908bymld8nm3ykxm/branch/develop?svg=true
 [ico-bower]: http://img.shields.io/bower/v/emojify.js.svg?style=flat-square
 [ico-npm]: http://img.shields.io/npm/v/emojify.js.svg?style=flat-square
 [ico-license]: http://img.shields.io/npm/l/emojify.js.svg?style=flat-square

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "emojify.js",
   "main": "dist/js/emojify.js",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/hassankhan/emojify.js",
   "authors": [
     "Hassan Khan (hassankhan)"
@@ -12,6 +12,7 @@
   ],
   "license": "MIT",
   "ignore": [
+    "src",
     "**/.*",
     "node_modules",
     "tests"

dist/js/emojify.js

@@ -336,8 +336,8 @@
                 else {
                     treeTraverse(el, function(node){
                         if(
-                            (typeof node.tagName !== 'undefined' && node.tagName.match(elementsBlacklist))
-                            || (typeof node.className !== 'undefined' && node.className.match(classesBlacklist))
+                            (typeof node.tagName !== 'undefined' && node.tagName.match(elementsBlacklist)) ||
+                            (typeof node.className !== 'undefined' && node.className.match(classesBlacklist))
                         ){
                             return false;
                         }

dist/js/emojify.min.js

@@ -1,6 +1,6 @@
 {
   "name": "emojify.js",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Javascript module to convert emoji keywords to images.",
   "main": "dist/js/emojify.js",
   "scripts": {

package.json

@@ -336,8 +336,8 @@
                 else {
                     treeTraverse(el, function(node){
                         if(
-                            (typeof node.tagName !== 'undefined' && node.tagName.match(elementsBlacklist))
-                            || (typeof node.className !== 'undefined' && node.className.match(classesBlacklist))
+                            (typeof node.tagName !== 'undefined' && node.tagName.match(elementsBlacklist)) ||
+                            (typeof node.className !== 'undefined' && node.className.match(classesBlacklist))
                         ){
                             return false;
                         }

src/emojify.js

@@ -20,7 +20,10 @@ jsdom.env({
     done: function(errors, win) {
         global.window = win;
         global.document = win.document;
-        JS.Test.autorun()
+        JS.Test.autorun(function(runner){
+            runner.setReporter(new JS.Test.Reporters.Spec())
+            runner.addReporter(new JS.Test.Reporters.ExitStatus())
+        })
     }
 })