Skip to content

Commit a1a6b46

Browse files
author
SeanLin
committed
Merge pull request cocos2d#491 from ricardoquesada/keyboard_fixes
Keypad changes:
2 parents f627638 + 7274831 commit a1a6b46

File tree

10 files changed

+69
-69
lines changed

10 files changed

+69
-69
lines changed

‎cocos2d/CCDirector.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
186186
_scheduler:null,
187187
_actionManager:null,
188188
_touchDispatcher:null,
189-
_keypadDispatcher:null,
189+
_keyboardDispatcher:null,
190190
_accelerometer:null,
191191

192192
_watcherFun:null,
@@ -248,8 +248,8 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
248248
this._touchDispatcher = new cc.TouchDispatcher();
249249
this._touchDispatcher.init();
250250

251-
//KeypadDispatcher
252-
this._keypadDispatcher = cc.KeypadDispatcher.getInstance();
251+
//KeyboardDispatcher
252+
this._keyboardDispatcher = cc.KeyboardDispatcher.getInstance();
253253

254254
//accelerometer
255255
//this._accelerometer = new cc.Accelerometer();
@@ -1115,11 +1115,11 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
11151115
}
11161116
},
11171117

1118-
getKeypadDispatcher:function () {
1119-
return this._keypadDispatcher;
1118+
getKeyboardDispatcher:function () {
1119+
return this._keyboardDispatcher;
11201120
},
1121-
setKeypadDispatcher:function (keypadDispatcher) {
1122-
this._keypadDispatcher = keypadDispatcher;
1121+
setKeyboardDispatcher:function (keyboardDispatcher) {
1122+
this._keyboardDispatcher = keyboardDispatcher;
11231123
},
11241124

11251125
getAccelerometer:function () {

‎cocos2d/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<file name="touch_dispatcher/CCTouchDelegateProtocol.js"/>
6969
<file name="touch_dispatcher/CCTouchHandler.js"/>
7070
<file name="touch_dispatcher/CCTouchDispatcher.js"/>
71-
<file name="keypad_dispatcher/CCKeypadDelegate.js"/>
72-
<file name="keypad_dispatcher/CCKeypadDispatcher.js"/>
71+
<file name="keyboard_dispatcher/CCKeyboardDelegate.js"/>
72+
<file name="keyboard_dispatcher/CCKeyboardDispatcher.js"/>
7373
<file name="text_input_node/CCIMEDispatcher.js"/>
7474
<file name="text_input_node/CCTextFieldTTF.js"/>
7575
<file name="CCDirector.js"/>
@@ -93,4 +93,4 @@
9393
</sources>
9494
</jscomp>
9595
</target>
96-
</project>
96+
</project>

‎cocos2d/keyboard_dispatcher/.CCKeypadDelegate.js.swp‎

12 KB
Binary file not shown.

‎cocos2d/keyboard_dispatcher/.CCKeypadDispatcher.js.swp‎

20 KB
Binary file not shown.

‎cocos2d/keypad_dispatcher/CCKeypadDelegate.js‎ renamed to ‎cocos2d/keyboard_dispatcher/CCKeyboardDelegate.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,50 +26,50 @@
2626

2727

2828
/**
29-
* you must extend the keypadDelegate and
29+
* you must extend the keyboardDelegate and
3030
* implement your own game logic in
3131
* keydown and keyup functions
3232
* @class
3333
* @extends cc.Class
3434
*/
35-
cc.KeypadDelegate = cc.Class.extend(/** @lends cc.KeypadDelegate# */{
35+
cc.KeyboardDelegate = cc.Class.extend(/** @lends cc.KeyboardDelegate# */{
3636
/**
3737
* Call back when a key is pressed down
3838
*/
39-
keyDown:function () {
39+
onKeyDown:function () {
4040
},
4141

4242
/**
4343
* Call back when a key is released
4444
*/
45-
keyUp:function () {
45+
onKeyUp:function () {
4646
}
4747
});
4848

4949
/**
50-
* KeypadHandler is an object that contains KeypadDelegate
50+
* KeyboardHandler is an object that contains KeyboardDelegate
5151
* @class
5252
* @extends cc.Class
5353
*/
54-
cc.KeypadHandler = cc.Class.extend(/** @lends cc.KeypadHandler# */{
54+
cc.KeyboardHandler = cc.Class.extend(/** @lends cc.KeyboardHandler# */{
5555
/**
56-
* returns the keypad delegate
57-
* @return {cc.KeypadDelegate}
56+
* returns the keyboard delegate
57+
* @return {cc.KeyboardDelegate}
5858
*/
5959
getDelegate:function () {
6060
return this._delegate;
6161
},
6262

6363
/**
64-
* set the keypad delegate
65-
* @param {cc.KeypadDelegate} delegate
64+
* set the keyboard delegate
65+
* @param {cc.KeyboardDelegate} delegate
6666
*/
6767
setDelegate:function (delegate) {
6868
this._delegate = delegate;
6969
},
7070
/**
71-
* initializes a cc.KeypadHandler with a delegate
72-
* @param {cc.KeypadDelegate} delegate
71+
* initializes a cc.KeyboardHandler with a delegate
72+
* @param {cc.KeyboardDelegate} delegate
7373
* @return {Boolean}
7474
*/
7575
initWithDelegate:function (delegate) {
@@ -82,12 +82,12 @@ cc.KeypadHandler = cc.Class.extend(/** @lends cc.KeypadHandler# */{
8282
_delegate:null
8383
});
8484
/**
85-
* Create a KeypadHandler with KeypadDelegate
85+
* Create a KeyboardHandler with KeyboardDelegate
8686
* @param delegate
87-
* @return {cc.KeypadHandler}
87+
* @return {cc.KeyboardHandler}
8888
*/
89-
cc.KeypadHandler.create = function (delegate) {
90-
var handler = new cc.KeypadHandler();
89+
cc.KeyboardHandler.create = function (delegate) {
90+
var handler = new cc.KeyboardHandler();
9191
handler.initWithDelegate(delegate);
9292
return handler;
9393
};

‎cocos2d/keypad_dispatcher/CCKeypadDispatcher.js‎ renamed to ‎cocos2d/keyboard_dispatcher/CCKeyboardDispatcher.js‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ cc.KEY = {
164164
};
165165

166166
/**
167-
* Dispatch the keypad message
167+
* Dispatch the keyboard message
168168
* @class
169169
* @extends cc.Class
170170
*/
171-
cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
171+
cc.KeyboardDispatcher = cc.Class.extend(/** @lends cc.KeyboardDispatcher# */{
172172
/**
173-
* add delegate to concern keypad msg
174-
* @param {cc.KeypadDelegate} delegate keypad delegate object
173+
* add delegate to concern keyboard msg
174+
* @param {cc.KeyboardDelegate} delegate keyboard delegate object
175175
*/
176176
addDelegate:function (delegate) {
177177
if (!delegate) {
@@ -187,8 +187,8 @@ cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
187187
},
188188

189189
/**
190-
* remove the delegate from the delegates who concern keypad msg
191-
* @param {cc.KeypadDelegate} delegate
190+
* remove the delegate from the delegates who concern keyboard msg
191+
* @param {cc.KeyboardDelegate} delegate
192192
*/
193193
removeDelegate:function (delegate) {
194194
if (!delegate) {
@@ -205,10 +205,10 @@ cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
205205

206206
/**
207207
* force add the delegate
208-
* @param {cc.KeypadDelegate} delegate
208+
* @param {cc.KeyboardDelegate} delegate
209209
*/
210210
forceAddDelegate:function (delegate) {
211-
var handler = cc.KeypadHandler.create(delegate);
211+
var handler = cc.KeyboardHandler.create(delegate);
212212
if (handler) {
213213
//if handler already exist
214214
for (var i = 0; i < this._delegates; i++) {
@@ -221,7 +221,7 @@ cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
221221

222222
/**
223223
* force remove the delegate
224-
* @param {cc.KeypadDelegate} delegate
224+
* @param {cc.KeyboardDelegate} delegate
225225
*/
226226
forceRemoveDelegate:function (delegate) {
227227
for (var i = 0; i < this._delegates.length; i++) {
@@ -233,12 +233,12 @@ cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
233233
},
234234

235235
/**
236-
* dispatch the keypad message to the delegates
236+
* dispatch the keyboard message to the delegates
237237
* @param {event} e
238238
* @param {Boolean} keydown whether this is a keydown or keyup
239239
* @return {Boolean}
240240
*/
241-
dispatchKeypadMSG:function (e, keydown) {
241+
dispatchKeyboardMSG:function (e, keydown) {
242242
this._locked = true;
243243
e.stopPropagation();
244244
e.preventDefault();
@@ -247,13 +247,13 @@ cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
247247
{
248248
//execute all deletegate that registered a keyboard event
249249
for (var i = 0; i < this._delegates.length; i++) {
250-
this._delegates[i].getDelegate().keyDown(e.keyCode);
250+
this._delegates[i].getDelegate().onKeyDown(e.keyCode);
251251
}
252252
}
253253
else if (!keydown && e)//if keyup and our keymap have that key in it
254254
{
255255
for (var i = 0; i < this._delegates.length; i++) {
256-
this._delegates[i].getDelegate().keyUp(e.keyCode);
256+
this._delegates[i].getDelegate().onKeyUp(e.keyCode);
257257
}
258258
}
259259
this._locked = false;
@@ -286,33 +286,33 @@ cc.KeypadDispatcher = cc.Class.extend(/** @lends cc.KeypadDispatcher# */{
286286
});
287287

288288
/**
289-
* Returns the shared cc.KeypadDispatcher object for the system.
290-
* @return {cc.keypadDispatcher}
289+
* Returns the shared cc.KeyboardDispatcher object for the system.
290+
* @return {cc.keyboardDispatcher}
291291
*/
292-
cc.KeypadDispatcher.getInstance = function () {
293-
if (!cc.keypadDispatcher) {
294-
cc.keypadDispatcher = new cc.KeypadDispatcher();
292+
cc.KeyboardDispatcher.getInstance = function () {
293+
if (!cc.keyboardDispatcher) {
294+
cc.keyboardDispatcher = new cc.KeyboardDispatcher();
295295
//make canvas focusable
296296
cc.canvas.setAttribute('contentEditable', true);
297297
cc.canvas.style.outline = 'none';
298298
cc.canvas.style.cursor = 'default';
299299
cc.canvas.addEventListener("keydown", function (e) {
300-
cc.keypadDispatcher.dispatchKeypadMSG(e, true);
300+
cc.keyboardDispatcher.dispatchKeyboardMSG(e, true);
301301
cc.IMEDispatcher.getInstance().processKeycode(e.keyCode);
302302
});
303303
cc.canvas.addEventListener("keyup", function (e) {
304-
cc.keypadDispatcher.dispatchKeypadMSG(e, false);
304+
cc.keyboardDispatcher.dispatchKeyboardMSG(e, false);
305305
});
306306
}
307-
return cc.keypadDispatcher;
307+
return cc.keyboardDispatcher;
308308
};
309309

310310
/**
311-
* Release the shared cc.KeypadDispatcher object from the system.
311+
* Release the shared cc.KeyboardDispatcher object from the system.
312312
*/
313-
cc.KeypadDispatcher.purgeSharedDispatcher = function () {
314-
if (cc.keypadDispatcher) {
315-
delete cc.keypadDispatcher;
316-
cc.keypadDispatcher = null;
313+
cc.KeyboardDispatcher.purgeSharedDispatcher = function () {
314+
if (cc.keyboardDispatcher) {
315+
delete cc.keyboardDispatcher;
316+
cc.keyboardDispatcher = null;
317317
}
318318
};

‎cocos2d/layers_scenes_transitions_nodes/CCLayer.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
3535
_isTouchEnabled:false,
3636
_isAccelerometerEnabled:false,
37-
_isKeypadEnabled:false,
37+
_isKeyboardEnabled:false,
3838

3939
/**
4040
* Constructor
@@ -134,28 +134,28 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
134134
},
135135

136136
/**
137-
* whether or not it will receive keypad events<br/>
137+
* whether or not it will receive keyboard events<br/>
138138
* You can enable / disable accelerometer events with this property.<br/>
139139
* it's new in cocos2d-x
140140
* @return {Boolean}
141141
*/
142-
isKeypadEnabled:function () {
143-
return this._isKeypadEnabled;
142+
isKeyboardEnabled:function () {
143+
return this._isKeyboardEnabled;
144144
},
145145

146146
/**
147147
* Enable Keyboard interaction
148148
* @param {Boolean} enabled
149149
*/
150-
setKeypadEnabled:function (enabled) {
151-
if (enabled != this._isKeypadEnabled) {
152-
this._isKeypadEnabled = enabled;
150+
setKeyboardEnabled:function (enabled) {
151+
if (enabled != this._isKeyboardEnabled) {
152+
this._isKeyboardEnabled = enabled;
153153
if (this._isRunning) {
154154
var director = cc.Director.getInstance();
155155
if (enabled) {
156-
director.getKeypadDispatcher().addDelegate(this);
156+
director.getKeyboardDispatcher().addDelegate(this);
157157
} else {
158-
director.getKeypadDispatcher().removeDelegate(this);
158+
director.getKeyboardDispatcher().removeDelegate(this);
159159
}
160160
}
161161
}
@@ -181,8 +181,8 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
181181
}
182182

183183
// add this layer to concern the kaypad msg
184-
if (this._isKeypadEnabled) {
185-
director.getKeypadDispatcher().addDelegate(this);
184+
if (this._isKeyboardEnabled) {
185+
director.getKeyboardDispatcher().addDelegate(this);
186186
}
187187
},
188188

@@ -201,8 +201,8 @@ cc.Layer = cc.Node.extend(/** @lends cc.Layer# */{
201201
}
202202

203203
// remove this layer from the delegates who concern the kaypad msg
204-
if (this._isKeypadEnabled) {
205-
director.getKeypadDispatcher().removeDelegate(this);
204+
if (this._isKeyboardEnabled) {
205+
director.getKeyboardDispatcher().removeDelegate(this);
206206
}
207207

208208
this._super();

‎cocos2d/platform/jsloader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ var cc = cc || cc || {};
8282
'touch_dispatcher/CCTouchDelegateProtocol.js',
8383
'touch_dispatcher/CCTouchHandler.js',
8484
'touch_dispatcher/CCTouchDispatcher.js',
85-
'keypad_dispatcher/CCKeypadDelegate.js',
86-
'keypad_dispatcher/CCKeypadDispatcher.js',
85+
'keyboard_dispatcher/CCKeyboardDelegate.js',
86+
'keyboard_dispatcher/CCKeyboardDispatcher.js',
8787
'text_input_node/CCIMEDispatcher.js',
8888
'text_input_node/CCTextFieldTTF.js',
8989
'CCDirector.js',

‎cocos2d/text_input_node/CCIMEDispatcher.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ cc.IMEDispatcher.Impl = cc.Class.extend(/** @lends cc.IMEDispatcher.Impl# */{
422422
cc.IMEDispatcher.getInstance = function () {
423423
if (!cc.IMEDispatcher.instance) {
424424
cc.IMEDispatcher.instance = new cc.IMEDispatcher();
425-
cc.KeypadDispatcher.getInstance();
425+
cc.KeyboardDispatcher.getInstance();
426426
}
427427
return cc.IMEDispatcher.instance;
428428
};

‎tests/src/testbasic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ var testNames = [
210210
return new IntervalTestScene();
211211
}
212212
},
213-
//"KeypadTest",
213+
//"KeyboardTest",
214214
{
215215
title:"LabelTest",
216216
testScene:function () {

0 commit comments

Comments
 (0)