Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop

Author: dingpinglv

frameworks/js-bindings/bindings/manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp

@@ -2556,8 +2556,8 @@ bool JSB_cpSpace_constructor(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JSB_PRECONDITION2(argc==0, cx, false, "Invalid number of arguments");
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-    JSObject* jsobj = JS_NewObjectForConstructor(cx, JSB_cpSpace_class, args);
-    //JSObject *jsobj = JS_NewObject(cx, JSB_cpSpace_class, JS::RootedObject(cx, JSB_cpSpace_object), JS::NullPtr());
+    //JSObject* jsobj = JS_NewObjectForConstructor(cx, JSB_cpSpace_class, args);
+    JSObject *jsobj = JS_NewObject(cx, JSB_cpSpace_class, JS::RootedObject(cx, JSB_cpSpace_object), JS::NullPtr());
     void*   ret_val = cpSpaceNew( );
 
     jsb_set_jsobject_for_proxy(jsobj, ret_val);

frameworks/js-bindings/bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp

@@ -272,7 +272,8 @@ bool JSB_CCPhysicsDebugNode_constructor(JSContext *cx, uint32_t argc, jsval *vp)
     CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!");
     typeClass = typeMapIter->second;
     CCASSERT(typeClass, "The value is null.");
-    JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
+    //JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
+    JS::RootedObject obj(cx, JS_NewObject(cx, typeClass->jsclass, JS::RootedObject(cx, typeClass->proto), JS::RootedObject(cx, typeClass->parentProto)));
     args.rval().set(OBJECT_TO_JSVAL(obj));
     // link the native object with the javascript object
     js_proxy_t* p = jsb_new_proxy(cobj, obj);
@@ -494,7 +495,8 @@ bool JSPROXY_CCPhysicsSprite_constructor(JSContext *cx, uint32_t argc, jsval *vp
     CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!");
     typeClass = typeMapIter->second;
     CCASSERT(typeClass, "The value is null.");
-    JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
+    //JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
+    JS::RootedObject obj(cx, JS_NewObject(cx, typeClass->jsclass, JS::RootedObject(cx, typeClass->proto), JS::RootedObject(cx, typeClass->parentProto)));
     args.rval().set(OBJECT_TO_JSVAL(obj));
     // link the native object with the javascript object
     js_proxy_t* p = jsb_new_proxy(cobj, obj);

frameworks/js-bindings/bindings/manual/cocos2d_specifics.cpp

@@ -5171,8 +5171,11 @@ void register_cocos2dx_js_core(JSContext* cx, JS::HandleObject global)
 //XXX: why named this as extensions?
 void register_cocos2dx_js_extensions(JSContext* cx, JS::HandleObject global)
 {
+    JS::RootedObject tmpObj(cx);
+    tmpObj = anonEvaluate(cx, global, "(function () { return cc.Label; })()").toObjectOrNull();
+    JS_DefineFunction(cx, tmpObj, "createWithTTF", js_cocos2dx_Label_createWithTTF, 4, JSPROP_READONLY | JSPROP_PERMANENT);
+    
     JS::RootedObject labelProto(cx, jsb_cocos2d_Label_prototype);
-    JS_DefineFunction(cx, labelProto, "createWithTTF", js_cocos2dx_Label_createWithTTF, 4, JSPROP_ENUMERATE | JSPROP_PERMANENT);
     JS_DefineFunction(cx, labelProto, "setTTFConfig", js_cocos2dx_Label_setTTFConfig, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
 
     JS::RootedObject nodeGridProto(cx, jsb_cocos2d_NodeGrid_prototype);
@@ -5259,7 +5262,6 @@ void register_cocos2dx_js_extensions(JSContext* cx, JS::HandleObject global)
     JS_DefineFunction(cx, fileUtilsProto, "createDictionaryWithContentsOfFile", js_cocos2dx_FileUtils_createDictionaryWithContentsOfFile, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
     JS_DefineFunction(cx, fileUtilsProto, "getDataFromFile", js_cocos2dx_CCFileUtils_getDataFromFile, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT);
 
-    JS::RootedObject tmpObj(cx);
     tmpObj = anonEvaluate(cx, global, "(function () { return cc.EventListenerTouchOneByOne; })()").toObjectOrNull();
     JS_DefineFunction(cx, tmpObj, "create", js_EventListenerTouchOneByOne_create, 0, JSPROP_READONLY | JSPROP_PERMANENT);
 

frameworks/js-bindings/bindings/manual/js_manual_conversions.cpp

@@ -50,9 +50,7 @@ JSStringWrapper::JSStringWrapper(jsval val, JSContext* cx/* = NULL*/)
 
 JSStringWrapper::~JSStringWrapper()
 {
-#if(CC_TARGET_PLATFORM != CC_PLATFORM_WP8)
-    CC_SAFE_DELETE_ARRAY(_buffer); //XXX: why break on wp8?
-#endif
+    JS_free(ScriptingCore::getInstance()->getGlobalContext(), (void*)_buffer);
 }
 
 void JSStringWrapper::set(jsval val, JSContext* cx)
@@ -83,7 +81,11 @@ void JSStringWrapper::set(JSString* str, JSContext* cx)
 
 //    _buffer = cc_utf16_to_utf8(pStrUTF16, -1, NULL, NULL);
 
+#if(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
     _buffer = JS_EncodeString(cx, str);
+#else
+    _buffer = JS_EncodeStringToUTF8(cx, JS::RootedString(cx, str));
+#endif
 }
 
 const char* JSStringWrapper::get()
@@ -1799,7 +1801,8 @@ jsval c_string_to_jsval(JSContext* cx, const char* v, size_t length /* = -1 */)
     jsval ret = JSVAL_NULL;
 
     //XXX: JS_NewUCStringCopyN can't be resolved on Win32
-/*    int utf16_size = 0;
+#if(CC_TARGET_PLATFORM != CC_PLATFORM_WIN32)
+    int utf16_size = 0;
     jschar* strUTF16 = (jschar*)cc_utf8_to_utf16(v, (int)length, &utf16_size);
 
     if (strUTF16 && utf16_size > 0) {
@@ -1809,12 +1812,13 @@ jsval c_string_to_jsval(JSContext* cx, const char* v, size_t length /* = -1 */)
         }
         delete[] strUTF16;
     }
-*/
+#else
     JSString* str = JS_NewStringCopyN(cx, v, length);
     if(str)
     {
         ret = STRING_TO_JSVAL(str);
     }
+#endif
     return ret;
 }
 

