resolve #9 - Wrap tweetParser and the jQuery compatibility file in th…

…e same file
VincentLoy · Jul 5, 2015 · 9de617a · 9de617a
1 parent 42d62bf
commit 9de617a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 35 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Vincent Loy
+Copyright (c) 2015 Vincent Loy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -94,6 +94,10 @@ you can customize your tweet with css classes used in parameters
 
 
 #### Changelog
+
++ v2.1.1
+  * resolve [issue #9](https://github.com/VincentLoy/tweetParser.js/issues/9) - Wrap tweetParser and the jQuery compatibility file in the same file.
+
 + v2.1.0
   * Add a jQuery compatibility file.
   * You can now use Both VanillaJS or jQuery.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tweetparser.js",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "homepage": "https://github.com/VincentLoy/tweetParser.js",
   "authors": [
     "VincentLoy <vincent.loy1@gmail.com>"

diff --git a/dev/jquery.tweetParser.js b/dev/jquery.tweetParser.js
diff --git a/dev/tweetParser.js b/dev/tweetParser.js
@@ -1,6 +1,6 @@
 /*!
- * tweetParser.js v2.1.0
- * Small Javascript Library that parse an element containing a tweet and turn URLS, @user & #hashtags into urls
+ * tweetParser.js v2.1.1
+ * Small Javascript Library that parse an element containing a tweet and turn URLS, @user & #hashtags into working urls
  * License : MIT
  * author Vincent Loy <vincent.loy1@gmail.com>
  * http://vincent-loy.fr
@@ -117,3 +117,18 @@
 
     exports.tweetParser = tweetParser;
 }(window));
+
+/*global $, jQuery, tweetParser*/
+if (window.jQuery) {
+    (function ($, tweetParser) {
+        'use strict';
+
+        function tweetParserify(el, options) {
+            tweetParser(el, options);
+        }
+
+        $.fn.tweetParser = function (options) {
+            return tweetParserify(this.selector, options);
+        };
+    }(jQuery, tweetParser));
+}
diff --git a/dist/tweetParser.min.js b/dist/tweetParser.min.js
diff --git a/index.html b/index.html
@@ -22,7 +22,7 @@ <h1>tweetParser.js</h1>
 
         <h2>Small Javascript Library easy-to-use that parse Twitter Usernames, Hashtags and URLs</h2>
 
-        <h3>V2.1.0</h3>
+        <h3>V2.1.1</h3>
 
         <div class="social-box">
             <a href="https://github.com/VincentLoy/jquery.tweetParser" class="social-link">
@@ -213,15 +213,14 @@ <h4 class="text-center">Made with &hearts; by <a href="http://vincent-loy.fr">Vi
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.1.0/mustache.min.js"></script>
 <script src="demo/mustacheRender.js"></script>
 <script src="dev/tweetParser.js"></script>
-<!--<script src="dev/jquery.tweetParser.js"></script>-->
 
 <!-- only for demo -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/0.0.1/prism.min.js"></script>
 <script>
-    // Old jQuery dependent tweetParser.js call
-    //$('.tweet').tweetParser();
+    // jQuery tweetParser.js call example
+//    $('.tweet').tweetParser();
 
-    //New way to call tweetParser.js
+    //tweetParser.js example
     tweetParser('.tweet');
 </script>
 </body>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tweetparser.js",
   "description": "Small javascript library that parse an element containing a tweet and turn URLS, @user & #hashtags into working urls",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "homepage": "http://vincentloy.github.io/tweetParser.js",
   "author": {
     "name": "Vincent Loy",