Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13298 from jianglong0156/fixVibrateBugInWeb 

fix vigrate resource error, and hide the vibrateTest in web
This commit is contained in:
pandamicro 2015-08-10 20:46:50 +08:00
parent 940b53e271 32223348cb
commit 97dbcd3c3b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/js-tests/src/VibrateTest/VibrateTest.js
View File

@ -58,9 +58,9 @@ var VibrateTest = BaseTestLayer.extend({
var durationSlider = new ccui.Slider();
durationSlider.setPercent(0);
durationSlider.setTouchEnabled(true);
durationSlider.loadBarTexture("res/ccs-res/cocosui/sliderTrack.png");
durationSlider.loadSlidBallTextures("res/ccs-res/cocosui/sliderThumb.png", "res/ccs-res/cocosui/sliderThumb.png", "");
durationSlider.loadProgressBarTexture("res/ccs-res/cocosui/sliderProgress.png");
durationSlider.loadBarTexture("ccs-res/cocosui/sliderTrack.png");
durationSlider.loadSlidBallTextures("ccs-res/cocosui/sliderThumb.png", "ccs-res/cocosui/sliderThumb.png", "");
durationSlider.loadProgressBarTexture("ccs-res/cocosui/sliderProgress.png");
durationSlider.x = s.width * 0.5;
durationSlider.y = s.height * 0.35;
durationSlider.addEventListener(this.durationSliderEvent, this);

2
tests/js-tests/src/tests-main.js
View File

@ -721,7 +721,7 @@ var testNames = [
},
{
title:"Vibrate Test",
platforms: PLATFORM_ALL,
platforms: PLATFORM_JSB,
linksrc:"src/VibrateTest/VibrateTest.js",
testScene:function () {
return new VibrateTestScene();