fixing error drawing after finishign quiz

chanind · Jan 7, 2018 · 9ddcae3 · 9ddcae3
1 parent f53312c
commit 9ddcae3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/dist/hanzi-writer-lib.js b/dist/hanzi-writer-lib.js
@@ -6046,13 +6046,13 @@ var Quiz = function () {
       if (!this._userStroke) return Promise.resolve();
 
       this._animator.animate(function (animation) {
+        if (!_this._isActive) return Promise.resolve();
         var promises = [];
         var nextStroke = _this._getNextStroke();
         var isMatch = _this._strokeMatcher.strokeMatches(_this._userStroke, nextStroke);
         promises.push(_this._userStrokeRenderer.fadeAndRemove(animation));
         _this._userStroke = null;
         _this._userStrokeRenderer = null;
-        if (!_this._isActive) return Promise.resolve();
 
         if (isMatch) {
           _this._handleSuccess(nextStroke, animation);
@@ -6086,6 +6086,7 @@ var Quiz = function () {
       this._numRecentMistakes = 0;
       var promise = this._drawMatchingStroke(stroke, animation);
       if (this._currentStrokeIndex === this._character.getNumStrokes()) {
+        this._isActive = false;
         (0, _utils.callIfExists)(this._quizOptions.onComplete, {
           character: this._character.getSymbol(),
           totalMistakes: this._totalMistakes

diff --git a/dist/hanzi-writer-lib.min.js b/dist/hanzi-writer-lib.min.js
diff --git a/dist/hanzi-writer.js b/dist/hanzi-writer.js
@@ -6045,13 +6045,13 @@ var Quiz = function () {
       if (!this._userStroke) return Promise.resolve();
 
       this._animator.animate(function (animation) {
+        if (!_this._isActive) return Promise.resolve();
         var promises = [];
         var nextStroke = _this._getNextStroke();
         var isMatch = _this._strokeMatcher.strokeMatches(_this._userStroke, nextStroke);
         promises.push(_this._userStrokeRenderer.fadeAndRemove(animation));
         _this._userStroke = null;
         _this._userStrokeRenderer = null;
-        if (!_this._isActive) return Promise.resolve();
 
         if (isMatch) {
           _this._handleSuccess(nextStroke, animation);
@@ -6085,6 +6085,7 @@ var Quiz = function () {
       this._numRecentMistakes = 0;
       var promise = this._drawMatchingStroke(stroke, animation);
       if (this._currentStrokeIndex === this._character.getNumStrokes()) {
+        this._isActive = false;
         (0, _utils.callIfExists)(this._quizOptions.onComplete, {
           character: this._character.getSymbol(),
           totalMistakes: this._totalMistakes

diff --git a/dist/hanzi-writer.min.js b/dist/hanzi-writer.min.js
diff --git a/src/Quiz.js b/src/Quiz.js
@@ -43,13 +43,13 @@ class Quiz {
     if (!this._userStroke) return Promise.resolve();
 
     this._animator.animate((animation) => {
+      if (!this._isActive) return Promise.resolve();
       const promises = [];
       const nextStroke = this._getNextStroke();
       const isMatch = this._strokeMatcher.strokeMatches(this._userStroke, nextStroke);
       promises.push(this._userStrokeRenderer.fadeAndRemove(animation));
       this._userStroke = null;
       this._userStrokeRenderer = null;
-      if (!this._isActive) return Promise.resolve();
 
       if (isMatch) {
         this._handleSuccess(nextStroke, animation);
@@ -79,6 +79,7 @@ class Quiz {
     this._numRecentMistakes = 0;
     let promise = this._drawMatchingStroke(stroke, animation);
     if (this._currentStrokeIndex === this._character.getNumStrokes()) {
+      this._isActive = false;
       callIfExists(this._quizOptions.onComplete, {
         character: this._character.getSymbol(),
         totalMistakes: this._totalMistakes,