Skip to content

B1 - pull #29

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

B1 - pull #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
211c1c7
Update angular-redactor.js
hanskerkhof May 23, 2014
fd90400
Set form pristine after init
hanskerkhof Dec 20, 2014
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
16 changes: 9 additions & 7 deletions angular-redactor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
(function () {
'use strict';

/**
* usage: <textarea ng-model="content" redactor></textarea>
*
Expand All @@ -16,10 +15,13 @@
link: function (scope, element, attrs, ngModel) {

var updateModel = function updateModel(value) {
scope.$apply(function () {
ngModel.$setViewValue(value);
});
},
/* fix for html code view in redactor v9.2.1+ */
Copy link
Owner

@TylerGarlick TylerGarlick Dec 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer if you did the 9.2.1 work in the angular-redactor-9.x version, the 10.0 version changed quite a bit.

if(element.not(':visible')) {
scope.$apply(function () {
ngModel.$setViewValue(value);
});
}
},
options = {
changeCallback: updateModel
},
Expand All @@ -30,8 +32,7 @@

angular.extend(options, additionalOptions);

// put in timeout to avoid $digest collision. call render() to
// set the initial value.
// put in timeout to avoid $digest collision. call render() to set the initial value.
$timeout(function () {
editor = $_element.redactor(options);
ngModel.$render();
Expand All @@ -41,6 +42,7 @@
if (angular.isDefined(editor)) {
$timeout(function() {
$_element.redactor('set', ngModel.$viewValue || '');
ngForm.$setPristine();
Copy link
Owner

@TylerGarlick TylerGarlick Dec 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep this in for this version, and it'd be nice to add in the 9.2.x file version.

});
}
};
Expand Down