Browse Source

Removed this damn markdown library to fix the auth bug.

pull/344/head
Sebastian Stehle 7 years ago
parent
commit
b1eecbc79d
  1. 2
      src/Squidex/app/app.module.ts
  2. 29
      src/Squidex/app/shared/components/help-markdown.pipe.ts
  3. 2
      src/Squidex/app/shared/components/help.component.html
  4. 5
      src/Squidex/app/shared/components/help.component.ts
  5. 1
      src/Squidex/app/shared/declarations.ts
  6. 4
      src/Squidex/app/shared/module.ts
  7. 62
      src/Squidex/package-lock.json
  8. 2
      src/Squidex/package.json

2
src/Squidex/app/app.module.ts

@ -13,7 +13,6 @@ import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { DndModule } from 'ng2-dnd'; import { DndModule } from 'ng2-dnd';
import { NgxMdModule } from 'ngx-md';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
@ -64,7 +63,6 @@ export function configUserReport() {
HttpClientModule, HttpClientModule,
FormsModule, FormsModule,
CommonModule, CommonModule,
NgxMdModule.forRoot(),
RouterModule, RouterModule,
ReactiveFormsModule, ReactiveFormsModule,
SqxFrameworkModule.forRoot(), SqxFrameworkModule.forRoot(),

29
src/Squidex/app/shared/components/help-markdown.pipe.ts

@ -0,0 +1,29 @@
/*
* Squidex Headless CMS
*
* @license
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
import { Pipe, PipeTransform } from '@angular/core';
import * as Marked from 'marked';
const renderer = new Marked.Renderer();
renderer.link = (href, title, text) => {
return `<a href="https://docs.squidex.io/${href}" title="${title}" target="_blank", rel="noopener">${text} <i class="icon-external-link"></i></a>`;
};
@Pipe({
name: 'sqxHelpMarkdown',
pure: true
})
export class HelpMarkdownPipe implements PipeTransform {
public transform(text: string): string {
if (text) {
return Marked(text, { renderer });
} else {
return '';
}
}
}

2
src/Squidex/app/shared/components/help.component.html

@ -5,7 +5,7 @@
<ng-container content> <ng-container content>
<div class="help"> <div class="help">
<ngx-md [data]="helpMarkdown | async"></ngx-md> <div [innerHTML]="helpMarkdown | async | sqxHelpMarkdown"></div>
</div> </div>
</ng-container> </ng-container>
</sqx-panel> </sqx-panel>

5
src/Squidex/app/shared/components/help.component.ts

@ -7,7 +7,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ChangeDetectionStrategy, Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { NgxMdService } from 'ngx-md';
import { HelpService } from '@app/shared/internal'; import { HelpService } from '@app/shared/internal';
@ -22,11 +21,7 @@ export class HelpComponent {
constructor( constructor(
private readonly helpService: HelpService, private readonly helpService: HelpService,
private readonly markdownService: NgxMdService,
private readonly route: ActivatedRoute private readonly route: ActivatedRoute
) { ) {
this.markdownService.renderer.link = (href, title, text) => {
return `<a href="https://docs.squidex.io/${href}" title="${title}" target="_blank", rel="noopener">${text} <i class="icon-external-link"></i></a>`;
};
} }
} }

1
src/Squidex/app/shared/declarations.ts

@ -11,6 +11,7 @@ export * from './components/assets-list.component';
export * from './components/assets-selector.component'; export * from './components/assets-selector.component';
export * from './components/comment.component'; export * from './components/comment.component';
export * from './components/comments.component'; export * from './components/comments.component';
export * from './components/help-markdown.pipe';
export * from './components/help.component'; export * from './components/help.component';
export * from './components/geolocation-editor.component'; export * from './components/geolocation-editor.component';
export * from './components/history.component'; export * from './components/history.component';

4
src/Squidex/app/shared/module.ts

@ -9,7 +9,6 @@ import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { ModuleWithProviders, NgModule } from '@angular/core'; import { ModuleWithProviders, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { DndModule } from 'ng2-dnd'; import { DndModule } from 'ng2-dnd';
import { NgxMdModule } from 'ngx-md';
import { SqxFrameworkModule } from '@app/framework'; import { SqxFrameworkModule } from '@app/framework';
@ -47,6 +46,7 @@ import {
GeolocationEditorComponent, GeolocationEditorComponent,
GraphQlService, GraphQlService,
HelpComponent, HelpComponent,
HelpMarkdownPipe,
HelpService, HelpService,
HistoryComponent, HistoryComponent,
HistoryListComponent, HistoryListComponent,
@ -94,7 +94,6 @@ import {
@NgModule({ @NgModule({
imports: [ imports: [
DndModule, DndModule,
NgxMdModule,
RouterModule, RouterModule,
SqxFrameworkModule SqxFrameworkModule
], ],
@ -110,6 +109,7 @@ import {
FileIconPipe, FileIconPipe,
GeolocationEditorComponent, GeolocationEditorComponent,
HelpComponent, HelpComponent,
HelpMarkdownPipe,
HistoryComponent, HistoryComponent,
HistoryListComponent, HistoryListComponent,
HistoryMessagePipe, HistoryMessagePipe,

62
src/Squidex/package-lock.json

@ -2881,17 +2881,6 @@
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
"dev": true "dev": true
}, },
"clipboard": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
"integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
"optional": true,
"requires": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"cliui": { "cliui": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
@ -3926,12 +3915,6 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true "dev": true
}, },
"delegate": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
"optional": true
},
"delegates": { "delegates": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@ -5864,15 +5847,6 @@
} }
} }
}, },
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
"optional": true,
"requires": {
"delegate": "^3.1.2"
}
},
"graceful-fs": { "graceful-fs": {
"version": "4.1.11", "version": "4.1.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@ -8458,9 +8432,9 @@
} }
}, },
"marked": { "marked": {
"version": "0.5.2", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.5.2.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.0.tgz",
"integrity": "sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA==" "integrity": "sha512-HduzIW2xApSXKXJSpCipSxKyvMbwRRa/TwMbepmlZziKdH8548WSoDP4SxzulEKjlo8BE39l+2fwJZuRKOln6g=="
}, },
"math-random": { "math-random": {
"version": "1.0.1", "version": "1.0.1",
@ -8847,16 +8821,6 @@
"resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-7.2.0.tgz", "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-7.2.0.tgz",
"integrity": "sha512-n+PBgc5T37Gi84UFY0EUbgBwQe+rU3dj+azH87BW49flpTmF0G5nDQg/NaXS1hthzQPGXGwT4lsxsZ70Z3kZ5Q==" "integrity": "sha512-n+PBgc5T37Gi84UFY0EUbgBwQe+rU3dj+azH87BW49flpTmF0G5nDQg/NaXS1hthzQPGXGwT4lsxsZ70Z3kZ5Q=="
}, },
"ngx-md": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/ngx-md/-/ngx-md-7.0.0.tgz",
"integrity": "sha512-IMqjkc33lS8jlQXqrLh2McuhUFXrUKBfYH5VqCAcGa3QDBkiPOakh/CuYbI5KC8KQDZMe5fngSGMKgDNVBzR7g==",
"requires": {
"marked": "^0.5.0",
"prismjs": "^1.15.0",
"tslib": "^1.9.0"
}
},
"nice-try": { "nice-try": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@ -10697,14 +10661,6 @@
"utila": "~0.4" "utila": "~0.4"
} }
}, },
"prismjs": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz",
"integrity": "sha512-Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA==",
"requires": {
"clipboard": "^2.0.0"
}
},
"private": { "private": {
"version": "0.1.8", "version": "0.1.8",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@ -11557,12 +11513,6 @@
} }
} }
}, },
"select": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=",
"optional": true
},
"select-hose": { "select-hose": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@ -12760,12 +12710,6 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true "dev": true
}, },
"tiny-emitter": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
"integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==",
"optional": true
},
"tmp": { "tmp": {
"version": "0.0.33", "version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",

2
src/Squidex/package.json

@ -30,11 +30,11 @@
"core-js": "2.6.1", "core-js": "2.6.1",
"graphiql": "0.12.0", "graphiql": "0.12.0",
"graphql": "14.0.2", "graphql": "14.0.2",
"marked": "^0.6.0",
"moment": "2.23.0", "moment": "2.23.0",
"mousetrap": "1.6.2", "mousetrap": "1.6.2",
"ng2-dnd": "5.0.2", "ng2-dnd": "5.0.2",
"ngx-color-picker": "7.2.0", "ngx-color-picker": "7.2.0",
"ngx-md": "^7.0.0",
"oidc-client": "1.6.1", "oidc-client": "1.6.1",
"pikaday": "1.8.0", "pikaday": "1.8.0",
"progressbar.js": "1.0.1", "progressbar.js": "1.0.1",

Loading…
Cancel
Save