Skip to content

This replace all new lines in the code serializer #17470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2019
Merged

This replace all new lines in the code serializer #17470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/jsm/loaders/obj2/utils/CodeSerializer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const CodeSerializer = {
part = serializationTarget[ name ];
if ( typeof ( part ) === 'string' || part instanceof String ) {

part = part.replace( '\n', '\\n' );
part = part.replace( '\r', '\\r' );
part = part.replace( /\n/g, '\\n' );
part = part.replace( /\r/g, '\\r' );
objectString += '\t' + name + ': "' + part + '",\n';

} else if ( part instanceof Array ) {
Expand All @@ -31,7 +31,7 @@ const CodeSerializer = {

} else if ( typeof part === 'object' ) {

console.log( 'Omitting object "' + name + '" and replace it with empty object.');
console.log( 'Omitting object "' + name + '" and replace it with empty object.' );
objectString += '\t' + name + ': {},\n';

} else {
Expand Down Expand Up @@ -75,7 +75,7 @@ const CodeSerializer = {

if ( name === 'constructor' ) {

if ( !funcInstructions.isRemoveCode() ) {
if ( ! funcInstructions.isRemoveCode() ) {

constructorString = fullObjectName + ' = ' + funcInstructions.getCode() + ';\n\n';

Expand All @@ -89,7 +89,7 @@ const CodeSerializer = {
funcInstructions = funcTemp;

}
if ( !funcInstructions.isRemoveCode() ) {
if ( ! funcInstructions.isRemoveCode() ) {

if ( isExtended ) {

Expand Down Expand Up @@ -136,7 +136,7 @@ const CodeSerializer = {

} else if ( typeof objectPart === 'object' ) {

console.log( 'Omitting object "' + funcInstructions.getName() + '" and replace it with empty object.');
console.log( 'Omitting object "' + funcInstructions.getName() + '" and replace it with empty object.' );
funcInstructions.setCode( "{}" );

} else {
Expand Down Expand Up @@ -257,7 +257,7 @@ CodeSerializationInstruction.prototype = {
* Returns the serialized function code
* @return {String}
*/
getCode: function() {
getCode: function () {

return this.code;

Expand Down