Merge tag 'v1.1.0'

Refactor! Wrap all APIs into Object and attach to DOM as .data('flip-model')
nnattawat · May 20, 2016 · 20cc1f8 · 20cc1f8
2 parents 80a08e7 + 6180c86
commit 20cc1f8
Show file tree

Hide file tree

Showing 11 changed files with 629 additions and 506 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules/
 /bower_components/
 npm-debug.log
+*.swp
diff --git a/.jshintrc b/.jshintrc
@@ -1,23 +1,25 @@
 {
 	"boss": true,
+	"browser": true,
 	"curly": true,
-	"eqeqeq": false,
+	"devel": true,
+	"eqeqeq": true,
 	"eqnull": true,
-	"es3": true,
+	"esversion": 5,
 	"expr": true,
 	"immed": true,
+	"newcap": false,
 	"noarg": true,
 	"onevar": true,
 	"quotmark": false,
+	"shadow": true,
 	"trailing": true,
 	"undef": true,
 	"unused": true,
-	"newcap": false,
-	"browser": true,
-	"shadow": true,
-	"devel": true,
+  "freeze": true,
+  "maxstatements": 30,
 
 	"globals": {
 		"jQuery": false
 	}
-}
+}
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+  - '0.10'
+before_install: 
+  - npm install -g grunt-cli bower
+install:
+  - npm install
+  - bower install
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/nnattawat/flip.svg?branch=master)](https://travis-ci.org/nnattawat/fixedBG)
 # jQuery Flip <sub><sup>v1.0.20</sup></sub>
 
 **A lightweight jQuery plugin to create 3d flip animation.** 

diff --git a/bower.json b/bower.json
@@ -1,14 +1,14 @@
 {
 	"name": "flip",
-	"version": "1.0.20",
+	"version": "1.1.0",
 	"dependencies": {
 		"jquery": "~2.0"
 	},
 	"devDependencies": {
 		"jquery": "~2.0"
 	},
 	"main": [
-		"src/flip.js"
+		"dist/jquery.flip.js"
 	],
 	"ignore": []
 }
diff --git a/demo/index.html b/demo/index.html
@@ -11,26 +11,27 @@
         height: 400px;
         margin: 20px;
       }
-      .front, .back {
+      .front, .back, .other-front, .other-back {
         border: 2px gray solid;
         padding: 10px;
       }
-      .front {
+      .front, .other-front {
         background-color: #ccc;
       }
-      .back {
+      .back, .other-back {
         background-color: red;
       }
     </style>
   </head>
   <body>
     <div id="card-1" class="card">
-      <div class="front">
+      <div class="other-front">
           Front: Cursus aliquet mus et sociis, placerat adipiscing a placerat magnis integer nisi lacus in, turpis porttitor? Lectus nunc dis in porta, montes lacus. Tortor. Pid sit nisi eu nec aenean.
       </div>
-      <div class="back">
+      <div class="other-back">
           <a href="http://google.com">link</a>
           Back: Dolor scelerisque ridiculus! Mus? Augue, montes, montes proin rhoncus vel a parturient dapibus eros? Penatibus nascetur. In turpis nisi elementum nascetur habitasse augue egestas, in ac rhoncus odio porttitor turpis.
+          Back: Dolor scelerisque ridiculus! Mus? Augue, montes, montes proin rhoncus vel a parturient dapibus eros? Penatibus nascetur. In turpis nisi elementum nascetur habitasse augue egestas, in ac rhoncus odio porttitor turpis.
       </div>
     </div>
 
@@ -47,13 +48,14 @@
 
     <script type="text/javascript">
     $(function(){
-      // $(".card").flip();
-
       $("#card-1").flip({
         axis: "y", // y or x
         reverse: false, // true and false
         trigger: "hover", // click or hover
-        speed: 1000
+        speed: 1000,
+        front: $('.other-front'),
+        back: $('.other-back'),
+        autoSize: false
       });
       $("#card-2").flip({
         axis: "x",