Skip to content

Commit deaf6d0

Browse files
cheneechenee
committed
tmp ,not ok
1 parent da2e530 commit deaf6d0

5 files changed

Lines changed: 41 additions & 32 deletions

File tree

‎Classes/JSContext+JavaScriptBridge.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ -(void)addCreator
6464
return anInstance;
6565
};
6666

67-
self[@"create_StyleReuseIdentifier"] = ^(NSString *className,NSInteger styleID,NSString* identifier){
67+
self[@"create_withStyleReuseIdentifier"] = ^(NSString *className,NSInteger styleID,NSString* identifier){
6868
Class aClass = NSClassFromString(className);
6969
id anInstance;
7070
anInstance = [[aClass alloc]initWithStyle:styleID reuseIdentifier:identifier];

‎Examples/UICatalog/UICatalog/AppDelegate.m‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
1919
NSString *script = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil];
2020

2121
JSContext *context = [JSBScriptingSupport globalContext];
22-
[context addScriptingSupport:@"AssetsLibrary"];
23-
[context addScriptingSupport:@"Accounts"];
24-
[context addScriptingSupport:@"Social"];
25-
[context addScriptingSupport:@"MapKit"];
22+
// [context addScriptingSupport:@"AssetsLibrary"];
23+
// [context addScriptingSupport:@"Accounts"];
24+
// [context addScriptingSupport:@"Social"];
25+
// [context addScriptingSupport:@"MapKit"];
26+
2627
// [context addScriptingSupport:@"SpriteKit"];
2728
[context evaluateScript:script];
2829

‎Examples/UICatalog/UICatalog/js/buttonsViewController.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var ButtonsViewController = JSB.defineClass('ButtonsViewController : UITableViewController', {
22
viewDidLoad: function() {
33
self.newButton = function(title, target, selector, frame, image, imagePressed, darkTextColor) {
4-
var button = UIButton.alloc().initWithFrame(frame);
4+
// var button = UIButton.alloc().initWithFrame(frame);
5+
var button = create_withFrame('UIButton',frame);
56

67
button.contentVerticalAlignment = 0;
78
button.contentHorizontalAlignment = 0;
@@ -79,7 +80,8 @@ var ButtonsViewController = JSB.defineClass('ButtonsViewController : UITableView
7980
},
8081
tableViewCellForRowAtIndexPath: function(tableView, indexPath) {
8182
if (indexPath.row == 0) {
82-
var cell = UITableViewCell.alloc().initWithStyleReuseIdentifier(0, 'DisplayCellID');
83+
// var cell = UITableViewCell.alloc().initWithStyleReuseIdentifier(0, 'DisplayCellID');
84+
var cell = create_withStyleReuseIdentifier('UITableViewCell',0,'DisplayCellID');
8385
cell.selectionStyle = 0;
8486

8587
var viewToRemove = null;
@@ -101,7 +103,8 @@ var ButtonsViewController = JSB.defineClass('ButtonsViewController : UITableView
101103

102104
return cell;
103105
} else {
104-
var cell = UITableViewCell.alloc().initWithStyleReuseIdentifier(0, 'SourceCellID');
106+
// var cell = UITableViewCell.alloc().initWithStyleReuseIdentifier(0, 'SourceCellID');
107+
var cell = create_withStyleReuseIdentifier('UITableViewCell',0,'DisplayCellID');
105108
cell.selectionStyle = 0;
106109

107110
cell.textLabel.opaque = false;

‎Examples/UICatalog/UICatalog/js/main.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
var MainViewController = JSB.require('mainViewController');
1+
//var MainViewController = JSB.require('mainViewController');
2+
var ButtonsViewController = JSB.require('buttonsViewController');
23

34
var bounds = UIScreen.mainScreen().bounds;
5+
46
//var window = UIWindow.alloc().initWithFrame(bounds);
57
var window = create_withFrame('UIWindow',bounds);
6-
window.backgroundColor = UIColor.whiteColor();
8+
9+
//window.backgroundColor = UIColor.whiteColor();
10+
window.backgroundColor = UIColor.redColor();
711

812
var navigationController = UINavigationController.new();
913

10-
var mainViewController = MainViewController.new();
14+
//var mainViewController = MainViewController.new();
15+
var mainViewController = ButtonsViewController.new();
1116
navigationController.viewControllers = [mainViewController];
1217

1318
window.rootViewController = navigationController;

‎Examples/UICatalog/UICatalog/js/mainViewController.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
var ButtonsViewController = JSB.require('buttonsViewController');
2-
var ControlsViewController = JSB.require('controlsViewController');
3-
var TwitterViewController = JSB.require('twitterViewController');
4-
var CollectionViewController = JSB.require('collectionViewController');
5-
var WebViewController = JSB.require('webViewController');
6-
var MapViewController = JSB.require('mapViewController');
7-
var GestureViewController = JSB.require('gestureViewController');
8-
var GradientViewController = JSB.require('gradientViewController');
2+
//var ControlsViewController = JSB.require('controlsViewController');
3+
//var TwitterViewController = JSB.require('twitterViewController');
4+
//var CollectionViewController = JSB.require('collectionViewController');
5+
//var WebViewController = JSB.require('webViewController');
6+
//var MapViewController = JSB.require('mapViewController');
7+
//var GestureViewController = JSB.require('gestureViewController');
8+
//var GradientViewController = JSB.require('gradientViewController');
9+
910
//var SpritesViewController = JSB.require('spritesViewController');
1011

1112
var MainViewController = JSB.defineClass('MainViewController : UITableViewController', {
@@ -17,18 +18,18 @@ var MainViewController = JSB.defineClass('MainViewController : UITableViewContro
1718
explanation: 'Various uses of UIButton',
1819
// viewController: ButtonsViewController.alloc().initWithStyle(1)
1920
viewController: create_withStyle('ButtonsViewController',1)
20-
},
21-
{
22-
title: 'Controls',
23-
explanation: 'Various uses of UIControl',
24-
// viewController: ControlsViewController.alloc().initWithStyle(1)
25-
viewController: create_withStyle('ControlsViewController',1)
26-
},
27-
{
28-
title: 'Table View',
29-
explanation: 'Use of UITableView',
30-
// viewController: TwitterViewController.alloc().init()
31-
viewController: TwitterViewController.new()
21+
// },
22+
// {
23+
// title: 'Controls',
24+
// explanation: 'Various uses of UIControl',
25+
//// viewController: ControlsViewController.alloc().initWithStyle(1)
26+
// viewController: create_withStyle('ControlsViewController',1)
27+
// },
28+
// {
29+
// title: 'Table View',
30+
// explanation: 'Use of UITableView',
31+
//// viewController: TwitterViewController.alloc().init()
32+
// viewController: TwitterViewController.new()
3233
// },
3334
// {
3435
// title: 'Collection View',
@@ -66,9 +67,8 @@ var MainViewController = JSB.defineClass('MainViewController : UITableViewContro
6667
return self.menuList.length;
6768
},
6869
tableViewCellForRowAtIndexPath: function(tableView, indexPath) {
69-
create_StyleReuseIdentifier
7070
// var cell = UITableViewCell.alloc().initWithStyleReuseIdentifier(3, 'Cell');
71-
var cell = create_StyleReuseIdentifier('UITableViewCell',3, 'Cell');
71+
var cell = create_withStyleReuseIdentifier('UITableViewCell',3, 'Cell');
7272

7373
cell.accessoryType = 1;
7474
cell.textLabel.text = self.menuList[indexPath.row]['title'];

0 commit comments

Comments
 (0)