Commit Graph

34 Commits

Author SHA1 Message Date
pandamicro b531040ac4 Update licenses 2018-03-13 15:52:14 +08:00
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro dbb19e2362 Support WebView in new renderer 2018-02-22 23:23:42 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
simon129 8dab61d7d6 CCWebView.destroy() should have a return value
CCWebView.destroy() inherent from CCObject, it's destroy() should return true or false.
Add return value to improve creator.d.ts
2018-01-03 14:53:03 +08:00
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +08:00
pandamicro 8cc054c833 Fix super calls to old sg components 2017-10-26 11:09:58 +02:00
knoxHuang 4075949170 fix CCWebView api error 2017-10-24 15:36:59 +08:00
knoxHuang 1bc94e3daf refine code 2017-10-24 15:02:39 +08:00
knoxHuang 329d3c9858 add interaction with WebView internal pages for fireball/issues/6490 2017-10-24 14:36:23 +08:00
pandamicro 48faf3ca49 Removed SGComponent, ComponentInSG, ComponentUnderSG 2017-10-06 17:54:34 +08:00
knoxHuang 320d5d5915 fix webview event error for fireball/issues/6328 2017-09-21 16:51:43 +08:00
knoxHuang 0c093a8c3f The webView event will not respond under CC_EDTIOR for fireball/issues/6299 2017-08-23 16:10:08 +08:00
knoxHuang 7ce5abe2a7 add setJavascriptInterfaceScheme and setOnJSCallback to webview for fireball/issues/6251 2017-08-16 17:36:22 +08:00
Jare Guo bf79d94fe6 remove extname used in require 2017-07-05 16:32:41 +08:00
zilongshanren af07d514ed finish engine modular
modular particle system

modular tiledmap

finish modular
2017-06-05 14:17:56 +08:00
zilongshanren f07fecffd6 improve editbox memory management
improve videoplayer memory management

improve webview memory management

add missing API doc annotation.

improve API docs

improve api docs

remove unneeded code

fix typo

refine API docs

remove unintened docs deletion
2017-06-01 15:51:32 +08:00
Jare Guo 20155c6541 fix api about event type 2017-05-19 11:22:50 +08:00
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zilongshanren 21a40e37c1 add the missing API docs 2016-10-19 15:22:39 +08:00
zilongshanren 0bd5a8e2a3 add simplify event to editbox and webview 2016-10-19 10:59:05 +08:00
zilongshanren 522b695ee8 fix webview loading error on iOS and Android 2016-07-28 17:48:42 +08:00
zilongshanren ca07275bb4 add eslint 2016-07-27 12:01:19 +08:00
zilongshanren 2036a6e99b simplify webview event handler 2016-07-26 18:29:19 +08:00
zilongshanren 269cf15fb0 add tooltip and fix api docs 2016-07-26 18:11:03 +08:00
zilongshanren 628e6c2962 refine webview 2016-07-26 11:40:17 +08:00
zilongshanren bf082642ff fix web enum on Mac and Windows
1. add more events to webview
2016-07-25 17:55:13 +08:00
zilongshanren f738204e1b fix a few webview related issues 2016-07-25 15:46:26 +08:00
zilongshanren a5deddc3b3 improve webivew 2016-07-25 10:49:17 +08:00
zilongshanren befac0ef1b fix webview initialize size 2016-07-22 14:41:43 +08:00
zilongshanren 98ebc6762c move CCWebView to components directory 2016-07-22 14:16:24 +08:00