fix(taBinde.undomanager): Fix a bug with redo/undo beyond the borders

Fixes #558
textAngular · May 23, 2015 · dd023c3 · dd023c3
1 parent 8482449
commit dd023c3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/dist/textAngular.min.js b/dist/textAngular.min.js
diff --git a/lib/taBind.js b/lib/taBind.js
@@ -167,16 +167,19 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 				}
 			};
 
+			var _redoUndoTimeout;
 			var _undo = scope['$undoTaBind' + (attrs.id || '')] = function(){
 				/* istanbul ignore else: can't really test it due to all changes being ignored as well in readonly */
 				if(!_isReadonly && _isContentEditable){
 					var content = ngModel.$undoManager.undo();
 					if(typeof content !== "undefined" && content !== null){
 						_setInnerHTML(content);
 						_setViewValue(content, false);
-						/* istanbul ignore else: browser catch */
-						if(element[0].childNodes.length) taSelection.setSelectionToElementEnd(element[0].childNodes[element[0].childNodes.length-1]);
-						else taSelection.setSelectionToElementEnd(element[0]);
+						if(_redoUndoTimeout) $timeout.cancel(_redoUndoTimeout);
+						_redoUndoTimeout = $timeout(function(){
+							element[0].focus();
+							taSelection.setSelectionToElementEnd(element[0]);
+						}, 1);
 					}
 				}
 			};
@@ -188,9 +191,12 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 					if(typeof content !== "undefined" && content !== null){
 						_setInnerHTML(content);
 						_setViewValue(content, false);
-						/* istanbul ignore else: browser catch */
-						if(element[0].childNodes.length) taSelection.setSelectionToElementEnd(element[0].childNodes[element[0].childNodes.length-1]);
-						else taSelection.setSelectionToElementEnd(element[0]);
+						/* istanbul ignore next */
+						if(_redoUndoTimeout) $timeout.cancel(_redoUndoTimeout);
+						_redoUndoTimeout = $timeout(function(){
+							element[0].focus();
+							taSelection.setSelectionToElementEnd(element[0]);
+						}, 1);
 					}
 				}
 			};

diff --git a/src/textAngular.js b/src/textAngular.js
@@ -1142,16 +1142,19 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 				}
 			};
 
+			var _redoUndoTimeout;
 			var _undo = scope['$undoTaBind' + (attrs.id || '')] = function(){
 				/* istanbul ignore else: can't really test it due to all changes being ignored as well in readonly */
 				if(!_isReadonly && _isContentEditable){
 					var content = ngModel.$undoManager.undo();
 					if(typeof content !== "undefined" && content !== null){
 						_setInnerHTML(content);
 						_setViewValue(content, false);
-						/* istanbul ignore else: browser catch */
-						if(element[0].childNodes.length) taSelection.setSelectionToElementEnd(element[0].childNodes[element[0].childNodes.length-1]);
-						else taSelection.setSelectionToElementEnd(element[0]);
+						if(_redoUndoTimeout) $timeout.cancel(_redoUndoTimeout);
+						_redoUndoTimeout = $timeout(function(){
+							element[0].focus();
+							taSelection.setSelectionToElementEnd(element[0]);
+						}, 1);
 					}
 				}
 			};
@@ -1163,9 +1166,12 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 					if(typeof content !== "undefined" && content !== null){
 						_setInnerHTML(content);
 						_setViewValue(content, false);
-						/* istanbul ignore else: browser catch */
-						if(element[0].childNodes.length) taSelection.setSelectionToElementEnd(element[0].childNodes[element[0].childNodes.length-1]);
-						else taSelection.setSelectionToElementEnd(element[0]);
+						/* istanbul ignore next */
+						if(_redoUndoTimeout) $timeout.cancel(_redoUndoTimeout);
+						_redoUndoTimeout = $timeout(function(){
+							element[0].focus();
+							taSelection.setSelectionToElementEnd(element[0]);
+						}, 1);
 					}
 				}
 			};

diff --git a/test/taBind/taBind.undoManager.spec.js b/test/taBind/taBind.undoManager.spec.js
@@ -107,11 +107,13 @@ describe('taBind.undoManager', function () {
 			$rootScope.$digest();
 		});
 		describe('should update', function(){
-			beforeEach(function(){
+			beforeEach(inject(function($timeout){
 				$rootScope.$undoTaBindTest();
 				$rootScope.$undoTaBindTest();
+				$timeout.flush();
 				$rootScope.$redoTaBindTest();
-			});
+				$timeout.flush();
+			}));
 			it('model', function(){
 				expect($rootScope.$undoManagerTest.current()).toBe(second);
 			});
@@ -124,6 +126,7 @@ describe('taBind.undoManager', function () {
 			it('not error', function(){
 				expect(function(){
 					$rootScope.$redoTaBindTest();
+					$rootScope.$redoTaBindTest();
 				}).not.toThrow();
 			});
 			it('not change html', function(){