Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates jsbindings and localStorage.

This commit is contained in:
James Chen 2014-01-20 22:45:40 +08:00
parent b6be58482a
commit e5f723774d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cocos/scripting/javascript/bindings/localstorage/js_bindings_system_functions.cpp
View File

@ -24,15 +24,15 @@ JSBool JSB_localStorageGetItem(JSContext *cx, uint32_t argc, jsval *vp) {
JSB_PRECONDITION2( argc == 1, cx, JS_FALSE, "Invalid number of arguments" ); JSB_PRECONDITION2( argc == 1, cx, JS_FALSE, "Invalid number of arguments" );
jsval *argvp = JS_ARGV(cx,vp); jsval *argvp = JS_ARGV(cx,vp);
JSBool ok = JS_TRUE; JSBool ok = JS_TRUE;
const char* arg0; std::string arg0;
ok &= jsval_to_charptr( cx, *argvp++, &arg0 ); ok &= jsval_to_std_string( cx, *argvp++, &arg0 );
JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments"); JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments");
const char* ret_val; std::string ret_val;
ret_val = localStorageGetItem((char*)arg0 ); ret_val = localStorageGetItem(arg0);
jsval ret_jsval = c_string_to_jsval(cx, ret_val ? ret_val : ""); jsval ret_jsval = std_string_to_jsval(cx, ret_val);
JS_SET_RVAL(cx, vp, ret_jsval ); JS_SET_RVAL(cx, vp, ret_jsval );
return JS_TRUE; return JS_TRUE;
@ -44,12 +44,12 @@ JSBool JSB_localStorageRemoveItem(JSContext *cx, uint32_t argc, jsval *vp) {
JSB_PRECONDITION2( argc == 1, cx, JS_FALSE, "Invalid number of arguments" ); JSB_PRECONDITION2( argc == 1, cx, JS_FALSE, "Invalid number of arguments" );
jsval *argvp = JS_ARGV(cx,vp); jsval *argvp = JS_ARGV(cx,vp);
JSBool ok = JS_TRUE; JSBool ok = JS_TRUE;
const char* arg0; std::string arg0;
ok &= jsval_to_charptr( cx, *argvp++, &arg0 ); ok &= jsval_to_std_string( cx, *argvp++, &arg0 );
JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments"); JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments");
localStorageRemoveItem((char*)arg0 ); localStorageRemoveItem(arg0);
JS_SET_RVAL(cx, vp, JSVAL_VOID); JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE; return JS_TRUE;
} }
@ -60,13 +60,13 @@ JSBool JSB_localStorageSetItem(JSContext *cx, uint32_t argc, jsval *vp) {
JSB_PRECONDITION2( argc == 2, cx, JS_FALSE, "Invalid number of arguments" ); JSB_PRECONDITION2( argc == 2, cx, JS_FALSE, "Invalid number of arguments" );
jsval *argvp = JS_ARGV(cx,vp); jsval *argvp = JS_ARGV(cx,vp);
JSBool ok = JS_TRUE; JSBool ok = JS_TRUE;
const char* arg0; const char* arg1; std::string arg0; std::string arg1;
ok &= jsval_to_charptr( cx, *argvp++, &arg0 ); ok &= jsval_to_std_string( cx, *argvp++, &arg0 );
ok &= jsval_to_charptr( cx, *argvp++, &arg1 ); ok &= jsval_to_std_string( cx, *argvp++, &arg1 );
JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments"); JSB_PRECONDITION2(ok, cx, JS_FALSE, "Error processing arguments");
localStorageSetItem((char*)arg0 , (char*)arg1 ); localStorageSetItem(arg0 , arg1);
JS_SET_RVAL(cx, vp, JSVAL_VOID); JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE; return JS_TRUE;
} }

2
cocos/storage/local-storage/LocalStorageAndroid.cpp
View File

@ -54,7 +54,7 @@ static void splitFilename (std::string& str)
void localStorageInit( const std::string& fullpath) void localStorageInit( const std::string& fullpath)
{ {
if (fullpath.emty()) if (fullpath.empty())
return; return;
if( ! _initialized ) if( ! _initialized )