Skip to content

Commit

Permalink
version 5.6.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@bodymovin
bodymovin committed Apr 6, 2020
1 parent c569246 commit 1d266d2
Show file tree
Hide file tree
Showing 21 changed files with 68 additions and 74 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## V 5.6.8
- not using non breaking spaces for text spaces
- added support for exporting video layers (only export, players don't support them)
- fix for path properties open without nodes

## V 5.6.7
- use original comp name as export name
- added default filter values for banner template
Expand Down
5 changes: 5 additions & 0 deletions History.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## V 5.6.8
- not using non breaking spaces for text spaces
- added support for exporting video layers (only export, players don't support them)
- fix for path properties open without nodes

## V 5.6.7
- use original comp name as export name
- added default filter values for banner template
Expand Down
Binary file modified build/extension/bodymovin.zxp
View file
Binary file not shown.
14 changes: 6 additions & 8 deletions build/player/lottie.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5316,9 +5316,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5327,7 +5325,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5348,8 +5346,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5422,7 +5420,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -14523,7 +14521,7 @@ lottie.freeze = animationManager.freeze;
lottie.unfreeze = animationManager.unfreeze;
lottie.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottie.__getFactory = getFactory;
lottie.version = '5.6.7';
lottie.version = '5.6.8';

function checkReady() {
if (document.readyState === "complete") {
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie.min.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions build/player/lottie_canvas.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5312,9 +5312,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5323,7 +5321,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5344,8 +5342,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5418,7 +5416,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -12318,7 +12316,7 @@ lottie.freeze = animationManager.freeze;
lottie.unfreeze = animationManager.unfreeze;
lottie.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottie.__getFactory = getFactory;
lottie.version = '5.6.7';
lottie.version = '5.6.8';

function checkReady() {
if (document.readyState === "complete") {
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie_canvas.min.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions build/player/lottie_canvas_worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5228,9 +5228,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5239,7 +5237,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5260,8 +5258,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5334,7 +5332,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -12328,7 +12326,7 @@ GroupEffect.prototype.init = function(data,element){
lottiejs.freeze = animationManager.freeze;
lottiejs.unfreeze = animationManager.unfreeze;
lottiejs.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottiejs.version = '5.6.7';
lottiejs.version = '5.6.8';

var renderer = '';
return lottiejs;
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie_canvas_worker.min.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions build/player/lottie_html.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5316,9 +5316,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5327,7 +5325,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5348,8 +5346,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5422,7 +5420,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -13266,7 +13264,7 @@ lottie.freeze = animationManager.freeze;
lottie.unfreeze = animationManager.unfreeze;
lottie.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottie.__getFactory = getFactory;
lottie.version = '5.6.7';
lottie.version = '5.6.8';

function checkReady() {
if (document.readyState === "complete") {
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie_html.min.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions build/player/lottie_light.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5316,9 +5316,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5327,7 +5325,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5348,8 +5346,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5422,7 +5420,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -9707,7 +9705,7 @@ lottie.freeze = animationManager.freeze;
lottie.unfreeze = animationManager.unfreeze;
lottie.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottie.__getFactory = getFactory;
lottie.version = '5.6.7';
lottie.version = '5.6.8';

function checkReady() {
if (document.readyState === "complete") {
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie_light.min.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions build/player/lottie_light_canvas.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5312,9 +5312,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5323,7 +5321,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5344,8 +5342,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5418,7 +5416,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -9841,7 +9839,7 @@ lottie.freeze = animationManager.freeze;
lottie.unfreeze = animationManager.unfreeze;
lottie.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottie.__getFactory = getFactory;
lottie.version = '5.6.7';
lottie.version = '5.6.8';

function checkReady() {
if (document.readyState === "complete") {
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie_light_canvas.min.js
View file

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions build/player/lottie_light_html.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5316,9 +5316,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = false;
currentChar = documentData.finalText[i];
charCode = currentChar.charCodeAt(0);
if (currentChar === ' '){
val = '\u00A0';
} else if (charCode === 13 || charCode === 3) {
if (charCode === 13 || charCode === 3) {
uncollapsedSpaces = 0;
lineWidths.push(lineWidth);
maxLineWidth = lineWidth > maxLineWidth ? lineWidth : maxLineWidth;
Expand All @@ -5327,7 +5325,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
newLineFlag = true;
currentLine += 1;
}else{
val = documentData.finalText[i];
val = currentChar;
}
if(fontManager.chars){
charData = fontManager.getCharData(currentChar, fontData.fStyle, fontManager.getFontByName(documentData.f).fFamily);
Expand All @@ -5348,8 +5346,8 @@ TextProperty.prototype.completeTextData = function(documentData) {
letters.push({l:cLength,an:cLength,add:currentSize,n:newLineFlag, anIndexes:[], val: val, line: currentLine, animatorJustifyOffset: 0});
if(anchorGrouping == 2){
currentSize += cLength;
if(val === '' || val === '\u00A0' || i === len - 1){
if(val === '' || val === '\u00A0'){
if(val === '' || val === ' ' || i === len - 1){
if(val === '' || val === ' '){
currentSize -= cLength;
}
while(currentPos<=i){
Expand Down Expand Up @@ -5422,7 +5420,7 @@ TextProperty.prototype.completeTextData = function(documentData) {
for(i=0;i<len;i+=1){
letterData = letters[i];
letterData.anIndexes[j] = ind;
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== '\u00A0') || (based == 3 && (letterData.n || letterData.val == '\u00A0' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if((based == 1 && letterData.val !== '') || (based == 2 && letterData.val !== '' && letterData.val !== ' ') || (based == 3 && (letterData.n || letterData.val == ' ' || i == len - 1)) || (based == 4 && (letterData.n || i == len - 1))){
if(animatorData.s.rn === 1){
indexes.push(ind);
}
Expand Down Expand Up @@ -10789,7 +10787,7 @@ lottie.freeze = animationManager.freeze;
lottie.unfreeze = animationManager.unfreeze;
lottie.getRegisteredAnimations = animationManager.getRegisteredAnimations;
lottie.__getFactory = getFactory;
lottie.version = '5.6.7';
lottie.version = '5.6.8';

function checkReady() {
if (document.readyState === "complete") {
Expand Down
2 changes: 1 addition & 1 deletion build/player/lottie_light_html.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 1d266d2

Please sign in to comment.