Skip to content

Commit 675b30f

Browse files
authored
Update angular-froala.js
Reverting wrong commit
1 parent 65638d7 commit 675b30f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/angular-froala.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
ctrl.createEditor = function(froalaInitOptions) {
102102
if (!ctrl.editorInitialized) {
103103
froalaInitOptions = (froalaInitOptions || {});
104-
ctrl.options = angular.extend({}, defaultConfig, froalaConfig, froalaInitOptions);
104+
ctrl.options = angular.extend({}, defaultConfig, froalaConfig, scope.froalaOptions, froalaInitOptions);
105105

106106
ctrl.registerEventsWithCallbacks('initializationDelayed', function() {
107107
ngModel.$render()

0 commit comments

Comments
 (0)