Merge pull request #27 from oowl/patch-1

Tyler Garlick · Tyler Garlick · commit 8e5405d194f1 · 2014-11-19T17:29:45.000-07:00
Update angular-redactor.js
diff --git a/angular-redactor.js b/angular-redactor.js
@@ -41,10 +41,11 @@
                     angular.extend(options, redactorOptions, additionalOptions);
 
                     // prevent collision with the constant values on ChangeCallback
-                    if(!angular.isUndefined(redactorOptions.changeCallback)) {
-                        options.changeCallback = function() {
-                            updateModel.call(this);
-                            redactorOptions.changeCallback.call(this);
+                    var changeCallback = additionalOptions.changeCallback || redactorOptions.changeCallback;
+                    if (changeCallback) {
+                        options.changeCallback = function(value) {
+                            updateModel.call(this, value);
+                            changeCallback.call(this, value);
                         }
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,11 @@`
`41`	`41`	`angular.extend(options, redactorOptions, additionalOptions);`
`42`	`42`
`43`	`43`	`// prevent collision with the constant values on ChangeCallback`
`44`		`- if(!angular.isUndefined(redactorOptions.changeCallback)) {`
`45`		`- options.changeCallback = function() {`
`46`		`- updateModel.call(this);`
`47`		`- redactorOptions.changeCallback.call(this);`
	`44`	`+ var changeCallback = additionalOptions.changeCallback \|\| redactorOptions.changeCallback;`
	`45`	`+ if (changeCallback) {`
	`46`	`+ options.changeCallback = function(value) {`
	`47`	`+ updateModel.call(this, value);`
	`48`	`+ changeCallback.call(this, value);`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`