Merge branch 'master' of github.com:froala/angular-froala

Author: stefanneculai

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 froala/*
+dist/*
 bower_components/*
 node_modules/*
 npm-debug.log

src/angular-froala.js

@@ -41,29 +41,39 @@ value('froalaConfig', {})
 
                 //Instruct ngModel how to update the froala editor
                 ngModel.$render = function () {
-                    element.froalaEditor('html.set', ngModel.$viewValue || '', true);
-                    //This will reset the undo stack everytime the model changes externally. Can we fix this?
-                    element.froalaEditor('undo.reset');
-                    element.froalaEditor('undo.saveStep');
+                    if (ctrl.editorInitialized) {
+                        element.froalaEditor('html.set', ngModel.$viewValue || '', true);
+                        //This will reset the undo stack everytime the model changes externally. Can we fix this?
+                        element.froalaEditor('undo.reset');
+                        element.froalaEditor('undo.saveStep');
+                    }
                 };
 
                 ngModel.$isEmpty = function (value) {
-                  if (!value) return true;
+                    if (!value) {
+                        return true;
+                    }
 
-                  var isEmpty = element.froalaEditor('node.isEmpty', jQuery('<div>' + value + '</div>').get(0));
-                  return isEmpty;
+                    var isEmpty = element.froalaEditor('node.isEmpty', jQuery('<div>' + value + '</div>').get(0));
+                    return isEmpty;
                 };
             };
 
-            ctrl.createEditor = function () {
+            ctrl.createEditor = function (froalaInitOptions) {
                 ctrl.listeningEvents = ['froalaEditor'];
                 if (!ctrl.editorInitialized) {
-                    ctrl.options = angular.extend({}, defaultConfig, froalaConfig, scope.froalaOptions);
+                    froalaInitOptions = (froalaInitOptions || {});
+                    ctrl.options = angular.extend({}, defaultConfig, froalaConfig, scope.froalaOptions,froalaInitOptions);
 
                     if (ctrl.options.immediateAngularModelUpdate) {
                         ctrl.listeningEvents.push('keyup');
                     }
 
+                    ctrl.registerEventsWithCallbacks('froalaEditor.initialized', function() {
+                        ctrl.editorInitialized = true;
+                        ngModel.$render();
+                    });
+
                     // Register events provided in the options
                     // Registering events before initializing the editor will bind the initialized event correctly.
                     for (var eventName in ctrl.options.events) {
@@ -80,8 +90,6 @@ value('froalaConfig', {})
                     if (scope.froalaOptions) {
                         scope.froalaOptions.froalaEditor = ctrl.froalaEditor;
                     }
-
-                    ctrl.editorInitialized = ctrl.froalaEditor ? true : false;
                 }
             };
 
@@ -106,6 +114,9 @@ value('froalaConfig', {})
                 var returnedHtml = element.froalaEditor('html.get');
                 if (angular.isString(returnedHtml)) {
                     ngModel.$setViewValue(returnedHtml);
+                    if (!scope.$root.$$phase) {
+                        scope.$apply();
+                    }
                 }
             };
 

test/angular-froala.spec.js

@@ -56,7 +56,7 @@ describe("froala", function () {
         if (scope.froalaOptions === undefined) {
             scope.froalaOptions = {};
         }
-        scope.froalaOptions.initOnClick = true;
+        scope.froalaOptions.disableRightClick = true;
         scope.content = '';
     };
 
@@ -88,7 +88,7 @@ describe("froala", function () {
         compileElement();
 
         expect(froalaEditorStub.args[0][0].placeholderText).toEqual('Placeholder');
-        expect(froalaEditorStub.args[0][0].initOnClick).toBeTruthy();
+        expect(froalaEditorStub.args[0][0].disableRightClick).toBeTruthy();
     });
 
     it('Uses default option values when no options are provided', function () {
@@ -150,6 +150,7 @@ describe("froala", function () {
         });
 
         froalaEditorOnStub.callArgOn(1);
+        $rootScope.$digest();
 
         expect($rootScope.content).toEqual('My String');
     });
@@ -160,6 +161,7 @@ describe("froala", function () {
         });
 
         element.trigger('froalaEditor.contentChanged');
+        $rootScope.$digest();
 
         expect($rootScope.content).toEqual('My String');
     });
@@ -169,6 +171,7 @@ describe("froala", function () {
 
         $rootScope.content = '<i>New Text</i>';
         $rootScope.$digest();
+        element.trigger('froalaEditor.initialized');
 
         expect(froalaEditorStub.getCall(1).args[0]).toEqual('html.set');
         expect(froalaEditorStub.getCall(1).args[1]).toEqual('<i>New Text</i>');
@@ -217,9 +220,11 @@ describe("froala", function () {
         createEditorInManualMode();
 
         $rootScope.initControls.initialize();
+        element.trigger('froalaEditor.initialized');
+
         $rootScope.initControls.initialize();
 
-        expect(froalaEditorStub.callCount).toEqual(1);
+        expect(froalaEditorStub.callCount).toEqual(4); // 1 for creating editor and 3 after initialized event
     });
 
     it('Can re-initialize the editor after closing it', function () {
@@ -297,12 +302,21 @@ describe("froala", function () {
 
     });
 
-		it('Sets the view to the value of the model', function () {
+	it('Sets the view to the value of the model', function () {
 				$rootScope.content = '<i>New Text</i>';
 
 				compileViewElement();
 				$rootScope.$digest();
 
       	expect(view.html()).toEqual("<i>New Text</i>");
-		});
+	});
+
+    it('Sets options when the editor is instantiated manually', function () {
+        createEditorInManualMode();
+
+        $rootScope.initControls.initialize({initOnClick: false});
+
+        expect(froalaEditorStub.called).toBeTruthy();
+        expect(froalaEditorStub.args[0][0].initOnClick).toBeFalsy();
+    });
 });