Added ability to use ngModel and innerHTML at the same time #78
Conversation
|
Thanks, I'll have to have a look at this when I get my laptop on wifi as my mobile makes it look like you're using initial values in the $render function and I can't expand the code to see it all properly. |
| @@ -346,6 +346,13 @@ textAngular.directive("textAngular", ['$compile', '$window', '$document', '$root | |||
| // changes to the model variable from outside the html/text inputs | |||
| if(attrs.ngModel){ // if no ngModel, then the only input is from inside text-angular | |||
| ngModel.$render = function() { | |||
| if(ngModel.$viewValue === undefined && originalContents !== undefined) { | |||
There was a problem hiding this comment.
This section, shouldn't really be in the $render function (Unless there was a good reason for it being done there?). If you move this logic outside the $render function then it better represents this should only load on first time. Otherwise we would have the problem of the editor resetting to the originalContents in the case of issue #64 whereby the model value is set to undefined and should be blank.
Also it should simplify the code down to:
if(ngModel.$viewValue === undefined && originalContents !== undefined){
ngModel.$setViewValue(originalContents); // on passing through to taBind it will be sanitised
}… of the angular-sanitize tests from their repo. Including tests and functionality for #79 Added in the $destroy cleanup functions #91 Fixed up using the initial value #78 - we only want it to run ONCE otherwise you can't clear the editor. Fixed some code up that won't ever get run and also causes some error messages not to show.
|
As I've added this in in the 1.2.0 branch which is nearing release date and It's going to be difficult to merge in this properly, I am going to merge in your work directly prior to merging in the 1.2.0 branch which will overwrite it, thus I don't have to worry about conflicts and you get credit in the repo. |
The current version does not allow you to use ngModel. I moved sanitizing to a factory so it could be used in all directives (so I could use sanitize in textAngular directive). In the case there there is no initial value, the model will be set to the innerHTML. However, if there is a value on the model, it will ignore the current html and use that instead.