Skip to content

Fix ngModel rendering when initOnClick: true (#223) #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix ngModel rendering when initOnClick: true (#223) #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37efed
Added sample for initOnClick: true to the demo
robinwassen Dec 3, 2019
c3e573e
Fix ngModel rendering when initOnClick: true
robinwassen Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions demo/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
$scope.sample2Text = '';
$scope.sample3Text = 'Check out the <a href="https://www.froala.com/wysiwyg-editor">Froala Editor</a>';


$scope.imgModel = {src: 'image.jpg'};

$scope.buttonModel = {innerHTML: 'Click Me'};
Expand All @@ -42,6 +43,12 @@
angularIgnoreAttrs: ['class', 'ng-model', 'id', 'froala']
}

$scope.sample8Text = '<p><b>Hello</b>, world!</p>';
$scope.sample8Options = {
initOnClick: true,
placeholderText: "",
}

$scope.initializeLink = function(linkInitControls) {
$scope.linkInitControls = linkInitControls;
};
Expand Down
5 changes: 5 additions & 0 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ <h4>Model Obj:</h4>
<div>{{linkModel}}</div>
</div>

<div class="sample">
<h2>Sample 8: Init on click</h2>
<textarea id="froala-sample-2" froala="sample8Options" ng-model="sample8Text"></textarea>
</div>

</body>

</html>
3 changes: 3 additions & 0 deletions src/angular-froala.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
ctrl.froalaEditor.undo.reset();
ctrl.froalaEditor.undo.saveStep();
}
else if (ctrl.froalaEditor) {
ctrl.froalaEditor.el.innerHTML = ngModel.$viewValue || '';
}
}
};

Expand Down