no space words fix
diff --git a/player/index.html b/player/index.html
index 0143f8b..3c1e4df 100644
--- a/player/index.html
+++ b/player/index.html
@@ -13,7 +13,7 @@
#bodymovin{
background-color:#333;
width:500px;
- height:500px;
+ height:600px;
/*width:800px;
height:500px;*/
display:block;
@@ -93,7 +93,7 @@
var animData = {
container: document.getElementById('bodymovin'),
renderer: 'html',
- loop: false,
+ loop: true,
prerender: false,
autoplay: true,
path: 'exports/render/data.json'
@@ -108,7 +108,7 @@
//anim.playSegments([0,40],true);
//window.onresize = anim.resize.bind(anim);
- /*var stats = new Stats();
+ var stats = new Stats();
stats.setMode( 0 ); // 0: fps, 1: ms, 2: mb
// align top-left
@@ -116,7 +116,7 @@
stats.domElement.style.left = '0px';
stats.domElement.style.top = '0px';
- document.body.appendChild( stats.domElement );*/
+ document.body.appendChild( stats.domElement );
function loadAndDestroy(){
diff --git a/player/js/utils/DataManager.js b/player/js/utils/DataManager.js
index b4c7088..3c04ed6 100644
--- a/player/js/utils/DataManager.js
+++ b/player/js/utils/DataManager.js
@@ -137,7 +137,7 @@
len = documentData.t.length;
if(documentData.sz){
var boxWidth = documentData.sz[0];
- var lastSpaceIndex;
+ var lastSpaceIndex = -1;
for(i=0;i<len;i+=1){
newLineFlag = false;
if(documentData.t.charAt(i) === ' '){
@@ -148,17 +148,22 @@
}
if(fontManager.chars){
charData = fontManager.getCharData(documentData.t.charAt(i), fontData.fStyle, fontData.fFamily);
- //console.log(documentData.t.charCodeAt(i), documentData.t.charAt(i));
cLength = newLineFlag ? 0 : charData.w*documentData.s/100;
}else{
tCanvasHelper.font = documentData.s + 'px '+ fontData.fFamily;
cLength = tCanvasHelper.measureText(documentData.t.charAt(i)).width;
}
if(lineWidth + cLength > boxWidth){
- i = lastSpaceIndex;
+ if(lastSpaceIndex === -1){
+ //i -= 1;
+ documentData.t = documentData.t.substr(0,i) + "\r" + documentData.t.substr(i);
+ len += 1;
+ } else {
+ i = lastSpaceIndex;
+ documentData.t = documentData.t.substr(0,i) + "\r" + documentData.t.substr(i+1);
+ }
+ lastSpaceIndex = -1;
lineWidth = 0;
- var pre = documentData.t.substr(0,i);
- documentData.t = documentData.t.substr(0,i) + "\r" + documentData.t.substr(i+1);
}else {
lineWidth += cLength;
}