use updated codemirror release

This commit is contained in:
John Mitchell 2016-07-18 09:53:10 -04:00
parent 89a4f8f77c
commit eabc83c914
5 changed files with 23 additions and 30 deletions

View File

@ -1,6 +1,6 @@
{
"name": "angular-codemirror",
"version": "1.0.2",
"version": "1.0.3",
"dependencies": {
"angular": "latest",
"angular-route": "latest",
@ -13,14 +13,13 @@
"codemirror": "latest"
},
"homepage": "https://github.com/chouseknecht/angular-codemirror",
"_release": "1.0.2",
"_release": "1.0.3",
"_resolution": {
"type": "version",
"tag": "v1.0.2",
"commit": "94b7aac548b036f4fbd94e56129ed9574e472616"
"tag": "1.0.3",
"commit": "b94dc86fde8f60a50b324054806d29d742177d21"
},
"_source": "git://github.com/chouseknecht/angular-codemirror.git",
"_target": "~1.0.2",
"_originalSource": "angular-codemirror",
"_direct": true
"_source": "https://github.com/chouseknecht/angular-codemirror.git",
"_target": "~1.0.3",
"_originalSource": "angular-codemirror"
}

View File

@ -1,6 +1,6 @@
{
"name": "angular-codemirror",
"version": "0.0.3",
"version": "1.0.2",
"dependencies": {
"angular": "latest",
"angular-route": "latest",

View File

@ -1,6 +1,6 @@
/**********************************************
* AngularCodeMirror.css
*
*
* CodeMirror.css overrides
*
* Copyright (c) 2014 Chris Houseknecht
@ -30,14 +30,14 @@
.CodeMirror {
height: auto;
}
.CodeMirror-activeline-background {
background-color: #f7f7f7;
}
/* Modal dialog overrides to make jqueryui dialog blend in with Twitter.
/* Modal dialog overrides to make jqueryui dialog blend in with Twitter.
Why? Twitter's modal is not draggable or resizable, which is not very
useful for a code editor */
@ -71,7 +71,7 @@
border-color: #ffffff;
color: #A9A9A9;
}
.ui-dialog .ui-resizable-se {
right: 5px;
bottom: 5px;
@ -108,3 +108,4 @@
.CodeMirror-lint-tooltip {
z-index: 2060;
}

View File

@ -43,13 +43,12 @@ angular.module('AngularCodeMirrorModule', [])
model = params.model,
mode = params.mode,
onReady = params.onReady,
onChange = params.onChange,
height = 0;
self.element = $(element);
// We don't want to touch the original textarea. Angular likely has a model and other listeners
// attached to it. In prior iterations attaching CodeMirror to it seemed to go bad, so we'll insert a
// attached to it. In prior iterations attaching CodeMirror to it seemed to go bad, so we'll insert a
// <div> under it, hide the textarea and let CodeMirror attach to the <div>.
if ($('#cm-' + model + '-container').length > 0) {
$('#cm-' + model + '-container').empty();
@ -57,18 +56,19 @@ angular.module('AngularCodeMirrorModule', [])
else {
self.element.after("<div id=\"cm-" + model + "-container\"></div>");
}
// Calc the height of the text area- our CodeMirror should match.
height += self.element.attr('rows') * parseInt($(self.element).css('line-height').replace(/px/,''),10);
height += parseInt(self.element.css('padding-top').replace(/px|%/,''),10) +
parseInt(self.element.css('padding-bottom').replace(/px|%/,''),10);
height += 2; //for the border
// hide
self.element.hide();
// Initialize CodeMirror
self.modes[mode].value = scope[model];
// if readOnly is passed to AngularCodeMirror, set the
// options for all modes to be readOnly
if (readOnly) {
@ -76,6 +76,7 @@ angular.module('AngularCodeMirrorModule', [])
self.modes[val].readOnly = true;
});
}
self.myCodeMirror = CodeMirror(document.getElementById('cm-' + model + '-container'), self.modes[mode]);
// Adjust the height
@ -92,14 +93,7 @@ angular.module('AngularCodeMirrorModule', [])
// Update the model on change
self.myCodeMirror.on('change', function() {
setTimeout(function() {
scope.$apply(function(){
scope[model] = self.myCodeMirror.getValue();
if (onChange) {
onChange();
}
});
}, 500);
setTimeout(function() { scope.$apply(function(){ scope[model] = self.myCodeMirror.getValue(); }); }, 500);
});
};

View File

@ -52,8 +52,7 @@
"tag": "2.0.0",
"commit": "8a1951c54a956c33964c99b338f3a4830e652689"
},
"_source": "git://github.com/tameraydin/ngToast.git",
"_source": "https://github.com/tameraydin/ngToast.git",
"_target": "~2.0.0",
"_originalSource": "ngtoast",
"_direct": true
"_originalSource": "ngtoast"
}