Merge pull request #109 from nwpan/bug/activate_summernote_with_empty…

…_model Fix for an issue where initializing an (unintentional) empty model causes a push onto the Summernote History stack.
summernote · Feb 1, 2016 · 88063d1 · 88063d1
2 parents e94e2fb + 8dae336
commit 88063d1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/src/angular-summernote.js b/src/angular-summernote.js
@@ -41,7 +41,7 @@ angular.module('summernote', [])
           removedMedia.attrs[attr.name] = attr.value;
         });
         $scope.mediaDelete({target: removedMedia});
-      }
+      };
     }
 
     this.activate = function(scope, element, ngModel) {
@@ -152,14 +152,22 @@ angular.module('summernote', [])
       template: '<div class="summernote"></div>',
       link: function(scope, element, attrs, ctrls, transclude) {
         var summernoteController = ctrls[0],
-            ngModel = ctrls[1];
-
-        transclude(scope, function(clone, scope) {
-          // to prevent binding to angular scope (It require `tranclude: 'element'`)
-          element.append(clone.html());
-        });
+          ngModel = ctrls[1];
 
-        summernoteController.activate(scope, element, ngModel);
+          if (!ngModel) {
+            transclude(scope, function(clone, scope) {
+              // to prevent binding to angular scope (It require `tranclude: 'element'`)
+              element.append(clone.html());
+            });
+            summernoteController.activate(scope, element, ngModel);
+          } else {
+            scope.$watch(function() {
+              return ngModel.$viewValue;
+            }, function(value) {
+              element.append(value);
+              summernoteController.activate(scope, element, ngModel);
+            }, true);
+          }
       }
     };
   }]);
diff --git a/test/angular-summernote.test.js b/test/angular-summernote.test.js
@@ -284,6 +284,18 @@ describe('Summernote directive', function() {
       el.remove();
     });
 
+    it('element text should be blank in outer scope before digesting', function() {
+      // given
+      var blankText = '', helloText = 'Hello World';
+      var element = $compile('<summernote ng-model="text"></summernote>')(scope);
+      scope.text = helloText;
+      expect(element.html()).to.be.equal(blankText);
+      // when
+      scope.$digest();
+      // then
+      expect(element.html()).to.be.equal(helloText);
+    });
+
     it('text should be synchronized when text is changed using toolbar', function() {
       var selectText = function(element){
         var doc = document,