Commit Graph

45 Commits

Author SHA1 Message Date
James Chen 4da873ecb8 Merge branch 'v1.8' into develop
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
2018-02-23 10:26:48 +08:00
James Chen a195bffcad Ignore infinite loop in Exception handling. (#1110) 2018-02-11 13:54:37 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen d2462a8c7f Fixes apple reject apps reference JSSynchronousGarbageCollectForDebugging (#980) 2017-11-12 09:18:07 +08:00
James Chen 036a0a21da Moves retain/release code from se::ScriptEngine to ScriptingCore. 2017-11-02 11:44:48 +08:00
James Chen 6a9500df10 LOGD -> SE_LOGD, LOGE -> SE_LOGE to avoid conflict with user code. 2017-11-02 11:35:53 +08:00
James Chen 7e8d222087 reverts console.log binding. 2017-10-25 19:57:10 +08:00
James Chen a226766979 Fixes console.log on iOS 8 ~ 9. 2017-10-25 17:34:52 +08:00
James Chen df2c482314 Adds license info for .h/.cpp files in jswrapper. 2017-10-24 15:56:37 +08:00
James Chen 1173b2931b Pass wrong message in console.log to browser's console. 2017-10-24 10:05:24 +08:00
James Chen f63aa25170 Fixes console.assert 2017-10-17 15:44:49 +08:00
James Chen c195c82c2f Improves native window.console support. Message could be shown both in Browser while debugging and Creator's console.
The line number of console.log(debug,info,warn,error) output in browser is precise.
2017-10-17 15:41:00 +08:00
James Chen 7cc33615c3 Fix source url is too long. 2017-10-10 16:15:16 +08:00
James Chen c625158e74 Moves cocos2d-x node:onEnter/onExit binding code from se::ScriptEngine to ScriptingCore. 2017-10-09 15:25:10 +08:00
James Chen 9bbc052444 se::ScriptEngine::enableDebugger takes serverAddr and port arguments. 2017-10-09 15:00:04 +08:00
James Chen 8230176ccb Fixes crash while click restart button in network test. (#829)
* Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11.

* Fixes crash while click `restart` button in network test.

* printf -> LOGD

* Memory leak fix in XMLHttpRequest binding code.
2017-09-20 01:48:15 -05:00
James Chen 9dafab9c49 macOS and iOS use JavaScriptCore, windows and android use V8. 2017-09-18 16:11:50 +08:00
James Chen 5eba72627a [jsb2.0] SpiderMonkey debugger works. Adds ScriptEngine::enableDebugger, mainLoopUpdate interfaces. 2017-09-07 18:19:38 +08:00
James Chen 4df2b69d2f For compatibility purpose, __errorHandler has 4 parameters, they are filePath, lineno, message, stack. 2017-09-06 16:08:16 +08:00
James Chen ad13e5336b Adds global variable scriptEngineType. 2017-09-06 11:11:37 +08:00
James Chen 269f65fd85 [JSC] Exception info contains location, message, stack. Location contains filePath, line number and column number. 2017-09-06 10:58:43 +08:00
James Chen cd77d4b567 Updates log format for jsc. 2017-09-01 15:23:43 +08:00
James Chen 3af1a24682 Adds setExceptionCallback for JSC. 2017-09-01 15:10:48 +08:00
James Chen 6c40f2783f More renames: gc -> garbageCollect, isInGC -> isGarbageCollecting, _setInGC -> _setGarbageCollecting 2017-08-31 15:52:58 +08:00
James Chen f21fea4344 executeScriptBuffer -> evalString, executeScriptFile -> runScript. 2017-08-31 15:00:23 +08:00
James Chen 53250dad49 se::Ref -> se::RefCounter, addRef -> incRef, release -> decRef
This is for distinguishing from cocos2d::Ref.
2017-08-31 14:24:34 +08:00
James Chen df01303041 attachChild -> attachObject, detachChild -> detachObject, isSame -> strictEquals 2017-08-31 10:33:17 +08:00
James Chen 17a98a41f1 more log in ScriptEngine. 2017-08-29 17:37:32 +08:00
James Chen 2f38e872c1 Action binding bug fix. 2017-08-22 16:50:41 +08:00
James Chen 7268053a4f SpiderMonkey bytecode works again. 2017-08-21 18:10:10 +08:00
James Chen 41eae72bd8 Adds global variable 'window' for jsc and cleanup. 2017-08-18 16:03:04 +08:00
James Chen 2fab54c612 fix ios crash after closing app in task manager. 2017-08-18 14:34:55 +08:00
James Chen 73e45e92e4 Adds MappingUtils file, box2d works again. 2017-08-18 14:34:55 +08:00
James Chen cb5d3066a8 Web inspector for JSC works. 2017-08-08 10:23:17 +08:00
James Chen cc1b2b1dc5 More API comments. 2017-08-03 17:27:06 +08:00
James Chen aebb1c2282 cleanup, and final class. 2017-08-02 14:37:41 +08:00
James Chen f80802f97e more se::HandleObject use. 2017-07-31 16:18:01 +08:00
James Chen 9862b765c8 cleanup 2017-07-28 17:35:55 +08:00
James Chen 64a6d89b19 cleanup 2017-07-25 10:14:32 +08:00
James Chen 99529069c4 cleanup and restartVM works. 2017-07-21 14:56:48 +08:00
James Chen a470a31f28 cleanup for jsc. 2017-07-21 13:54:41 +08:00
James Chen 4eb448ec05 fixme 2017-06-27 11:52:47 +08:00
James Chen af6aa8f45e ios jsc, sm works. 2017-06-26 10:41:26 +08:00
James Chen 05a893a08b printf -> LOGD 2017-06-23 13:44:18 +08:00
James Chen 91359f1f75 first commit 2017-06-15 17:24:30 +08:00