Merge branch 'develop' of https://github.com/hassankhan/emojify.js in…

…to update.sh Conflicts: emojify.min.js gulpfile.js package.json update.sh
Ranks · e2b7ca5ec54d4be9c4c5c5e762f841b9782fdcb9 · adam-lynch committed Nov 11, 2014 · Nov 11, 2014 · e2b7ca5
2 parents 7b995e3 + c1279ac
commit e2b7ca5ec54d4be9c4c5c5e762f841b9782fdcb9
@@ -1,9 +1,9 @@
 node_modules
-css
 vendor
 tests.browserified.js
 
 
 # editors
 .idea
-*.iml
+*.iml
+*.sublime-project
@@ -14,7 +14,7 @@ This project follows [Git-Flow](http://nvie.com/posts/a-successful-git-branching
 
 - All tests: `npm test`
 - Just the browser ones: `phantomjs tests/phantom.js`
-- Just the Node ones: `gulp test-node`
+- Just the Node ones: `node tests/node.js`
 
 ## Before creating a pull request
 
@@ -36,4 +36,5 @@ If you have rights to publish to npm, do the following first:
 
 - Run `gulp update`. This will update the project with the latest emoji from [emoji-cheat-sheet.com](http://www.emoji-cheat-sheet.com).
 - Run `gulp`
+- Run `gulp bump`
 - Run `npm publish`
@@ -34,11 +34,18 @@ Go to this project's [GitHub pages](http://hassankhan.github.com/emojify.js) to
 
 Care about old browsers compatibility? Use https://github.com/es-shims/es5-shim
 
-### Via cdnjs **[SOON]**
+### Via cdnjs
+
+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/0.9.5/emojify.min.css" />`
+
 Then add this to your Javascript code:
 
+`<script src="//cdnjs.cloudflare.com/ajax/libs/emojify.js/0.9.5/emojify.min.js"></script>`
+
 ### Via Bower
 
 `bower install emojify.js --save`
@@ -73,18 +80,35 @@ emojify.setConfig({emojify_tag_type : 'div'});
 
 ### run([element])
 
-*This only works in the browser*
+*This works in the browser and on Node*
 
 #### Parameters
 - `element` - Optional HTML element to restrict the emojification to.
+- `window` - Optional window object in which the element exists. Is required when used with node.
 
 #### Usage
+
+##### Browser
 ```js
 emojify.run();
 // OR
 emojify.run(document.getElementById('my-element'))
 ```
 
+##### Node.js
+Requires you to have jsdom installed:
+`npm i jsdom --save`
+
+```js
+var jsdom = require('jsdom') 
+
+jsdom.env({
+    html: "<p><code>jhhh</code><em>:)</em></p>",
+    done: function(errors, window) {
+        emojify.run(window.document.body)
+    }
+});
+```
 ---
 
 ### replace(string, [callback])
@@ -131,9 +155,10 @@ Please read [LICENSE.md](LICENSE.md). For image attributions, please read [LICEN
 [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-bower]: http://img.shields.io/badge/bower-0.9.5-blue.svg?style=flat-square
+[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
-[ico-gitter]: https://badges.gitter.im/hassankhan/emojify.js.png
+[ico-gitter]: https://badges.gitter.im/hassankhan/emojify.js.svg
 [license]: http://hassankhan.mit-license.org/
 [gitter]: https://gitter.im/hassankhan/emojify.js
+
@@ -1,6 +1,6 @@
 {
   "name": "emojify.js",
-  "main": "emojify.js",
+  "main": "dist/js/emojify.js",
   "version": "0.9.5",
   "homepage": "https://github.com/hassankhan/emojify.js",
   "authors": [