Minor bug fixes

godswearhats · godswearhats · commit 2cb6d504decb · 2015-07-08T17:42:14.000-07:00
I missed a few bugs in my haste to make a release. Went through and
fixed those, and also changed the `steps` option to `step` as that
seemed to make more semantic sense.
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
-jquery-ui-rotatable is a plugin for jQuery UI that works in a similar way to Draggable and Resizable, without being as full-featured (please fork and send me pull requests!). By default, it puts a small rotation icon in the bottom left of whatever element you want to make rotatable. I chose that area because it was originally being used in [Herald](https://github.com/godswearhats/herald) and the elements in that project were also resizable and I didn't want to interfere with the bottom/right controls for that.
+jquery-ui-rotatable is a plugin for jQuery UI that works in a similar way to Draggable and Resizable, without being as full-featured (please fork and send me pull requests!). By default, it puts a small rotation icon in the bottom left of whatever element you want to make rotatable.
 
 ### Usage
 
 Somewhere in your HTML ...
 
     <!-- prerequisites -->
     <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
-    <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
-    <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.3.js"></script>
+    <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
     
     <script src="jquery.ui.rotatable.js"></script>
     <!-- this is small and will allow you to override look/feel of handle -->
@@ -42,8 +42,8 @@ Options that can be set when you call `.rotatable()` are:
 * handle: url to a custom image for the handle
 * angle: the starting rotation for the element (default 0 degrees)
 * rotationCenterX, rotationCenterY: position about which the element will be rotated
-* steps: an angle in degrees that the rotation will snap to if the shift key is held (default 22.5)
-* snap: snaps to step in degrees, even if shift key is not held (default: false)
+* step: an angle in degrees that the rotation will snap to if the shift key is held (default 22.5)
+* snap: snaps to `step` in degrees (default: false)
 * start, stop, rotate: callbacks when those events occur
 
 The start, rotate and stop callbacks provide the following in the ui argument of the callback:
@@ -68,7 +68,7 @@ A simple demo is in the source code, but can be visited [here](http://godswearha
 
 ### Thanks
 
-Many thanks to those of you who have reported issues and helped me diagnose and fix them! Specifically, @thehunmonkgroup, @ssimono, @theodorton, @rouxguigui and @tremez
+Many thanks to those of you who have reported issues and helped me diagnose and fix them! Also, thank you to all the contributors who have sent pull requests and put up with my laziness :-)
 
 ### License
 
diff --git a/demo.html b/demo.html
@@ -1,8 +1,8 @@
 <html>
 <head>
 	<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
-	<script src="http://code.jquery.com/jquery-1.11.1.js"></script>
-	<script src="http://code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
+	<script src="http://code.jquery.com/jquery-1.11.3.js"></script>
+	<script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script>
 	
 	<script src="jquery.ui.rotatable.min.js"></script>
 	<link rel="stylesheet" href="jquery.ui.rotatable.css">
@@ -21,16 +21,18 @@
             },
         };
         $('#target').rotatable(params);
-        $('#target2').rotatable(params); $('#draggable2').draggable();
-        $('#target3').resizable().rotatable(params); $('#draggable3').draggable();
+        $('#target2').rotatable(); $('#draggable2').draggable();
+        $('#target3').resizable().rotatable(); $('#draggable3').draggable();
         $('#target4').rotatable( {angle: 0.1} );
         $('#target5').rotatable( {handle: $(document.createElement('img')).attr('src', 'alternate_rotate.png')} );
+        $('#target6').rotatable( {snap: true} );
+		
 		});
 	</script>
 </head>
 <body>
 <div id="target" style="width: 250px; border: 1px solid #862dde; padding: 20px; padding-right: 40px">
-  Rotate me!
+  Rotate me! (I have callbacks logging to the console)
 </div>
 <div id="draggable2">
     <div id="target2" style="width: 250px; border: 1px solid #862dde; padding: 20px; padding-right: 40px">
@@ -48,5 +50,8 @@
 <div id="target5" style="width: 250px; border: 1px solid #862dde; padding: 20px; padding-right: 40px; margin-top: 20px">
   I've got a custom handle.
 </div>
+<div id="target6" style="width: 250px; border: 1px solid #862dde; padding: 20px; padding-right: 40px; margin-top: 20px">
+  I snap every 22.5&deg;.
+</div>
 </body>
 </html>
diff --git a/jquery.ui.rotatable.js b/jquery.ui.rotatable.js
@@ -6,7 +6,7 @@ $.widget("ui.rotatable", $.ui.mouse, {
         handle: false,
         angle: false,
         snap: false,
-        steps: 22.5,
+        step: 22.5,
 
         
         rotationCenterX: false, 
@@ -150,7 +150,7 @@ $.widget("ui.rotatable", $.ui.mouse, {
             return false;
         }
         
-        var rotateAngle = this.getRotateAngle();
+        var rotateAngle = this.getRotateAngle(event);
 
         this.performRotation(rotateAngle);
         var previousRotateAngle = this.elementCurrentAngle;
@@ -184,7 +184,7 @@ $.widget("ui.rotatable", $.ui.mouse, {
         return false;
     },
 
-    getRotateAngle: function(){
+    getRotateAngle: function(event){
 
         var center = this.getElementCenter();
         
@@ -199,7 +199,7 @@ $.widget("ui.rotatable", $.ui.mouse, {
             var rotateDegrees = ( ( rotateAngle / Math.PI ) * 180 );
 
             //round to nearest step
-            rotateDegrees = Math.round( rotateDegrees / this.options.steps ) * this.options.steps;
+            rotateDegrees = Math.round( rotateDegrees / this.options.step ) * this.options.step;
 
             //convert it back to radians
             rotateAngle = ( rotateDegrees * Math.PI ) / 180;
diff --git a/jquery.ui.rotatable.min.js b/jquery.ui.rotatable.min.js