frameworks/js-bindings/bindings/manual/network/jsb_websocket.cpp

@@ -252,8 +252,8 @@ bool js_cocos2dx_extension_WebSocket_constructor(JSContext *cx, uint32_t argc, j
             JSB_PRECONDITION2( ok, cx, false, "Error processing arguments");
         } while (0);
 
-        //JS::RootedObject obj(cx, JS_NewObject(cx, js_cocos2dx_websocket_class, JS::RootedObject(cx, js_cocos2dx_websocket_prototype), JS::NullPtr()));
-        JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, js_cocos2dx_websocket_class, args));
+        JS::RootedObject obj(cx, JS_NewObject(cx, js_cocos2dx_websocket_class, JS::RootedObject(cx, js_cocos2dx_websocket_prototype), JS::NullPtr()));
+        //JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, js_cocos2dx_websocket_class, args));
 
         WebSocket* cobj = new WebSocket();
         JSB_WebSocketDelegate* delegate = new JSB_WebSocketDelegate();

samples/js-tests/project/proj.wp8-xaml/js-tests/Assets/Resources/fonts/arialuni.ttf

@@ -108,6 +108,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resources\fonts\arialuni.ttf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Properties\AppManifest.xml" />
     <None Include="Properties\WMAppManifest.xml">
       <SubType>Designer</SubType>

samples/js-tests/project/proj.wp8-xaml/js-tests/js-tests.csproj

@@ -1331,13 +1331,13 @@ var LabelTTFChinese = AtlasDemo.extend({
         //----start21----ctor
         this._super();
         var size = director.getWinSize();
-        var label = new cc.LabelTTF("中国", "Microsoft Yahei", 30);
+        var label = new cc.LabelTTF("中国", (cc.sys.os == cc.sys.OS_WP8) ? "fonts/arialuni.ttf" : "Microsoft Yahei", 30);
         label.x = size.width / 2;
         label.y = size.height / 3 * 2;
         this.addChild(label);
 
         // Test UTF8 string from native to jsval.
-        var label2 = new cc.LabelTTF("string from native:"+label.getString(), "Microsoft Yahei", 30);
+        var label2 = new cc.LabelTTF("string from native:"+label.getString(), (cc.sys.os == cc.sys.OS_WP8) ? "fonts/arialuni.ttf" : "Microsoft Yahei", 30);
         label2.x = size.width / 2;
         label2.y = size.height / 3;
         this.addChild(label2);
@@ -1941,6 +1941,8 @@ var WrapAlgorithmTest = AtlasDemo.extend({
             LabelTTF.boundingWidth = 120;
             LabelTTF.boundingHeight = 0;
             LabelTTF.enableStroke(cc.color(0, 0, 0, 1), 3.0);
+            if(cc.sys.os == cc.sys.OS_WP8)
+                LabelTTF.setFontName("fonts/arialuni.ttf");
             self.addChild(LabelTTF);
         });
 
@@ -1963,6 +1965,8 @@ var WrapAlgorithmTest = AtlasDemo.extend({
             LabelTTF.boundingWidth = 3;
             LabelTTF.boundingHeight = 0;
             LabelTTF.enableStroke(cc.color(0, 0, 0, 1), 3.0);
+            if(cc.sys.os == cc.sys.OS_WP8)
+                LabelTTF.setFontName("fonts/arialuni.ttf");
             self.addChild(LabelTTF);
         });
 
@@ -1981,6 +1985,8 @@ var WrapAlgorithmTest = AtlasDemo.extend({
             LabelTTF.boundingWidth = 90;
             LabelTTF.boundingHeight = 0;
             LabelTTF.enableStroke(cc.color(0, 0, 0, 1), 3.0);
+            if(cc.sys.os == cc.sys.OS_WP8)
+                LabelTTF.setFontName("fonts/arialuni.ttf");
             self.addChild(LabelTTF);
         });
 

samples/js-tests/src/LabelTest/LabelTest.js

@@ -108,6 +108,15 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Assets\AlignmentGrid.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\ApplicationIcon.png" />
+    <Content Include="Assets\Tiles\FlipCycleTileLarge.png" />
+    <Content Include="Assets\Tiles\FlipCycleTileMedium.png" />
+    <Content Include="Assets\Tiles\FlipCycleTileSmall.png" />
+    <Content Include="Assets\Tiles\IconicTileMediumLarge.png" />
+    <Content Include="Assets\Tiles\IconicTileSmall.png" />
     <Content Include="SplashScreenImage.jpg" />
   </ItemGroup>
   <ItemGroup>