Merge pull request #12381 from VisualSJ/v3-aa

[ci skip]Fix some simple bug

tests/js-tests/src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js

@@ -33,7 +33,7 @@ var CustomImageLayer = cc.Layer.extend({
             customImageViewReader,
             customImageViewReader.setProperties);
 
-        var layout = guiReader.widgetFromJsonFile("css-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson");
+        var layout = guiReader.widgetFromJsonFile("ccs-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson");
         this.addChild(layout);
     }
 });

tests/js-tests/src/FacebookTest/FacebookTestsManager.js

@@ -43,8 +43,8 @@ FacebookTestScene = TestScene.extend({
 
         if(!cc.sys.isNative) {   //browser
             cc.loader.loadJs('', [
-                "../../../web/external/pluginx/platform/facebook_sdk.js",
+                "../../web/external/pluginx/platform/facebook_sdk.js",
-                "../../../web/external/pluginx/platform/facebook.js"
+                "../../web/external/pluginx/platform/facebook.js"
             ], function() {
                 var layer = nextFacebookTest();
                 self.addChild(layer);

tests/js-tests/src/GUITest/UIScene.js

@@ -55,17 +55,19 @@ UIScene = cc.Scene.extend({
 
             this._sceneTitle = widget.getChildByName("UItest");
 
-
+            var back_label = widget.getChildByName("back");
-            var label = new cc.LabelTTF("Main Menu", "Arial", 20);
+            if(back_label){
-            var menuItem = new cc.MenuItemLabel(label, this.toExtensionsMainLayer, this);
+                back_label.addTouchEventListener(this.toExtensionsMainLayer, this);
-
+            }else{
-            var menu = new cc.Menu(menuItem);
+                var label = new cc.LabelTTF("Back", "Arial", 20);
-            menu.x = 0;
+                var menuItem = new cc.MenuItemLabel(label, this.toExtensionsMainLayer, this);
-            menu.y = 0;
+                var menu = new cc.Menu(menuItem);
-            menuItem.x = winSize.width - 50;
+                menu.x = 0;
-            menuItem.y = 25;
+                menu.y = 0;
-
+                menuItem.x = winSize.width - 50;
-            this.addChild(menu, 1);
+                menuItem.y = 25;
+                this.addChild(menu, 1);
+            }
 
             var left_button = widget.getChildByName("left_Button");
             left_button.addTouchEventListener(this.previousCallback ,this);

tests/js-tests/src/GUITest/UIVideoPlayerTest/UIVideoPlayerTest.js

@@ -3,7 +3,7 @@ var UIVideoPlayerTest = UIScene.extend({
     onEnter: function(){
         UIScene.prototype.onEnter.call(this);
 
-        var video = new ccui.VideoPlayer("http://benchmark.cocos2d-x.org/cocosvideo.mp4");
+        var video = new ccui.VideoPlayer("cocosvideo.mp4");
         video.setContentSize(320, 240);
         video.setPosition(800/2, 450/2);
         video.setScale(0.5);
@@ -37,38 +37,38 @@ var UIVideoPlayerTest = UIScene.extend({
             }},
             { name: "PLAYNATIVE", func: function(){
                 cc.log("play!");
-                video.setURL("res/cocosvideo.mp4");
+                video.setURL("cocosvideo.mp4");
                 video.play();
             }},
             { name: "STOP", func: function(){
-                    cc.log("stop!");
+                cc.log("stop!");
-                    video.stop();
+                video.stop();
             }},
             { name: "PAUSE", func: function(){
-                    cc.log("pause!");
+                cc.log("pause!");
-                    video.pause();
+                video.pause();
             }},
             { name: "RESUME", func: function(){
-                    cc.log("resume!");
+                cc.log("resume!");
-                    video.resume();
+                video.resume();
             }},
             { name: "SEEKTO", func: function(){
                 var sec = ((Math.random() * 3) * 100 | 0) / 100;
-                    cc.log("seekTo %f sec!", sec);
+                cc.log("seekTo %f sec!", sec);
-                    video.seekTo(sec);
+                video.seekTo(sec);
             }},
             { name: "ISPLAYING", func: function(){
-                    cc.log("isPlaying!");
+                cc.log("isPlaying!");
-                    cc.log(video.isPlaying());
+                cc.log(video.isPlaying());
             }},
             { name: "Full Screen", func: function(){
-                    cc.log("setFullScreenEnabled!");
+                cc.log("setFullScreenEnabled!");
-                    video.setFullScreenEnabled(true);
+                video.setFullScreenEnabled(true);
             }},
             { name: "Scale", func: function(){
                 var scale = ((Math.random() * 0.5 + 0.2) * 100 | 0) / 100;
-                    cc.log("setScale(%f)!", scale);
+                cc.log("setScale(%f)!", scale);
-                    video.setScale(scale);
+                video.setScale(scale);
             }},
             { name: "AnchorPoint 0 / 1", func: function(){
                 var anp = video.getAnchorPoint();

tests/js-tests/src/SchedulerTest/SchedulerTest.js

@@ -644,6 +644,7 @@ var SchedulerTimeScale = SchedulerTestLayer.extend({
     },
 
     onExit: function() {
+        cc.director.getScheduler().setTimeScale(1);
         // restore scale
         cc.director.getScheduler().unscheduleUpdateForTarget(this._newScheduler);
         this._super();

tests/js-tests/src/tests_resources.js

@@ -1096,3 +1096,6 @@ var g_ccs2 = [
     "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.fnt",
     "ccs-res/cocosui/UIEditorTest/UILabelBMFont_Editor/GUI/missing-font.png"
 ];
+
+res.CCControlColourPickerSpriteSheet_plist = "extensions/CCControlColourPickerSpriteSheet.plist";
+res.CCControlColourPickerSpriteSheet_png = "extensions/CCControlColourPickerSpriteSheet.png";