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

move strict to inside function #107

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

move strict to inside function #107

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb80bf6
move strict to inside function
geyang Sep 5, 2015
5257adc
collect watch and event handles and remove during scope destruction
geyang Sep 5, 2015
665a234
fix styling issue to let travis pass
geyang Sep 5, 2015
8254c4f
move handles to scope to prevent modifying the conclosure scope.
geyang Sep 5, 2015
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
22 changes: 15 additions & 7 deletions src/ui-codemirror.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

/**
* Binds a CodeMirror widget to a <textarea> element.
*/
Expand All @@ -11,6 +9,7 @@ angular.module('ui.codemirror', [])
* @ngInject
*/
function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
'use strict';

return {
restrict: 'EA',
Expand All @@ -28,6 +27,8 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {

function postLink(scope, iElement, iAttrs, ngModel) {

scope.handles = [];

var codemirrorOptions = angular.extend(
{ value: iElement.text() },
uiCodemirrorConfig.codemirror || {},
Expand All @@ -49,18 +50,25 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {

// Allow access to the CodeMirror instance through a broadcasted event
// eg: $broadcast('CodeMirror', function(cm){...});
scope.$on('CodeMirror', function(event, callback) {
scope.handles.push(scope.$on('CodeMirror', function(event, callback) {
if (angular.isFunction(callback)) {
callback(codemirror);
} else {
throw new Error('the CodeMirror event requires a callback function');
}
});
}));

// onLoad callback
if (angular.isFunction(codemirrorOptions.onLoad)) {
codemirrorOptions.onLoad(codemirror);
}

scope.handles.push(scope.$on('$destroy', function(){
angular.forEach(scope.handles, function(unbind){
unbind();
});
scope.handles = null;
}));
}

function newCodemirrorEditor(iElement, codemirrorOptions) {
Expand All @@ -83,7 +91,7 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
if (!uiCodemirrorAttr) { return; }

var codemirrorDefaultsKeys = Object.keys(window.CodeMirror.defaults);
scope.$watch(uiCodemirrorAttr, updateOptions, true);
scope.handles.push(scope.$watch(uiCodemirrorAttr, updateOptions, true));
function updateOptions(newValues, oldValue) {
if (!angular.isObject(newValues)) { return; }
codemirrorDefaultsKeys.forEach(function(key) {
Expand Down Expand Up @@ -137,14 +145,14 @@ function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
function configUiRefreshAttribute(codeMirror, uiRefreshAttr, scope) {
if (!uiRefreshAttr) { return; }

scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
scope.handles.push(scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
// Skip the initial watch firing
if (newVal !== oldVal) {
$timeout(function() {
codeMirror.refresh();
});
}
});
}));
}

}