Skip to content

Commit 655e2cb

Browse files
kishikawakatsumikishikawakatsumi
committed
Change define to defineClass (define is still available for compatibility).
1 parent 84faa2b commit 655e2cb

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

‎Classes/JSBScriptingSupport.m‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ + (void)initialize
3535
[globalContext evaluateScript:
3636
@"JSB = (function() {\n"
3737
@" var namespace = {\n"
38+
@" defineClass: function(declaration, instanceMembers, staticMembers) {\n"
39+
@" return __JSB_JSBScriptingSupport.defineClass(declaration, instanceMembers, staticMembers);\n"
40+
@" },\n"
3841
@" define: function(declaration, instanceMembers, staticMembers) {\n"
42+
@" JSB.dump('`define` is deprecated, use `defineClass` instead.');\n"
3943
@" return __JSB_JSBScriptingSupport.defineClass(declaration, instanceMembers, staticMembers);\n"
4044
@" },\n"
4145
@" require: function(name) {\n"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var ButtonsViewController = JSB.define('ButtonsViewController : UITableViewController', {
1+
var ButtonsViewController = JSB.defineClass('ButtonsViewController : UITableViewController', {
22
viewDidLoad: function() {
33
self.newButton = function(title, target, selector, frame, image, imagePressed, darkTextColor) {
44
var button = UIButton.alloc().initWithFrame(frame);

‎Examples/UICatalog/UICatalog/js/collectionViewController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var CollectionViewController = JSB.define('CollectionViewController : UICollectionViewController', {
1+
var CollectionViewController = JSB.defineClass('CollectionViewController : UICollectionViewController', {
22
viewDidLoad: function() {
33
self.navigationItem.title = 'Photo Album';
44

‎Examples/UICatalog/UICatalog/js/controlsViewController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var ControlsViewController = JSB.define('ControlsViewController : UITableViewController', {
1+
var ControlsViewController = JSB.defineClass('ControlsViewController : UITableViewController', {
22
viewDidLoad: function() {
33
self.switchCtl = function() {
44
var frame = {x: 0, y: 12, width: 94, height: 27};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var CollectionViewController = JSB.require('collectionViewController');
55
var WebViewController = JSB.require('webViewController');
66
var MapViewController = JSB.require('mapViewController');
77

8-
var MainViewController = JSB.define('MainViewController : UITableViewController', {
8+
var MainViewController = JSB.defineClass('MainViewController : UITableViewController', {
99
viewDidLoad: function() {
1010
self.navigationItem.title = 'UICatalog';
1111

‎Examples/UICatalog/UICatalog/js/mapViewController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var MapViewController = JSB.define('MapViewController : UIViewController <MKMapViewDelegate>', {
1+
var MapViewController = JSB.defineClass('MapViewController : UIViewController <MKMapViewDelegate>', {
22
viewDidLoad: function() {
33
self.navigationItem.title = 'Map';
44

‎Examples/UICatalog/UICatalog/js/twitterViewController.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var TwitterCell = JSB.define('TwitterCell : UITableViewCell', {
1+
var TwitterCell = JSB.defineClass('TwitterCell : UITableViewCell', {
22
initWithStyleReuseIdentifier: function(style, reuseIdentifier) {
33
self.iconImageView = UIImageView.alloc().initWithFrame({x: 8, y: 8, width: 40, height: 40});
44
self.iconImageView.tag = 1;
@@ -23,7 +23,7 @@ var TwitterCell = JSB.define('TwitterCell : UITableViewCell', {
2323
}
2424
});
2525

26-
var TwitterViewController = JSB.define('TwitterViewController : UITableViewController', {
26+
var TwitterViewController = JSB.defineClass('TwitterViewController : UITableViewController', {
2727
viewDidLoad: function() {
2828
self.timeline = [];
2929

‎Examples/UICatalog/UICatalog/js/webViewController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var WebViewController = JSB.define('WebViewController : UIViewController <UITextFieldDelegate, UIWebViewDelegate>', {
1+
var WebViewController = JSB.defineClass('WebViewController : UIViewController <UITextFieldDelegate, UIWebViewDelegate>', {
22
viewDidLoad: function() {
33
self.navigationItem.title = 'Web';
44

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ See the [UICatalog](https://github.com/kishikawakatsumi/JavaScriptBridge/tree/ma
219219
You can define custom class in JavaScript.
220220
It is needs to interact system provided framework.
221221

222-
`JSB.define(declaration, instanceMembers)` function defines Objective-C class in JavaScript.
222+
`JSB.defineClass(declaration, instanceMembers)` function defines Objective-C class in JavaScript.
223223
Pass the class declaration string to first argument.
224224

225225
Second argument is instance method definitions as hash.
@@ -228,7 +228,7 @@ The hash object inclueds function object, each keys are to be used as method nam
228228
**Example**
229229

230230
```javascript
231-
var MainViewController = JSB.define('MainViewController : UITableViewController', {
231+
var MainViewController = JSB.defineClass('MainViewController : UITableViewController', {
232232
viewDidLoad: function() { // Instance Method Definitions
233233
self.navigationItem.title = 'UICatalog';
234234
},

0 commit comments

Comments
 (0)