From 5b0a3f0b383a5929eb447c6dcab75d1ece7fef84 Mon Sep 17 00:00:00 2001 From: Guido Lorenz Date: Wed, 31 Jul 2013 13:19:12 +0200 Subject: [PATCH 1/2] Add missing semicolons Missing semicolons can cause trouble when minifying or concatenating Javascript sources. The last one actually did cause trouble when being followed by an IIFE after concatenation. --- spine-js/spine.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-js/spine.js b/spine-js/spine.js index 45da47f30..32015a275 100644 --- a/spine-js/spine.js +++ b/spine-js/spine.js @@ -742,7 +742,7 @@ spine.RegionAttachment.prototype = { vertices[6/*X4*/] = offset[6/*X4*/] * m00 + offset[7/*Y4*/] * m01 + x; vertices[7/*Y4*/] = offset[6/*X4*/] * m10 + offset[7/*Y4*/] * m11 + y; } -} +}; spine.AnimationStateData = function (skeletonData) { this.skeletonData = skeletonData; @@ -1291,11 +1291,11 @@ spine.AtlasReader.prototype = { tuple[i] = this.trim(line.substring(lastMatch)); return i + 1; } -} +}; spine.AtlasAttachmentLoader = function (atlas) { this.atlas = atlas; -} +}; spine.AtlasAttachmentLoader.prototype = { newAttachment: function (skin, type, name) { switch (type) { @@ -1315,4 +1315,4 @@ spine.AtlasAttachmentLoader.prototype = { } throw "Unknown attachment type: " + type; } -} +}; From e6b98cd179587b55794f325b7acaccbbf9c7a919 Mon Sep 17 00:00:00 2001 From: Borislav Kosharov Date: Wed, 31 Jul 2013 21:40:36 +0300 Subject: [PATCH 2/2] Simplified SkeletonData ToString in csharp runtime --- spine-csharp/src/SkeletonData.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-csharp/src/SkeletonData.cs b/spine-csharp/src/SkeletonData.cs index cf9166d72..aa413302f 100644 --- a/spine-csharp/src/SkeletonData.cs +++ b/spine-csharp/src/SkeletonData.cs @@ -129,7 +129,7 @@ namespace Spine { // --- override public String ToString () { - return Name != null ? Name : base.ToString(); + return Name ?? base.ToString(); } } }