v1.0.7 Undo/redo and error mgmt improvements

MyScript · May 13, 2015 · 1a9cc59 · 1a9cc59
1 parent 7b44629
commit 1a9cc59
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 20 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "myscript",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "main": "./dist/myscript.js",
     "description": "MyScriptJS is a free and open-source JavaScript library providing the easiest way to use MyScript Cloud handwriting recognition in your web app",
     "keywords": [

diff --git a/dist/myscript.js b/dist/myscript.js
diff --git a/dist/myscript.js.map b/dist/myscript.js.map
diff --git a/dist/myscript.min.js b/dist/myscript.min.js
diff --git a/dist/myscript.min.js.map b/dist/myscript.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myscript",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "./dist/myscript.js",
   "description": "MyScriptJS is a free and open-source JavaScript library providing the easiest way to use MyScript Cloud handwriting recognition in your web app",
   "keywords": [

diff --git a/src/common/inkManager.js b/src/common/inkManager.js
@@ -44,6 +44,9 @@
      */
     InkManager.prototype.startInkCapture = function (x, y, t) {
         if (!this.writing) {
+            if (this.isRedoEmpty()) {
+                this.clearUndoRedoStack();
+            }
             this.currentStroke = new scope.Stroke();
             this.currentStroke.addX(x);
             this.currentStroke.addY(y);

diff --git a/src/networking/networkInterface.js b/src/networking/networkInterface.js
@@ -62,8 +62,6 @@
             if (request.readyState === 4) {
                 if (request.status >= 200 && request.status < 300) {
                     deferred.resolve(NetworkInterface.parse(request));
-                } else {
-                    deferred.reject(NetworkInterface.parse(request));
                 }
             }
         }
@@ -72,12 +70,12 @@
             if (request.status >= 200 && request.status < 300) {
                 deferred.resolve(NetworkInterface.parse(request));
             } else {
-                deferred.reject('Status code was ' + request.status);
+                deferred.reject(new Error(request.responseText));
             }
         }
 
         function onError() {
-            deferred.reject('Can\'t XHR ' + JSON.stringify(url));
+            deferred.reject(new Error('Can\'t XHR ' + url));
         }
 
         function onProgress(event) {

diff --git a/test/unit/common/inkManager.js b/test/unit/common/inkManager.js
@@ -145,6 +145,17 @@ describe('MyScriptJS: common/inkManager.js', function () {
         expect(inkManager.getUndoRedoStack()[inkManager.getUndoRedoStack().length - 1]).to.deep.equal(stroke);
     });
 
+    it('Test undo/redo stack', function () {
+        inkManager.redo();
+
+        inkManager.startInkCapture(50, 2);
+        inkManager.continueInkCapture(60, 8);
+        inkManager.endInkCapture();
+
+        expect(inkManager.getStrokes().length).to.equal(2);
+        expect(inkManager.getUndoRedoStack().length).to.equal(0);
+    });
+
     it('InkManager clear Undo/redo Stack', function () {
         inkManager.clearUndoRedoStack();
 
@@ -153,6 +164,7 @@ describe('MyScriptJS: common/inkManager.js', function () {
     });
 
     it('InkManager copy', function () {
+        inkManager.clear();
         var copyStrokes = [];
         // add one stroke
         inkManager.startInkCapture(50, 2);