Merge pull request #40 from lemonde/fix-empty-snapshot

Amends the top of the undo stack when model sync

Author: Yvem

angular-ckeditor.js

@@ -62,7 +62,16 @@
         // Set editor data when view data change.
         ngModelController.$render = function syncEditor() {
           controller.ready().then(function () {
-            controller.instance.setData(ngModelController.$viewValue || '');
+            // "noSnapshot" prevent recording an undo snapshot
+            controller.instance.setData(ngModelController.$viewValue || '', {
+              noSnapshot: true,
+              callback: function () {
+                // Amends the top of the undo stack with the current DOM changes
+                // ie: merge snapshot with the first empty one
+                // http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-updateSnapshot
+                controller.instance.fire('updateSnapshot');
+              }
+            });
           });
         };
       }

angular-ckeditor.min.js

@@ -24,7 +24,7 @@
   ],
   "devDependencies": {
     "angular-mocks": "~1.3.21",
-    "ckeditor": "#full/4.4.2",
+    "ckeditor": "#full/4.4.6",
     "jquery": "~2.1.4",
     "lodash": "~3.10.1"
   }

angular-ckeditor.min.js.map

@@ -1,8 +1,10 @@
+'use strict';
+
 var expect = chai.expect;
 _.str = s; // clearer exposition of underscore.string
 
 describe('CKEditor directive', function () {
-  var $compile, $document, $rootScope, scope;
+  var $compile, $document, $rootScope, scope, createElement, element;
 
   beforeEach(module('ckeditor'));
 
@@ -11,6 +13,12 @@ describe('CKEditor directive', function () {
     $rootScope = $injector.get('$rootScope');
     $document = $injector.get('$document');
     scope = $rootScope.$new();
+
+    createElement = function () {
+      element = $compile(
+        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
+      )(scope);
+    };
   }));
 
   afterEach(function cleanup (done) {
@@ -30,31 +38,23 @@ describe('CKEditor directive', function () {
         done();
       };
 
-      var element = $compile(
-        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-      )(scope);
+      createElement();
     });
 
     it('should put editor out of readonly mode when ready', function (done) {
       scope.onReady = function () {
         expect(_.find(CKEDITOR.instances).readOnly).to.be.false;
         done();
       };
-
-      var element = $compile(
-        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-      )(scope);
+      createElement();
     });
 
     it('should destroy instance on scope destroy', function (done) {
       scope.onReady = function () {
         done();
       };
 
-      var element = $compile(
-        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-      )(scope);
-
+      createElement();
       // this is tested in the afterEach "cleanup" above
     });
   });
@@ -63,9 +63,7 @@ describe('CKEditor directive', function () {
     scope.content = 'Hello';
     scope.onReady = done;
 
-    var element = $compile(
-      '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-    )(scope);
+    createElement();
   });
 
   describe('model sync', function() {
@@ -84,9 +82,7 @@ describe('CKEditor directive', function () {
         }, 0);
       };
 
-      var element = $compile(
-        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-      )(scope);
+      createElement();
     });
 
     it('should synchronize editor to the view', function (done) {
@@ -101,9 +97,7 @@ describe('CKEditor directive', function () {
         }, 5);
       };
 
-      var element = $compile(
-        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-      )(scope);
+      createElement();
     });
 
     it('should synchronize editor to the view at start', function (done) {
@@ -117,9 +111,19 @@ describe('CKEditor directive', function () {
       };
 
       scope.content = 'at start !';
-      var element = $compile(
-        '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-      )(scope);
+      createElement();
+    });
+
+    it('should contain only one snapshot at start', function (done) {
+      scope.onReady = function () {
+        setTimeout(function () {
+          expect(_.find(CKEDITOR.instances).undoManager.snapshots.length).to.equal(1);
+          done();
+        }, 5);
+      };
+
+      scope.content = 'at start !';
+      createElement();
     });
 
     it('should update model in a watchable way', function (done) {
@@ -134,10 +138,7 @@ describe('CKEditor directive', function () {
         _.find(CKEDITOR.instances).setData('<p>Hey</p>');
       };
 
-      var element =
-        $compile(
-          '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-        )(scope);
+      createElement();
     });
   });
 
@@ -150,9 +151,7 @@ describe('CKEditor directive', function () {
           done();
         };
 
-        var element = $compile(
-          '<div contenteditable="true" ckeditor ng-model="content" ready="onReady()"></div>'
-        )(scope);
+        createElement();
       });
     });