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

Revert "Switch back codemirror"

Browse Source 
This reverts commit 680287c821.
This commit is contained in:
BoykoAlex
2018-12-03 15:18:46 -05:00
parent 923fe5fde4
commit 6b8fa9d18f
8 changed files with 75 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -44,7 +44,7 @@
"postinstall": "postinstall-build --only-as-dependency dist \"npm run build && node postinstall.js\"" "postinstall": "postinstall-build --only-as-dependency dist \"npm run build && node postinstall.js\""
}, },
"dependencies": { "dependencies": {
"codemirror": "5.40.2", "codemirror-minified": "5.37.0",
"jointjs": "2.1.4", "jointjs": "2.1.4",
"postinstall-build": "5.0.3", "postinstall-build": "5.0.3",
"ts-disposables": "2.2.3" "ts-disposables": "2.2.3"
@@ -73,7 +73,7 @@
"@types/node": "6.0.46", "@types/node": "6.0.46",
"camelcase": "4.0.0", "camelcase": "4.0.0",
"chalk": "2.4.1", "chalk": "2.4.1",
"codemirror": "5.40.2", "codemirror-minified": "5.37.0",
"concurrently": "4.0.1", "concurrently": "4.0.1",
"core-js": "2.5.7", "core-js": "2.5.7",
"glob": "7.1.1", "glob": "7.1.1",

43
rollup.config.js
View File

@@ -41,37 +41,38 @@ const globals = {
'rxjs/operators': 'rxjs.operators', 'rxjs/operators': 'rxjs.operators',
'lodash': 'lodash', 'lodash': 'lodash',
'ts-disposables': 'ts-disposables', 'ts-disposables': 'ts-disposables',
'codemirror': 'codemirror', 'codemirror-minified': 'codemirror-minified',
'codemirror': 'codemirror-minified',
'jointjs': 'jointjs', 'jointjs': 'jointjs',
'jquery': 'jquery', 'jquery': 'jquery',
// CodeMirror extensions // CodeMirror extensions
'codemirror/mode/meta': 'codemirror/mode/meta', 'codemirror-minified/mode/meta': 'codemirror-minified/mode/meta',
'codemirror/addon/lint/lint': 'codemirror/addon/lint/lint', 'codemirror-minified/addon/lint/lint': 'codemirror-minified/addon/lint/lint',
'codemirror/addon/hint/show-hint': 'codemirror/addon/hint/show-hint', 'codemirror-minified/addon/hint/show-hint': 'codemirror-minified/addon/hint/show-hint',
'codemirror/addon/mode/loadmode': 'codemirror/addon/mode/loadmode', 'codemirror-minified/addon/mode/loadmode': 'codemirror-minified/addon/mode/loadmode',
'codemirror/addon/edit/matchbrackets': 'codemirror/addon/edit/matchbrackets', 'codemirror-minified/addon/edit/matchbrackets': 'codemirror-minified/addon/edit/matchbrackets',
'codemirror/addon/edit/closebrackets': 'codemirror/addon/edit/closebrackets', 'codemirror-minified/addon/edit/closebrackets': 'codemirror-minified/addon/edit/closebrackets',
'codemirror/addon/display/placeholder': 'codemirror/addon/edit/closebrackets', 'codemirror-minified/addon/display/placeholder': 'codemirror-minified/addon/edit/closebrackets',
'codemirror/addon/scroll/annotatescrollbar': 'codemirror/addon/scroll/annotatescrollbar', 'codemirror-minified/addon/scroll/annotatescrollbar': 'codemirror-minified/addon/scroll/annotatescrollbar',
'codemirror/addon/scroll/simplescrollbars': 'codemirror/addon/scroll/simplescrollbars', 'codemirror-minified/addon/scroll/simplescrollbars': 'codemirror-minified/addon/scroll/simplescrollbars',
// Lint support // Lint support
// Unclear how to import this dynamically... // Unclear how to import this dynamically...
'codemirror/addon/lint/javascript-lint': 'codemirror/addon/lint/javascript-lint', 'codemirror-minified/addon/lint/javascript-lint': 'codemirror-minified/addon/lint/javascript-lint',
'codemirror/addon/lint/coffeescript-lint': 'codemirror/addon/lint/coffeescript-lint', 'codemirror-minified/addon/lint/coffeescript-lint': 'codemirror-minified/addon/lint/coffeescript-lint',
'codemirror/addon/lint/json-lint': 'codemirror/addon/lint/json-lint', 'codemirror-minified/addon/lint/json-lint': 'codemirror-minified/addon/lint/json-lint',
'codemirror/addon/lint/yaml-lint': 'codemirror/addon/lint/yaml-lint', 'codemirror-minified/addon/lint/yaml-lint': 'codemirror-minified/addon/lint/yaml-lint',
// TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD // TODO: use dynamic import with JS7 in the future. CM autoLoad cannot load it properly - thinks its AMD
// Supported languages until dynamic loading // Supported languages until dynamic loading
'codemirror/mode/groovy/groovy': 'codemirror/mode/groovy/groovy', 'codemirror-minified/mode/groovy/groovy': 'codemirror-minified/mode/groovy/groovy',
'codemirror/mode/javascript/javascript': 'codemirror/mode/javascript/javascript', 'codemirror-minified/mode/javascript/javascript': 'codemirror-minified/mode/javascript/javascript',
'codemirror/mode/python/python': 'codemirror/mode/python/python', 'codemirror-minified/mode/python/python': 'codemirror-minified/mode/python/python',
'codemirror/mode/ruby/ruby': 'codemirror/mode/ruby/ruby', 'codemirror-minified/mode/ruby/ruby': 'codemirror-minified/mode/ruby/ruby',
'codemirror/mode/clike/clike': 'codemirror/mode/clike/clike', 'codemirror-minified/mode/clike/clike': 'codemirror-minified/mode/clike/clike',
'codemirror/mode/yaml/yaml': 'codemirror/mode/yaml/yaml', 'codemirror-minified/mode/yaml/yaml': 'codemirror-minified/mode/yaml/yaml',
'codemirror/mode/coffeescript/coffeescript': 'codemirror/mode/coffeescript/coffeescript' 'codemirror-minified/mode/coffeescript/coffeescript': 'codemirror-minified/mode/coffeescript/coffeescript'
}; };

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

@@ -35,7 +35,7 @@
'lodash': 'npm:lodash', 'lodash': 'npm:lodash',
'underscore': 'npm:lodash', 'underscore': 'npm:lodash',
'dagre': 'npm:dagre', 'dagre': 'npm:dagre',
'codemirror': 'npm:codemirror', 'codemirror': 'npm:codemirror-minified',
'moment': 'npm:moment/moment.js', 'moment': 'npm:moment/moment.js',
'ts-disposables': 'npm:ts-disposables', 'ts-disposables': 'npm:ts-disposables',
'jshint': 'npm:jshint/dist/jshint.js' '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;
}

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

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

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

