Merge branch 'master' of github.com:jamesflorentino/nanoScrollerJS

jamesflorentino · May 1, 2015 · eb24845 · eb24845
2 parents 95231fb + b5da5ae
commit eb24845
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/LICENSE-MIT → LICENSE b/LICENSE-MIT → LICENSE
diff --git a/bin/javascripts/jquery.nanoscroller.js b/bin/javascripts/jquery.nanoscroller.js
diff --git a/bin/javascripts/jquery.nanoscroller.min.js b/bin/javascripts/jquery.nanoscroller.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nanoscroller",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.",
   "homepage": "http://jamesflorentino.github.com/nanoScrollerJS/",
   "main": [

diff --git a/docs/classes/NanoScroll.html b/docs/classes/NanoScroll.html
@@ -19,7 +19,7 @@ <h1><img src="../assets/css/logo.png" title="jquery.nanoscroller"></h1>
 
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 0.8.6</em>
+            <em>API Docs for: 0.8.7</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">

diff --git a/docs/data.json b/docs/data.json
@@ -2,7 +2,7 @@
     "project": {
         "name": "jquery.nanoscroller",
         "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.",
-        "version": "0.8.6",
+        "version": "0.8.7",
         "url": "http://jamesflorentino.github.com/nanoScrollerJS/"
     },
     "files": {

diff --git a/docs/files/bin_javascripts_jquery.nanoscroller.js.html b/docs/files/bin_javascripts_jquery.nanoscroller.js.html
@@ -19,7 +19,7 @@ <h1><img src="../assets/css/logo.png" title="jquery.nanoscroller"></h1>
 
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 0.8.6</em>
+            <em>API Docs for: 0.8.7</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">
@@ -86,7 +86,7 @@ <h1 class="file-heading">File: bin/javascripts/jquery.nanoscroller.js</h1>
 
 <div class="file">
     <pre class="code prettyprint linenums">
-/*! nanoScrollerJS - v0.8.6 - 2015
+/*! nanoScrollerJS - v0.8.7 - 2015
 * http://jamesflorentino.github.com/nanoScrollerJS/
 * Copyright (c) 2015 James Florentino; Licensed MIT */
 (function(factory) {

diff --git a/docs/index.html b/docs/index.html
@@ -19,7 +19,7 @@ <h1><img src="./assets/css/logo.png" title="jquery.nanoscroller"></h1>
 
         </div>
         <div class="yui3-u-1-4 version">
-            <em>API Docs for: 0.8.6</em>
+            <em>API Docs for: 0.8.7</em>
         </div>
     </div>
     <div id="bd" class="yui3-g">

diff --git a/nanoscroller.jquery.json b/nanoscroller.jquery.json
@@ -2,7 +2,7 @@
   "name": "jquery.nanoscroller",
   "title": "nanoScrollerJS",
   "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "homepage": "http://jamesflorentino.github.com/nanoScrollerJS/",
   "author": {
     "name": "James Florentino",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nanoscroller",
   "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "author": "James Florentino <jamesflorentino@gmail.com> (http://blog.jamesflorentino.com/)",
   "bugs": {
     "url": "https://github.com/jamesflorentino/nanoScrollerJS/issues"
@@ -40,7 +40,12 @@
     "scrollbar"
   ],
   "license": "MIT",
-  "main": "javascripts/jquery.nanoscroller.js",
+  "main": "bin/javascripts/jquery.nanoscroller.js",
+  "style": "bin/css/nanoscroller.css",
+  "files": [
+    "bin/css/nanoscroller.css",
+    "bin/javascripts/jquery.nanoscroller.js"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/jamesflorentino/nanoScrollerJS.git"