Skip to content
Browse files

Merge branch 'refs/heads/sdk2_0'

Conflicts:
	Classes/TiUIView+GestureRecognizer.m
  • Loading branch information...
2 parents d381723 + 4217ebe commit 7f26dfa9ebdd33d981915faea25da012b78b2aa5 @atsusy committed Apr 19, 2012
Showing with 4 additions and 5 deletions.
  1. +2 −3 Classes/TiUIView+GestureRecognizer.m
  2. +1 −1 example/app.js
  3. +1 −1 manifest
View
5 Classes/TiUIView+GestureRecognizer.m
@@ -147,11 +147,11 @@ - (void)handlePinchGesture:(UIPinchGestureRecognizer *)sender
if(sender.state == UIGestureRecognizerStateEnded &&
[self.proxy _hasListeners:@"pinchingend"]){
- [self.proxy fireEvent:@"pincingend"];
+ [self.proxy fireEvent:@"pinchingend"];
}
}
-- (void)setPinchGesture_:(id)value
+- (void)setPinchingGesture_:(id)value
{
ENSURE_SINGLE_ARG(value, NSNumber);
BOOL value_ = [value boolValue];
@@ -163,7 +163,6 @@ - (void)setPinchGesture_:(id)value
}
}
-
UIPinchGestureRecognizer *pinchGesture =[[UIPinchGestureRecognizer alloc] initWithTarget:self
action:@selector(handlePinchGesture:)];
View
2 example/app.js
@@ -18,7 +18,7 @@ var image = Ti.UI.createImageView({
image:"toby.jpg",
recognizeSimultaneously:"pinching,rotate",
rotateGesture:true,
- pinchGesture:true,
+ pinchingGesture:true,
panGesture:true
});
var lastAngle = 0.0;
View
2 manifest
@@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
-version: 1.2
+version: 2.0
description: Support Rotate and Pinch-in/out gesture to View.
author: KATAOKA,Atsushi
license: MIT License

0 comments on commit 7f26dfa

Please sign in to comment.
Something went wrong with that request. Please try again.