add documentation to androidFix config option and bump version to 1.2

closes #5
pixelcog · Nov 16, 2014 · 4ea61e8 · 4ea61e8
1 parent 5d6024a
commit 4ea61e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -109,6 +109,12 @@ Note that when specifying these options as html data-attributes, you should conv
 			<td>true</td>
 			<td>iOS devices are incompatable with this plugin. If true, this option will set the parallax image as a static, centered background image whenever it detects an iOS user agent. Disable this if you wish to implement your own graceful degradation.</td>
 		</tr>
+		<tr>
+			<td>androidFix</td>
+			<td>boolean</td>
+			<td>true</td>
+			<td>If true, this option will set the parallax image as a static, centered background image whenever it detects an Android user agent. Disable this if you wish to enable the parallax scrolling effect on Android devices.</td>
+		</tr>
 	</tbody>
 </table>
 

diff --git a/parallax.js b/parallax.js
@@ -1,5 +1,5 @@
 /*!
- * parallax.js v1.1 (http://pixelcog.github.io/parallax.js/)
+ * parallax.js v1.2 (http://pixelcog.github.io/parallax.js/)
  * Copyright (c) 2014 PixelCog, Inc.
  * Licensed under MIT (https://github.com/pixelcog/parallax.js/blob/master/LICENSE)
  */

diff --git a/parallax.min.js b/parallax.min.js