Improved Firefox support

sankyutang · Feb 17, 2012 · 8256e12 · 8256e12
1 parent 590f91a
commit 8256e12
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/examples/demo1.html b/examples/demo1.html
@@ -15,7 +15,7 @@
 	<!-- Shared Scripts -->
 	<script src="../libs/modernizr-2.0.6.min.js"></script>
 	<script src="../libs/zepto.min.js"></script>
-	<script src="../src/zepto.flickable.js"></script>
+	<script src="../src/zepto.flickable.min.js"></script>
 	<script src="js/demo.js"></script>
 
 	<!-- Demo 1 Scripts -->
@@ -145,7 +145,7 @@
 
 		<div class="demo-intro" id="demo1-intro">
 			<h1>Demo 1: Flicking between screens</h1>
-			<p>This demo allows you to swipe between 'cards' within a set area. Tap a card to flip it around.</p>
+			<p>This demo allows you to swipe between 'cards' within a set area. Tap a card to flip it around (flipping cards works only in webkit browsers).</p>
 		</div>
 
 

diff --git a/examples/demo2.html b/examples/demo2.html
@@ -15,7 +15,7 @@
 	<!-- Shared Scripts -->
 	<script src="../libs/modernizr-2.0.6.min.js"></script>
 	<script src="../libs/zepto.min.js"></script>
-	<script src="../src/zepto.flickable.js"></script>
+	<script src="../src/zepto.flickable.min.js"></script>
 	<script src="js/demo.js"></script>
 
 	<!-- Demo 1 Scripts -->

diff --git a/examples/demo3.html b/examples/demo3.html
@@ -15,7 +15,7 @@
 	<!-- Shared Scripts -->
 	<script src="../libs/modernizr-2.0.6.min.js"></script>
 	<script src="../libs/zepto.min.js"></script>
-	<script src="../src/zepto.flickable.js"></script>
+	<script src="../src/zepto.flickable.min.js"></script>
 	<script src="js/demo.js"></script>
 
 	<!-- Demo 1 Scripts -->

diff --git a/src/zepto.flickable.js b/src/zepto.flickable.js
@@ -5,7 +5,7 @@
  * Licensed under the Whatever License. Use it for whatever you want!
  * 
  * @author [email protected]
- * @version 1.0.2
+ * @version 1.0.3
  * 
  * @requires 
  * Zepto JavaScript Library
@@ -271,7 +271,13 @@
 				(d == 'y') ? style = '(0,'+pos+'px,0)' : style = '('+pos+'px,0,0)';
 
 				// Zepto does not currently support setting translate3d via .css() so we have to do it manually
-				document.getElementById(el.attr('id')).style.webkitTransform = 'translate3d'+style; 
+				if(typeof document.getElementById(el.attr('id')).style.webkitTransform != 'undefined') {
+					document.getElementById(el.attr('id')).style.webkitTransform
+				} else if (typeof document.getElementById(el.attr('id')).style.mozTransform != 'undefined') {
+					document.getElementById(el.attr('id')).style.mozTransform = 'translate3d'+style; 
+				} else {
+					document.getElementById(el.attr('id')).style.transform = 'translate3d'+style; 
+				}
 
 			}
 

diff --git a/src/zepto.flickable.min.js b/src/zepto.flickable.min.js