finish webview binding

frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp

@@ -0,0 +1,138 @@
+#include "jsb_cocos2dx_experimental_webView_manual.h"
+
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+
+#include "UIWebView.h"
+#include "ScriptingCore.h"
+#include "cocos2d_specifics.hpp"
+
+using namespace cocos2d;
+
+
+static bool jsb_cocos2dx_experimental_webView_setOnShouldStartLoading(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JSObject *obj = JS_THIS_OBJECT(cx, vp);
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    experimental::ui::WebView* cobj = (experimental::ui::WebView *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "Invalid Native Object");
+
+    if(argc == 1){
+        JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+        std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, obj, args.get(0)));
+        cobj->setOnShouldStartLoading([=](experimental::ui::WebView *sender, const std::string &url)->bool{
+            jsval arg[2];
+            js_proxy_t *proxy = js_get_or_create_proxy(cx, sender);
+            if(proxy)
+                arg[0] = OBJECT_TO_JSVAL(proxy->obj);
+            else
+                arg[0] = JSVAL_NULL;
+            arg[1] = std_string_to_jsval(cx, url);
+            JS::RootedValue rval(cx);
+
+            bool ok = func->invoke(2, arg, &rval);
+            if (!ok && JS_IsExceptionPending(cx)) {
+                JS_ReportPendingException(cx);
+            }
+            return true;
+        });
+        return true;
+    }
+}
+
+static bool jsb_cocos2dx_experimental_webView_setOnDidFinishLoading(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JSObject *obj = JS_THIS_OBJECT(cx, vp);
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    experimental::ui::WebView* cobj = (experimental::ui::WebView *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "Invalid Native Object");
+
+    if(argc == 1){
+        JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+        std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, obj, args.get(0)));
+        cobj->setOnDidFinishLoading([=](experimental::ui::WebView *sender, const std::string &url)->void{
+            jsval arg[2];
+            js_proxy_t *proxy = js_get_or_create_proxy(cx, sender);
+            if(proxy)
+                arg[0] = OBJECT_TO_JSVAL(proxy->obj);
+            else
+                arg[0] = JSVAL_NULL;
+            arg[1] = std_string_to_jsval(cx, url);
+            JS::RootedValue rval(cx);
+
+            bool ok = func->invoke(2, arg, &rval);
+            if (!ok && JS_IsExceptionPending(cx)) {
+                JS_ReportPendingException(cx);
+            }
+        });
+        return true;
+    }
+}
+
+static bool jsb_cocos2dx_experimental_webView_setOnDidFailLoading(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JSObject *obj = JS_THIS_OBJECT(cx, vp);
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    experimental::ui::WebView* cobj = (experimental::ui::WebView *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "Invalid Native Object");
+
+    if(argc == 1){
+        JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+        std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, obj, args.get(0)));
+        cobj->setOnDidFailLoading([=](experimental::ui::WebView *sender, const std::string &url)->void{
+            jsval arg[2];
+            js_proxy_t *proxy = js_get_or_create_proxy(cx, sender);
+            if(proxy)
+                arg[0] = OBJECT_TO_JSVAL(proxy->obj);
+            else
+                arg[0] = JSVAL_NULL;
+            arg[1] = std_string_to_jsval(cx, url);
+            JS::RootedValue rval(cx);
+
+            bool ok = func->invoke(2, arg, &rval);
+            if (!ok && JS_IsExceptionPending(cx)) {
+                JS_ReportPendingException(cx);
+            }
+        });
+        return true;
+    }
+}
+
+static bool jsb_cocos2dx_experimental_webView_setOnJSCallback(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JSObject *obj = JS_THIS_OBJECT(cx, vp);
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    experimental::ui::WebView* cobj = (experimental::ui::WebView *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "Invalid Native Object");
+
+    if(argc == 1){
+        JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+        std::shared_ptr<JSFunctionWrapper> func(new JSFunctionWrapper(cx, obj, args.get(0)));
+        cobj->setOnJSCallback([=](experimental::ui::WebView *sender, const std::string &url)->void{
+            jsval arg[2];
+            js_proxy_t *proxy = js_get_or_create_proxy(cx, sender);
+            if(proxy)
+                arg[0] = OBJECT_TO_JSVAL(proxy->obj);
+            else
+                arg[0] = JSVAL_NULL;
+            arg[1] = std_string_to_jsval(cx, url);
+            JS::RootedValue rval(cx);
+
+            bool ok = func->invoke(2, arg, &rval);
+            if (!ok && JS_IsExceptionPending(cx)) {
+                JS_ReportPendingException(cx);
+            }
+        });
+        return true;
+    }
+}
+extern JSObject* jsb_cocos2d_experimental_ui_WebView_prototype;
+
+void register_all_cocos2dx_experimental_webView_manual(JSContext* cx, JS::HandleObject global)
+{
+    JS_DefineFunction(cx, JS::RootedObject(cx, jsb_cocos2d_experimental_ui_WebView_prototype), "setOnShouldStartLoading", jsb_cocos2dx_experimental_webView_setOnShouldStartLoading, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
+    JS_DefineFunction(cx, JS::RootedObject(cx, jsb_cocos2d_experimental_ui_WebView_prototype), "setOnDidFinishLoading", jsb_cocos2dx_experimental_webView_setOnDidFinishLoading, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
+    JS_DefineFunction(cx, JS::RootedObject(cx, jsb_cocos2d_experimental_ui_WebView_prototype), "setOnDidFailLoading", jsb_cocos2dx_experimental_webView_setOnDidFailLoading, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
+    JS_DefineFunction(cx, JS::RootedObject(cx, jsb_cocos2d_experimental_ui_WebView_prototype), "setOnJSCallback", jsb_cocos2dx_experimental_webView_setOnJSCallback, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
+}
+
+#endif

frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h

@@ -0,0 +1,9 @@
+#ifndef __jsb_cocos2dx_experimental_webView_manual__
+#define __jsb_cocos2dx_experimental_webView_manual__
+
+#include "jsapi.h"
+#include "jsfriendapi.h"
+
+void register_all_cocos2dx_experimental_webView_manual(JSContext* cx, JS::HandleObject global);
+
+#endif /* defined(__jsb_cocos2dx_experimental_webView_manual__) */

samples/js-tests/project/Classes/AppDelegate.cpp

@@ -42,7 +42,7 @@
 #include "js_Effect3D_bindings.h"
 #endif
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
 #include "jsb_cocos2dx_experimental_webView_auto.hpp"
 #include "experimental/jsb_cocos2dx_experimental_webView_manual.h"
 #endif

samples/js-tests/res/cocosui/Test.html

@@ -0,0 +1,5 @@
+<html>
+    <body style="font-size:100px;">
+        Hello World
+        </body>
+</html>

samples/js-tests/src/GUITest/UISceneManager.js

@@ -28,6 +28,14 @@
     var currentTestingArray = null;
 
     var testingItems = {
+        "UIWebViewTest": [
+            {
+                title: "UIWebViewTest",
+                func: function () {
+                    return new UIWebViewTest();
+                }
+            }
+        ],
         "UIButton": [
             {
                 title: "UIButtonTest",

samples/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js

@@ -0,0 +1,155 @@
+/****************************************************************************
+ Copyright (c) 2011-2012 cocos2d-x.org
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+//2015-01-14
+var UIWebViewTest = UIScene.extend({
+    _webView: null,
+    init: function () {
+        if (this._super()) {
+            var self = this;
+            var winSize = cc.size(480, 320);
+
+            if (!((cc.sys.os == cc.sys.OS_ANDROID || cc.sys.os == cc.sys.OS_IOS || cc.sys.os == cc.sys.OS_WINDOWS) && cc.sys.isNative))
+            {
+                var showErrorLabel = new cc.LabelTTF("Only run in android, ios and windows ", "Arial", 20);
+                showErrorLabel.setPosition(cc.p(winSize.width / 2 , winSize.height / 2));
+                this._mainNode.addChild(showErrorLabel);
+                return;
+            }
+
+            this._webView = ccexp.WebView.create();
+            this._webView.setAnchorPoint(cc.p(0.5, 0.5));
+            this._webView.setPosition(cc.p(winSize.width / 2, winSize.height / 2));
+            this._webView.setContentSize(cc.size(winSize.width * 0.5, winSize.height * 0.5));
+            this._webView.loadURL("http://www.baidu.com");
+            this._webView.setScalesPageToFit(true);
+
+            this._webView.setOnShouldStartLoading(this.onWebViewShouldStartLoading, this);
+            this._webView.setOnDidFinishLoading(this.onWebViewDidFinishLoading, this);
+            this._webView.setOnDidFailLoading(this.onWebViewDidFailLoading, this);
+
+            this._mainNode.addChild(this._webView);
+
+            var urlTextField = new ccui.TextField("Input a URL here", "Arial", 20);
+            urlTextField.setPlaceHolderColor(cc.color(255, 0, 0));
+            urlTextField.setPosition(cc.p(winSize.width / 2 - 80, winSize.height / 2 +
+            this._webView.getContentSize().height / 2 + urlTextField.getContentSize().height / 2 + 10));
+            this._mainNode.addChild(urlTextField);
+
+            var textFieldPos = urlTextField.getPosition();
+
+            var httpLabel = new cc.LabelTTF("http:// ", "Arial", 20);
+            httpLabel.setFontFillColor(cc.color(0, 255, 0));
+            httpLabel.setAnchorPoint(cc.p(1.0, 0.5));
+            httpLabel.setPosition(cc.p(textFieldPos.x - urlTextField.getContentSize().width / 2, textFieldPos.y));
+            this._mainNode.addChild(httpLabel);
+
+
+            var resetBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            resetBtn.setTitleText("Visit URL");
+            resetBtn.setPosition(cc.p(winSize.width / 2 + 50, winSize.height / 2 + this._webView.getContentSize().height / 2 +
+            resetBtn.getContentSize().height / 2 + 10));
+            resetBtn.addClickEventListener(function () {
+                if (urlTextField.getString().length != 0) {
+                    self._webView.loadURL("http://" + urlTextField.getString());
+                }
+            });
+            this._mainNode.addChild(resetBtn);
+
+            var reloadBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            reloadBtn.setTitleText("Reload");
+            reloadBtn.setPosition(cc.p(winSize.width / 2 + this._webView.getContentSize().width / 2 +
+                                    reloadBtn.getContentSize().width / 2 + 10, winSize.height / 2 + 50));
+            reloadBtn.addClickEventListener(function () {
+                self._webView.reload();
+            });
+            this._mainNode.addChild(reloadBtn);
+
+            var forwardBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            forwardBtn.setTitleText("Forward");
+            forwardBtn.setPosition(cc.p(winSize.width / 2 + this._webView.getContentSize().width / 2 +
+                                    forwardBtn.getContentSize().width / 2 + 10, winSize.height / 2));
+            forwardBtn.addClickEventListener(function () {
+                self._webView.goForward();
+            });
+            this._mainNode.addChild(forwardBtn);
+
+            var backBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            backBtn.setTitleText("Back");
+            backBtn.setPosition(cc.p(winSize.width / 2 + this._webView.getContentSize().width / 2 +
+                                backBtn.getContentSize().width / 2 + 10, winSize.height / 2 - 50));
+            backBtn.addClickEventListener(function () {
+                self._webView.goBack();
+            });
+            this._mainNode.addChild(backBtn);
+
+
+            var loadFileBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            loadFileBtn.setTitleText("Load FILE");
+            loadFileBtn.setPosition(cc.p(winSize.width / 2 - this._webView.getContentSize().width / 2 -
+                                    loadFileBtn.getContentSize().width / 2 - 10, winSize.height / 2 - 50));
+            loadFileBtn.addClickEventListener(function () {
+                self._webView.loadFile("res/cocosui/Test.html");
+            });
+            this._mainNode.addChild(loadFileBtn);
+
+            var loadHTMLBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            loadHTMLBtn.setTitleText("Load Data");
+            loadHTMLBtn.setPosition(cc.p(winSize.width / 2 - this._webView.getContentSize().width / 2 -
+                                    loadHTMLBtn.getContentSize().width / 2 - 10, winSize.height / 2));
+            loadHTMLBtn.addClickEventListener(function () {
+                self._webView.loadHTMLString("<body style=\"font-size:50px;\">Hello World <img src=\"Icon.png\"/> </body>", "Images/");
+            });
+            this._mainNode.addChild(loadHTMLBtn);
+
+            var evalJsBtn = new ccui.Button("res/cocosui/animationbuttonnormal.png",
+                "res/cocosui/animationbuttonpressed.png");
+            evalJsBtn.setTitleText("Evaluate JS");
+            evalJsBtn.setPosition(cc.p(winSize.width / 2 - this._webView.getContentSize().width / 2 -
+                                    evalJsBtn.getContentSize().width / 2 - 10, winSize.height / 2 + 50));
+            evalJsBtn.addClickEventListener(function () {
+                self._webView.evaluateJS("alert(\"hello\")");
+            });
+            this._mainNode.addChild(evalJsBtn);
+
+            return true;
+        }
+    },
+    onWebViewShouldStartLoading: function (sender, url) {
+        cc.log("onWebViewShouldStartLoading, url is " + url);
+    },
+    onWebViewDidFinishLoading: function (sender, url) {
+        cc.log("onWebViewDidFinishLoading, url is " + url);
+    },
+    onWebViewDidFailLoading: function (sender, url) {
+        cc.log("onWebViewDidFailLoading, url is " + url);
+    }
+});

tools/tojs/cocos2dx_experimental_webView.ini

@@ -7,7 +7,7 @@ prefix = cocos2dx_experimental_webView
 # all classes will be embedded in that namespace
 target_namespace = ccexp
 
-macro_judgement  = #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+macro_judgement  = #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
 
 android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include
 android_flags = -D_SIZE_T_DEFINED_ 
@@ -38,7 +38,7 @@ classes = WebView
 # will apply to all class names. This is a convenience wildcard to be able to skip similar named
 # functions from all classes.
 
-skip = WebView::[setOnShouldStartLoading setOnDidFinishLoading setOnDidFailLoading setOnJSCallback]
+skip = WebView::[setOnShouldStartLoading setOnDidFinishLoading setOnDidFailLoading setOnJSCallback loadData]
 
 rename_functions =