Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch back to codemirror-minified

Browse Source
This commit is contained in:
BoykoAlex
2019-11-27 16:41:51 -05:00
parent cc5b9270f8
commit 5fe0f89494
10 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/demo/app/app.component.ts
View File

@@ -7,10 +7,10 @@ const { Renderer } = require('./renderer');
const { Editor } = require('./editor');
// Code editor used from Flo requires the follwoing CM extensions
import 'codemirror/mode/javascript/javascript';
import 'codemirror/mode/ruby/ruby';
import 'codemirror/mode/clike/clike';
import 'codemirror/addon/lint/javascript-lint';
import 'codemirror-minified/mode/javascript/javascript';
import 'codemirror-minified/mode/ruby/ruby';
import 'codemirror-minified/mode/clike/clike';
import 'codemirror-minified/addon/lint/javascript-lint';
@Component({
selector: 'demo-app',

3
src/demo/systemjs.config.js
View File

@@ -59,7 +59,8 @@
'lodash': 'npm:lodash',
'underscore': 'npm:lodash',
'dagre': 'npm:dagre',
'codemirror': 'npm:codemirror',
'codemirror': 'npm:codemirror-minified',
'codemirror-minified': 'npm:codemirror-minified',
'moment': 'npm:moment/moment.js',
'ts-disposables': 'npm:ts-disposables',
'jshint': 'npm:jshint/dist/jshint.js'

8
src/lib/@types/codemirror-minified/index.d.ts vendored Normal file
View File

@@ -0,0 +1,8 @@
declare module 'codemirror-minified' {
import * as CodeMirror from '@types/codemirror'
export = CodeMirror;
export as namespace CodeMirror;
}

38
src/lib/code-editor/code-editor.component.ts
View File

@@ -1,35 +1,35 @@
import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation, forwardRef } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import * as CodeMirror from 'codemirror';
import * as CodeMirror from 'codemirror-minified';
import * as _$ from 'jquery';
const $: any = _$;
// CodeMirror extensions
import 'codemirror/mode/meta';
import 'codemirror/addon/lint/lint';
import 'codemirror/addon/hint/show-hint';
// import 'codemirror/addon/mode/loadmode';
import 'codemirror/addon/edit/matchbrackets';
import 'codemirror/addon/edit/closebrackets';
import 'codemirror/addon/display/placeholder';
import 'codemirror/addon/scroll/annotatescrollbar';
import 'codemirror/addon/scroll/simplescrollbars';
import 'codemirror-minified/mode/meta';
import 'codemirror-minified/addon/lint/lint';
import 'codemirror-minified/addon/hint/show-hint';
// import 'codemirror-minified/addon/mode/loadmode';
import 'codemirror-minified/addon/edit/matchbrackets';
import 'codemirror-minified/addon/edit/closebrackets';
import 'codemirror-minified/addon/display/placeholder';
import 'codemirror-minified/addon/scroll/annotatescrollbar';
import 'codemirror-minified/addon/scroll/simplescrollbars';
// Lint support
// Unclear how to import this dynamically...
// import 'codemirror/addon/lint/javascript-lint';
// import 'codemirror/addon/lint/json-lint';
// import 'codemirror/addon/lint/yaml-lint';
// import 'codemirror-minified/addon/lint/javascript-lint';
// import 'codemirror-minified/addon/lint/json-lint';
// import 'codemirror-minified/addon/lint/yaml-lint';
// TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD
// Supported languages until dynamic loading
// import 'codemirror/mode/groovy/groovy';
// import 'codemirror/mode/javascript/javascript';
// import 'codemirror/mode/python/python';
// import 'codemirror/mode/ruby/ruby';
// import 'codemirror/mode/clike/clike';
// import 'codemirror/mode/yaml/yaml';
// import 'codemirror-minified/mode/groovy/groovy';
// import 'codemirror-minified/mode/javascript/javascript';
// import 'codemirror-minified/mode/python/python';
// import 'codemirror-minified/mode/ruby/ruby';
// import 'codemirror-minified/mode/clike/clike';
// import 'codemirror-minified/mode/yaml/yaml';
@Component({
selector: 'code-editor',

12
src/lib/dsl-editor/dsl-editor.component.ts
View File

@@ -1,14 +1,14 @@
import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
import * as _ from 'lodash';
import * as CodeMirror from 'codemirror';
import * as CodeMirror from 'codemirror-minified';
import * as _$ from 'jquery';
const $: any = _$;
import 'codemirror/addon/lint/lint';
import 'codemirror/addon/hint/show-hint';
import 'codemirror/addon/display/placeholder';
import 'codemirror/addon/scroll/annotatescrollbar';
import 'codemirror/addon/scroll/simplescrollbars';
import 'codemirror-minified/addon/lint/lint';
import 'codemirror-minified/addon/hint/show-hint';
import 'codemirror-minified/addon/display/placeholder';
import 'codemirror-minified/addon/scroll/annotatescrollbar';
import 'codemirror-minified/addon/scroll/simplescrollbars';
@Component({
selector: 'dsl-editor',

8
src/lib/styles.scss
View File

@@ -1,5 +1,5 @@
@import "./../../node_modules/jointjs/dist/joint.core.css";
@import "./../../node_modules/codemirror/lib/codemirror.css";
@import "./../../node_modules/codemirror/addon/hint/show-hint.css";
@import "./../../node_modules/codemirror/addon/lint/lint.css";
@import "./../../node_modules/codemirror/addon/scroll/simplescrollbars.css";
@import "./../../node_modules/codemirror-minified/lib/codemirror.css";
@import "./../../node_modules/codemirror-minified/addon/hint/show-hint.css";
@import "./../../node_modules/codemirror-minified/addon/lint/lint.css";
@import "./../../node_modules/codemirror-minified/addon/scroll/simplescrollbars.css";