Fix not to assign self on some table view delegate methods.

kishikawakatsumi · kishikawakatsumi · commit 893b8eaaa58f · 2014-02-01T02:37:41.000+09:00
diff --git a/Classes/Private/JSBMessageForwarding.m b/Classes/Private/JSBMessageForwarding.m
@@ -218,7 +218,13 @@ CGFloat tableViewHeightForRowAtIndexPath(id self, SEL _cmd, UITableView *tableVi
     JSValue *function = context[mangledNameFromClass(object_getClass(self))][JSBInstanceMembersKey][propertyName];
     
     if (!function.isUndefined) {
+        id currentSelf = context[@"self"];
+        context[@"self"] = self;
+        
         JSValue *returnValue = [function callWithArguments:@[tableView, indexPath]];
+        
+        context[@"self"] = currentSelf;
+        
         return returnValue.toDouble;
     }
     
@@ -233,7 +239,13 @@ CGFloat tableViewHeightForHeaderInSection(id self, SEL _cmd, UITableView *tableV
     JSValue *function = context[mangledNameFromClass(object_getClass(self))][JSBInstanceMembersKey][propertyName];
     
     if (!function.isUndefined) {
+        id currentSelf = context[@"self"];
+        context[@"self"] = self;
+        
         JSValue *returnValue = [function callWithArguments:@[tableView, @(section)]];
+        
+        context[@"self"] = currentSelf;
+        
         return returnValue.toDouble;
     }
     
@@ -248,7 +260,13 @@ CGFloat tableViewHeightForFooterInSection(id self, SEL _cmd, UITableView *tableV
     JSValue *function = context[mangledNameFromClass(object_getClass(self))][JSBInstanceMembersKey][propertyName];
     
     if (!function.isUndefined) {
+        id currentSelf = context[@"self"];
+        context[@"self"] = self;
+        
         JSValue *returnValue = [function callWithArguments:@[tableView, @(section)]];
+        
+        context[@"self"] = currentSelf;
+        
         return returnValue.toDouble;
     }
     
diff --git a/Examples/UICatalog/UICatalog/UICatalog-Info.plist b/Examples/UICatalog/UICatalog/UICatalog-Info.plist
@@ -31,6 +31,8 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/Examples/UICatalog/UICatalog/js/twitterViewController.js b/Examples/UICatalog/UICatalog/js/twitterViewController.js
@@ -1,17 +1,21 @@
 var TwitterCell = JSB.defineClass('TwitterCell : UITableViewCell', {
   initWithStyleReuseIdentifier: function(style, reuseIdentifier) {
+    self.autoresizingMask = (1 << 1 | 1 << 4);
+
     self.iconImageView = UIImageView.alloc().initWithFrame({x: 8, y: 8, width: 40, height: 40});
     self.iconImageView.tag = 1;
     self.contentView.addSubview(self.iconImageView);
 
     self.usernameLabel = UILabel.new();
+    self.usernameLabel.autoresizingMask = (1 << 1);
     self.usernameLabel.frame = {x: 56, y: 2, width: 254, height: 18};
     self.usernameLabel.font = UIFont.systemFontOfSize(12);
     self.usernameLabel.textColor = UIColor.lightGrayColor();
     self.usernameLabel.tag = 2;
     self.contentView.addSubview(self.usernameLabel);
 
     self.tweetLabel = UILabel.new();
+    self.tweetLabel.autoresizingMask = (1 << 1 | 1 << 4);
     self.tweetLabel.frame = {x: 56, y: 20, width: 254, height: 40};
     self.tweetLabel.font = UIFont.systemFontOfSize(14);
     self.tweetLabel.textColor = UIColor.blackColor();
@@ -28,6 +32,7 @@ var TwitterViewController = JSB.defineClass('TwitterViewController : UITableView
     self.timeline = [];
 
     self.sizeLabel = UILabel.alloc().initWithFrame({x: 0, y: 0, width: 268, height: 0});
+    self.sizeLabel.autoresizingMask = (1 << 1 | 1 << 4);
     self.sizeLabel.font = UIFont.systemFontOfSize(14);
     self.sizeLabel.numberOfLines = -1;
 
@@ -84,11 +89,8 @@ var TwitterViewController = JSB.defineClass('TwitterViewController : UITableView
       }
     });
   },
-  shouldAutorotate: function() {
-    return false;
-  },
-  supportedInterfaceOrientations: function() {
-    return 1 << 1;
+  didRotateFromInterfaceOrientation: function(fromInterfaceOrientation) {
+    self.tableView.reloadData();
   },
   numberOfSectionsInTableView: function(tableView) {
     return 1;
@@ -100,7 +102,7 @@ var TwitterViewController = JSB.defineClass('TwitterViewController : UITableView
     var tweet = self.timeline[indexPath.row];
 
     self.sizeLabel.text = tweet['text'];
-    var size = self.sizeLabel.sizeThatFits({width: 254, height: 0});
+    var size = self.sizeLabel.sizeThatFits({width: tableView.bounds.width - 66, height: 0});
 
     return Math.max(size.height + 24, 80);
   },
@@ -116,7 +118,7 @@ var TwitterViewController = JSB.defineClass('TwitterViewController : UITableView
     var tweetLabel = cell.contentView.viewWithTag(3);
     tweetLabel.text = tweet['text'];
     var frame = tweetLabel.frame;
-    frame.width = 254;
+    frame.width = tableView.bounds.width - 66;
     tweetLabel.frame = frame;
     tweetLabel.sizeToFit();
 
