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

View File

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

View File

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

View File

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

View File

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