Skip to content

Commit 376b258

Browse files
ashok1994ashok1994
committed
Changed package
1 parent 9942e27 commit 376b258

File tree

6 files changed

+31
-33
lines changed

6 files changed

+31
-33
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
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",
5756
"angularjs2-tabs": "0.0.1-beta.1",
5857
"bootstrap": "^3.3.7",
5958
"core-js": "^2.4.1",
@@ -80,6 +79,7 @@
8079
"karma-coverage-istanbul-reporter": "^1.2.1",
8180
"karma-jasmine": "~1.1.0",
8281
"karma-jasmine-html-reporter": "^0.2.2",
82+
"ng2-codemirror": "^1.1.3",
8383
"protractor": "~5.1.2",
8484
"rollup": "^0.45.2",
8585
"ts-node": "~3.0.4",

‎src/app/app.component.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,15 @@
290290
<div class="card-body p-0">
291291
<div class="code-panel">
292292
<div class="codeMirrorDiv" id="c1">
293-
<ngx-codemirror [(ngModel)]="installCode" [config]="{
293+
<codemirror [(ngModel)]="installCode" [config]="{
294294
lineNumbers: true,
295295
theme:'dracula',
296296
tabSize: '4',
297297
smartIndent: true,
298298
readOnly: true,
299299
mode:'javascript'
300300
}">
301-
</ngx-codemirror>
301+
</codemirror>
302302
</div>
303303
</div>
304304
</div>
@@ -310,15 +310,15 @@
310310
<div class="card-body p-0">
311311
<div class="code-panel">
312312
<div class="codeMirrorDiv" id="c2">
313-
<ngx-codemirror [(ngModel)]="installFusionCharts" [config]="{
313+
<codemirror [(ngModel)]="installFusionCharts" [config]="{
314314
lineNumbers: true,
315315
theme:'dracula',
316316
tabSize: '4',
317317
smartIndent: true,
318318
readOnly: true,
319319
mode:'javascript'
320320
}">
321-
</ngx-codemirror>
321+
</codemirror>
322322
</div>
323323
</div>
324324
</div>
@@ -345,15 +345,15 @@
345345
<div class="card-body p-0">
346346
<div class="code-panel">
347347
<div class="codeMirrorDiv" id="c3">
348-
<ngx-codemirror [(ngModel)]="includeInModule" [config]="{
348+
<codemirror [(ngModel)]="includeInModule" [config]="{
349349
lineNumbers: true,
350350
theme:'dracula',
351351
tabSize: '4',
352352
smartIndent: true,
353353
readOnly: true,
354354
mode:'javascript'
355355
}">
356-
</ngx-codemirror>
356+
</codemirror>
357357
</div>
358358
</div>
359359
</div>
@@ -378,15 +378,15 @@
378378
<div class="card-body p-0">
379379
<div class="code-panel">
380380
<div class="codeMirrorDiv">
381-
<ngx-codemirror [(ngModel)]="useDirective" [config]="{
381+
<codemirror [(ngModel)]="useDirective" [config]="{
382382
lineNumbers: true,
383383
theme:'dracula',
384384
tabSize: '4',
385385
smartIndent: true,
386386
readOnly: true,
387387
mode:'javascript'
388388
}">
389-
</ngx-codemirror>
389+
</codemirror>
390390
</div>
391391
</div>
392392
</div>
@@ -416,15 +416,15 @@
416416
<div class="card-body p-0">
417417
<div class="code-panel">
418418
<div class="codeMirrorDiv" id="c3">
419-
<ngx-codemirror [(ngModel)]="renderFusionMaps" [config]="{
419+
<codemirror [(ngModel)]="renderFusionMaps" [config]="{
420420
lineNumbers: true,
421421
theme:'dracula',
422422
tabSize: '4',
423423
smartIndent: true,
424424
readOnly: true,
425425
mode:'javascript'
426426
}">
427-
</ngx-codemirror>
427+
</codemirror>
428428
</div>
429429
</div>
430430
</div>
@@ -440,15 +440,15 @@
440440
<div class="card-body p-0">
441441
<div class="code-panel">
442442
<div class="codeMirrorDiv" id="c3">
443-
<ngx-codemirror [(ngModel)]="mapHtml" [config]="{
443+
<codemirror [(ngModel)]="mapHtml" [config]="{
444444
lineNumbers: true,
445445
theme:'dracula',
446446
tabSize: '4',
447447
smartIndent: true,
448448
readOnly: true,
449449
mode:'htmlembedded'
450450
}">
451-
</ngx-codemirror>
451+
</codemirror>
452452
</div>
453453
</div>
454454
</div>

‎src/app/app.module.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { BrowserModule } from '@angular/platform-browser';
88
import { HttpModule } from '@angular/http';
99

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

1414
import { Ex1 } from './fusioncharts/ex1/ex1';
1515
import { Ex2 } from './fusioncharts/ex2/ex2';
@@ -92,7 +92,6 @@ FusionChartsModule.fcRoot(FusionCharts, Charts, Ocean, PowerCharts, Widgets, Map
9292
FormsModule,
9393
ReactiveFormsModule,
9494
HttpModule,
95-
TabsModule,
9695
FusionChartsModule,
9796
RouterModule.forRoot(rootRouterConfig, { useHash: true }),
9897
CodemirrorModule

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

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

6-
import { CodemirrorService } from '@nomadreservations/ngx-codemirror';
76

87

98
@Component({
@@ -16,10 +15,9 @@ export default class TabbedCode {
1615
@Input() templateCode;
1716
cSelected = 'component';
1817

19-
constructor (private _codeMirror: CodemirrorService) {}
18+
constructor () {}
2019

2120
ngOnInit(){
22-
// this._codeMirror.instance$.subscribe( )
2321
}
2422

2523
selectCode(type){

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,34 @@
1111
<div id="chartCode">
1212
<div [ngSwitch]="cSelected">
1313
<div *ngSwitchCase="'module'">
14-
<ngx-codemirror [(ngModel)]="moduleCode" [config]="{
14+
<codemirror [(ngModel)]="moduleCode" [config]="{
1515
lineNumbers: true,
1616
theme:'dracula',
1717
tabSize: '4',
1818
smartIndent: true,
1919
readOnly: true,
2020
mode:'javascript'
21-
}"></ngx-codemirror>
21+
}"></codemirror>
2222
</div>
2323
<div *ngSwitchCase="'component'">
24-
<ngx-codemirror [(ngModel)]="componentCode" [config]="{
24+
<codemirror [(ngModel)]="componentCode" [config]="{
2525
lineNumbers: true,
2626
theme:'dracula',
2727
tabSize: '4',
2828
smartIndent: true,
2929
readOnly: true,
3030
mode:'javascript'
31-
}"></ngx-codemirror>
31+
}"></codemirror>
3232
</div>
3333
<div *ngSwitchCase="'template'">
34-
<ngx-codemirror [(ngModel)]="templateCode" [config]="{
34+
<codemirror [(ngModel)]="templateCode" [config]="{
3535
lineNumbers: true,
3636
theme:'dracula',
3737
tabSize: '4',
3838
smartIndent: true,
3939
readOnly: true,
4040
mode:'htmlembedded'
41-
}"></ngx-codemirror>
41+
}"></codemirror>
4242
</div>
4343
</div>
4444
</div>

0 commit comments

Comments
 (0)