Skip to content

Commit 4887293

Browse files
authored
Update js code to latest Emscripten (3.1.55). (#59)
Update .gitignore.
1 parent 6cff769 commit 4887293

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Thumbs.db
55
*.pem
66
.gradle
77
facebook/libhelper/android/build/**
8+
*.der

facebook/lib/web/library_facebook.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var LibraryFacebook = {
6868
}
6969
}
7070

71-
var buf = allocate(intArrayFromString(access_token), ALLOC_STACK);
71+
var buf = stringToUTF8OnStack(access_token);
7272
{{{ makeDynCall('vii', 'callback') }}}(lua_state, buf);
7373
} else {
7474
{{{ makeDynCall('vii', 'callback') }}}(lua_state, 0);
@@ -90,10 +90,10 @@ var LibraryFacebook = {
9090
var e = (response && response.error ? response.error.message : 0);
9191
if(e == 0) {
9292
var res_data = JSON.stringify(response);
93-
var res_buf = allocate(intArrayFromString(res_data), ALLOC_STACK);
93+
var res_buf = stringToUTF8OnStack(res_data);
9494
{{{ makeDynCall('viii', 'callback') }}}(lua_state, res_buf, e);
9595
} else {
96-
var error = allocate(intArrayFromString(e), ALLOC_STACK);
96+
var error = stringToUTF8OnStack(e);
9797
{{{ makeDynCall('viii', 'callback') }}}(lua_state, 0, error);
9898
}
9999
});
@@ -160,19 +160,19 @@ var LibraryFacebook = {
160160

161161
window._dmFacebookUpdatePermissions(function (_error, _permissions) {
162162
if (_error == 0) {
163-
var permissionsbuf = allocate(intArrayFromString(_permissions), ALLOC_STACK);
163+
var permissionsbuf = stringToUTF8OnStack(_permissions);
164164
{{{ makeDynCall('viiii', 'callback') }}}(thread, state_open, 0, permissionsbuf);
165165
} else {
166-
var errbuf = allocate(intArrayFromString(_error), ALLOC_STACK);
166+
var errbuf = stringToUTF8OnStack(_error);
167167
{{{ makeDynCall('viiii', 'callback') }}}(thread, state_failed, errbuf, 0);
168168
}
169169
});
170170
} else if (error != 0) {
171-
var errbuf = allocate(intArrayFromString(error), ALLOC_STACK);
171+
var errbuf = stringToUTF8OnStack(error);
172172
{{{ makeDynCall('viiii', 'callback') }}}(thread, state_closed, errbuf, 0);
173173
} else {
174174
var errmsg = "Login was cancelled";
175-
var errbuf = allocate(intArrayFromString(errmsg), ALLOC_STACK);
175+
var errbuf = stringToUTF8OnStack(errmsg);
176176
{{{ makeDynCall('viiii', 'callback') }}}(thread, state_failed, errbuf, 0);
177177
}
178178
}, opts);
@@ -183,4 +183,4 @@ var LibraryFacebook = {
183183
}
184184

185185
autoAddDeps(LibraryFacebook, '$FBinner');
186-
mergeInto(LibraryManager.library, LibraryFacebook);
186+
addToLibrary(LibraryFacebook);

0 commit comments

Comments
 (0)