Skip to content

Commit 9942e27

Browse files
committed
Changed module
1 parent a842b95 commit 9942e27

File tree

6 files changed

+30
-25
lines changed

6 files changed

+30
-25
lines changed

package-lock.json

Lines changed: 11 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"@angular/platform-browser": "^4.0.0",
5454
"@angular/platform-browser-dynamic": "^4.0.0",
5555
"@angular/router": "^4.0.0",
56+
"@nomadreservations/ngx-codemirror": "^2.0.0",
5657
"angularjs2-tabs": "0.0.1-beta.1",
5758
"bootstrap": "^3.3.7",
5859
"core-js": "^2.4.1",
@@ -65,7 +66,7 @@
6566
"@angular/cli": "1.2.4",
6667
"@angular/compiler-cli": "^4.0.0",
6768
"@angular/language-service": "^4.0.0",
68-
"@ctrl/ngx-codemirror": "^1.3.7",
69+
"@types/codemirror": "0.0.58",
6970
"@types/jasmine": "~2.5.53",
7071
"@types/jasminewd2": "~2.0.2",
7172
"@types/node": "~6.0.60",

src/app/app.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
<div class="card-body p-0">
291291
<div class="code-panel">
292292
<div class="codeMirrorDiv" id="c1">
293-
<ngx-codemirror [(ngModel)]="installCode" [options]="{
293+
<ngx-codemirror [(ngModel)]="installCode" [config]="{
294294
lineNumbers: true,
295295
theme:'dracula',
296296
tabSize: '4',
@@ -310,7 +310,7 @@
310310
<div class="card-body p-0">
311311
<div class="code-panel">
312312
<div class="codeMirrorDiv" id="c2">
313-
<ngx-codemirror [(ngModel)]="installFusionCharts" [options]="{
313+
<ngx-codemirror [(ngModel)]="installFusionCharts" [config]="{
314314
lineNumbers: true,
315315
theme:'dracula',
316316
tabSize: '4',
@@ -345,7 +345,7 @@
345345
<div class="card-body p-0">
346346
<div class="code-panel">
347347
<div class="codeMirrorDiv" id="c3">
348-
<ngx-codemirror [(ngModel)]="includeInModule" [options]="{
348+
<ngx-codemirror [(ngModel)]="includeInModule" [config]="{
349349
lineNumbers: true,
350350
theme:'dracula',
351351
tabSize: '4',
@@ -378,7 +378,7 @@
378378
<div class="card-body p-0">
379379
<div class="code-panel">
380380
<div class="codeMirrorDiv">
381-
<ngx-codemirror [(ngModel)]="useDirective" [options]="{
381+
<ngx-codemirror [(ngModel)]="useDirective" [config]="{
382382
lineNumbers: true,
383383
theme:'dracula',
384384
tabSize: '4',
@@ -416,7 +416,7 @@
416416
<div class="card-body p-0">
417417
<div class="code-panel">
418418
<div class="codeMirrorDiv" id="c3">
419-
<ngx-codemirror [(ngModel)]="renderFusionMaps" [options]="{
419+
<ngx-codemirror [(ngModel)]="renderFusionMaps" [config]="{
420420
lineNumbers: true,
421421
theme:'dracula',
422422
tabSize: '4',
@@ -440,7 +440,7 @@
440440
<div class="card-body p-0">
441441
<div class="code-panel">
442442
<div class="codeMirrorDiv" id="c3">
443-
<ngx-codemirror [(ngModel)]="mapHtml" [options]="{
443+
<ngx-codemirror [(ngModel)]="mapHtml" [config]="{
444444
lineNumbers: true,
445445
theme:'dracula',
446446
tabSize: '4',

src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { HttpModule } from '@angular/http';
99

1010
import { CodePrev } from './fusioncharts/codepreview';
1111
import { TabsModule } from "angularjs2-tabs";
12-
import { CodemirrorModule } from '@ctrl/ngx-codemirror';
12+
import { CodemirrorModule } from '@nomadreservations/ngx-codemirror';
1313

1414
import { Ex1 } from './fusioncharts/ex1/ex1';
1515
import { Ex2 } from './fusioncharts/ex2/ex2';

src/app/fusioncharts/tabbedComponent/tabbed.code.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import {
33
Input
44
} from '@angular/core';
55

6+
import { CodemirrorService } from '@nomadreservations/ngx-codemirror';
7+
68

79
@Component({
810
selector:'tabbed-code',
@@ -14,7 +16,11 @@ export default class TabbedCode {
1416
@Input() templateCode;
1517
cSelected = 'component';
1618

17-
constructor () {}
19+
constructor (private _codeMirror: CodemirrorService) {}
20+
21+
ngOnInit(){
22+
// this._codeMirror.instance$.subscribe( )
23+
}
1824

1925
selectCode(type){
2026
this.cSelected = type;

src/app/fusioncharts/tabbedComponent/tabbed.code.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div id="chartCode">
1212
<div [ngSwitch]="cSelected">
1313
<div *ngSwitchCase="'module'">
14-
<ngx-codemirror [(ngModel)]="moduleCode" [options]="{
14+
<ngx-codemirror [(ngModel)]="moduleCode" [config]="{
1515
lineNumbers: true,
1616
theme:'dracula',
1717
tabSize: '4',
@@ -21,7 +21,7 @@
2121
}"></ngx-codemirror>
2222
</div>
2323
<div *ngSwitchCase="'component'">
24-
<ngx-codemirror [(ngModel)]="componentCode" [options]="{
24+
<ngx-codemirror [(ngModel)]="componentCode" [config]="{
2525
lineNumbers: true,
2626
theme:'dracula',
2727
tabSize: '4',
@@ -31,7 +31,7 @@
3131
}"></ngx-codemirror>
3232
</div>
3333
<div *ngSwitchCase="'template'">
34-
<ngx-codemirror [(ngModel)]="templateCode" [options]="{
34+
<ngx-codemirror [(ngModel)]="templateCode" [config]="{
3535
lineNumbers: true,
3636
theme:'dracula',
3737
tabSize: '4',

0 commit comments

Comments
 (0)