Skip to content
This repository was archived by the owner on May 25, 2019. It is now read-only.

Added dependency injection and blur event #148

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-codemirror",
"version": "0.3.0",
"version": "0.3.2",
"description": "This directive allows you to add CodeMirror to your textarea elements.",
"author": "https://github.com/angular-ui/ui-codemirror/contributors",
"license": "MIT",
Expand Down
22 changes: 16 additions & 6 deletions src/ui-codemirror.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
}

function newCodemirrorEditor(iElement, codemirrorOptions) {
var codemirrot;
var codemirror;

if (iElement[0].tagName === 'TEXTAREA') {
// Might bug but still ...
codemirrot = window.CodeMirror.fromTextArea(iElement[0], codemirrorOptions);
codemirror = window.CodeMirror.fromTextArea(iElement[0], codemirrorOptions);
} else {
iElement.html('');
codemirrot = new window.CodeMirror(function(cm_el) {
codemirror = new window.CodeMirror(function(cm_el) {
iElement.append(cm_el);
}, codemirrorOptions);
}

return codemirrot;
return codemirror;
}

function configOptionsWatcher(codemirrot, uiCodemirrorAttr, scope) {
function configOptionsWatcher(codemirror, uiCodemirrorAttr, scope) {
if (!uiCodemirrorAttr) { return; }

var codemirrorDefaultsKeys = Object.keys(window.CodeMirror.defaults);
Expand All @@ -93,7 +93,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
return;
}

codemirrot.setOption(key, newValues[key]);
codemirror.setOption(key, newValues[key]);
}
});
}
Expand Down Expand Up @@ -132,6 +132,14 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
});
}
});

// Emit HTML 'blur' event when editor loses focus
codemirror.on('blur', function(instance) {
angular
.element(instance.getWrapperElement())
.parent()
.trigger('blur');
});
}

function configUiRefreshAttribute(codeMirror, uiRefreshAttr, scope) {
Expand All @@ -148,3 +156,5 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
}

}

uiCodemirrorDirective.$inject = ['$timeout', 'uiCodemirrorConfig'];