@@ -1,23 +1,23 @@
import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core'; import { Component, Input, Output, ElementRef, EventEmitter, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
import * as _ from 'lodash'; import * as _ from 'lodash';
import * as CodeMirror from 'codemirror'; import * as CodeMirror from 'codemirror-minified';
import * as _$ from 'jquery'; import * as _$ from 'jquery';
const $: any = _$; const $: any = _$;
import 'codemirror/addon/lint/lint'; import 'codemirror-minified/addon/lint/lint';
import 'codemirror/addon/hint/show-hint'; import 'codemirror-minified/addon/hint/show-hint';
import 'codemirror/addon/display/placeholder'; import 'codemirror-minified/addon/display/placeholder';
import 'codemirror/addon/scroll/annotatescrollbar'; import 'codemirror-minified/addon/scroll/annotatescrollbar';
import 'codemirror/addon/scroll/simplescrollbars'; import 'codemirror-minified/addon/scroll/simplescrollbars';
@Component({ @Component({
selector: 'dsl-editor', selector: 'dsl-editor',
templateUrl: './dsl-editor.component.html', templateUrl: './dsl-editor.component.html',
styleUrls: [ styleUrls: [
'./../../../node_modules/codemirror/lib/codemirror.css', './../../../node_modules/codemirror-minified/lib/codemirror.css',
'./../../../node_modules/codemirror/addon/hint/show-hint.css', './../../../node_modules/codemirror-minified/addon/hint/show-hint.css',
'./../../../node_modules/codemirror/addon/lint/lint.css', './../../../node_modules/codemirror-minified/addon/lint/lint.css',
'./dsl-editor.component.scss', ], './dsl-editor.component.scss', ],
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })

4
tsconfig-build.json
View File

@@ -22,6 +22,10 @@
"dom" "dom"
], ],
"skipLibCheck": true, "skipLibCheck": true,
"typeRoots": [
"node_modules/@types",
"src/lib/@types"
],
"types": [], "types": [],
"experimentalDecorators": true, "experimentalDecorators": true,
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,

4
tsconfig.json
View File

@@ -15,6 +15,10 @@
"es2015", "es2015",
"dom" "dom"
], ],
"typeRoots": [
"node_modules/@types",
"src/lib/@types"
],
"strictNullChecks":false "strictNullChecks":false
} }
} }