Merge pull request #2846 from alecmerdler/QUAY-682

Optimize Webpack JS Bundle Size

static/js/directives/ui/markdown/markdown-editor.component.spec.ts

@@ -8,15 +8,37 @@ describe("MarkdownEditorComponent", () => {
   var component: MarkdownEditorComponent;
   var textarea: Mock<ng.IAugmentedJQuery | any>;
   var documentMock: Mock<HTMLElement & Document>;
+  var $windowMock: Mock<ng.IWindowService>;
 
   beforeEach(() => {
     textarea = new Mock<ng.IAugmentedJQuery | any>();
     documentMock = new Mock<HTMLElement & Document>();
+    $windowMock = new Mock<ng.IWindowService>();
     const $documentMock: any = [documentMock.Object];
-    component = new MarkdownEditorComponent($documentMock, 'chrome');
+    component = new MarkdownEditorComponent($documentMock, $windowMock.Object, 'chrome');
     component.textarea = textarea.Object;
   });
 
+  describe("onBeforeUnload", () => {
+
+    it("returns false to alert user about losing current changes", () => {
+      component.changeEditMode("write");
+      const allow: boolean = component.onBeforeUnload();
+
+      expect(allow).toBe(false);
+    });
+  });
+
+  describe("ngOnDestroy", () => {
+
+    it("removes 'beforeunload' event listener", () => {
+      $windowMock.setup(mock => mock.onbeforeunload).is(() => 1);
+      component.ngOnDestroy();
+
+      expect($windowMock.Object.onbeforeunload.call(this)).toEqual(null);
+    });
+  });
+
   describe("changeEditMode", () => {
 
     it("sets component's edit mode to given mode", () => {
@@ -135,7 +157,15 @@ describe("MarkdownEditorComponent", () => {
 
   describe("discardChanges", () => {
 
-    it("emits output event with no content", (done) => {
+    it("prompts user to confirm discarding changes", () => {
+      const confirmSpy: Spy = $windowMock.setup(mock => mock.confirm).is((message) => false).Spy;
+      component.discardChanges();
+
+      expect(confirmSpy.calls.argsFor(0)[0]).toEqual(`Are you sure you want to discard your changes?`);
+    });
+
+    it("emits output event with no content if user confirms discarding changes", (done) => {
+      $windowMock.setup(mock => mock.confirm).is((message) => true);
       component.discard.subscribe((event: {}) => {
         expect(event).toEqual({});
         done();
@@ -143,5 +173,16 @@ describe("MarkdownEditorComponent", () => {
 
       component.discardChanges();
     });
+
+    it("does not emit output event if user declines confirmation of discarding changes", (done) => {
+      $windowMock.setup(mock => mock.confirm).is((message) => false);
+      component.discard.subscribe((event: {}) => {
+        fail(`Should not emit output event`);
+        done();
+      });
+
+      component.discardChanges();
+      done();
+    });
   });
 });

static/js/directives/ui/markdown/markdown-editor.component.ts

@@ -1,4 +1,4 @@
-import { Component, Inject, Input, Output, EventEmitter, ViewChild } from 'ng-metadata/core';
+import { Component, Inject, Input, Output, EventEmitter, ViewChild, HostListener, OnDestroy } from 'ng-metadata/core';
 import { MarkdownSymbol } from '../../../types/common.types';
 import { BrowserPlatform } from '../../../constants/platform.constant';
 import './markdown-editor.component.css';
@@ -11,9 +11,10 @@ import './markdown-editor.component.css';
   selector: 'markdown-editor',
   templateUrl: '/static/js/directives/ui/markdown/markdown-editor.component.html'
 })
-export class MarkdownEditorComponent {
+export class MarkdownEditorComponent implements OnDestroy {
 
   @Input('<') public content: string;
+
   @Output() public save: EventEmitter<{editedContent: string}> = new EventEmitter();
   @Output() public discard: EventEmitter<any> = new EventEmitter();
 
@@ -23,8 +24,18 @@ export class MarkdownEditorComponent {
   private editMode: EditMode = "write";
 
   constructor(@Inject('$document') private $document: ng.IDocumentService,
+              @Inject('$window') private $window: ng.IWindowService,
               @Inject('BrowserPlatform') private browserPlatform: BrowserPlatform) {
+    this.$window.onbeforeunload = this.onBeforeUnload.bind(this);
+  }
 
+  @HostListener('window:beforeunload', [])
+  public onBeforeUnload(): boolean {
+    return false;
+  }
+
+  public ngOnDestroy(): void {
+    this.$window.onbeforeunload = () => null;
   }
 
   public changeEditMode(newMode: EditMode): void {
@@ -103,7 +114,9 @@ export class MarkdownEditorComponent {
   }
 
   public discardChanges(): void {
-    this.discard.emit({});
+    if (this.$window.confirm(`Are you sure you want to discard your changes?`)) {
+      this.discard.emit({});
+    }
   }
 
   public get currentEditMode(): EditMode {

static/js/directives/ui/markdown/markdown-input.component.ts

@@ -14,7 +14,9 @@ export class MarkdownInputComponent {
   @Input('<') public content: string;
   @Input('<') public canWrite: boolean;
   @Input('@') public fieldTitle: string;
+
   @Output() public contentChanged: EventEmitter<{content: string}> = new EventEmitter();
+
   private isEditing: boolean = false;
 
   public editContent(): void {

static/js/directives/ui/markdown/markdown-view.component.spec.ts

@@ -15,9 +15,7 @@ describe("MarkdownViewComponent", () => {
     markdownConverterMock = new Mock<Converter>();
     $sceMock = new Mock<ng.ISCEService>();
     $sanitizeMock = jasmine.createSpy('$sanitizeSpy').and.callFake((html: string) => html);
-    component = new MarkdownViewComponent((options: ConverterOptions) => markdownConverterMock.Object,
-                                          $sceMock.Object,
-                                          $sanitizeMock);
+    component = new MarkdownViewComponent(markdownConverterMock.Object, $sceMock.Object, $sanitizeMock);
   });
 
   describe("ngOnChanges", () => {

static/js/directives/ui/markdown/markdown-view.component.ts

@@ -1,7 +1,5 @@
 import { Component, Input, Inject, OnChanges, SimpleChanges } from 'ng-metadata/core';
 import { Converter, ConverterOptions } from 'showdown';
-import 'showdown-highlightjs-extension';
-import 'highlightjs/styles/vs.css';
 import './markdown-view.component.css';
 
 
@@ -17,15 +15,15 @@ export class MarkdownViewComponent implements OnChanges {
   @Input('<') public content: string;
   @Input('<') public firstLineOnly: boolean = false;
   @Input('<') public placeholderNeeded: boolean = false;
+
   private convertedHTML: string = '';
   private readonly placeholder: string = `<p style="visibility:hidden">placeholder</p>`;
   private readonly markdownChars: string[] = ['#', '-', '>', '`'];
-  private markdownConverter: Converter;
 
-  constructor(@Inject('markdownConverterFactory') private makeConverter: (options?: ConverterOptions) => Converter,
+  constructor(@Inject('markdownConverter') private markdownConverter: Converter,
               @Inject('$sce') private $sce: ng.ISCEService,
               @Inject('$sanitize') private $sanitize: ng.sanitize.ISanitizeService) {
-    this.markdownConverter = makeConverter({extensions: ['highlightjs']});
+
   }
 
   public ngOnChanges(changes: SimpleChanges): void {

static/js/directives/ui/markdown/markdown.module.ts

@@ -0,0 +1,76 @@
+import { NgModule } from 'ng-metadata/core';
+import { Converter } from 'showdown';
+import * as showdown from 'showdown';
+import { registerLanguage, highlightAuto } from 'highlight.js/lib/highlight';
+import 'highlight.js/styles/vs.css';
+const highlightedLanguages: string[] = require('../../../constants/highlighted-languages.constant.json');
+
+
+/**
+ * Dynamically fetch and register a new language with Highlight.js
+ */
+export const addHighlightedLanguage = (language: string): Promise<{}> => {
+  return new Promise(async(resolve, reject) => {
+    try {
+      // TODO(alecmerdler): Use `import()` here instead of `System.import()` after upgrading to TypeScript 2.4
+      const langModule = await System.import(`highlight.js/lib/languages/${language}`);
+      registerLanguage(language, langModule);
+      console.debug(`Language ${language} registered for syntax highlighting`);
+      resolve();
+    } catch (error) {
+      console.debug(`Language ${language} not supported for syntax highlighting`);
+      reject(error);
+    }
+  });
+};
+
+
+/**
+ * Showdown JS extension for syntax highlighting using Highlight.js. Will attempt to register detected languages.
+ */
+export const showdownHighlight = (): showdown.FilterExtension => {
+  const htmlunencode = (text: string) => {
+    return (text
+      .replace(/&amp;/g, '&')
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>'));
+  };
+
+  const left = '<pre><code\\b[^>]*>';
+  const right = '</code></pre>';
+  const flags = 'g';
+  const replacement = (wholeMatch: string, match: string, leftSide: string, rightSide: string) => {
+    const language: string = leftSide.slice(leftSide.indexOf('language-') + ('language-').length,
+                                            leftSide.indexOf('"', leftSide.indexOf('language-')));
+    addHighlightedLanguage(language).catch(error => null);
+
+    match = htmlunencode(match);
+    return leftSide + highlightAuto(match).value + rightSide;
+  };
+
+  return {
+    type: 'output',
+    filter: (text, converter, options) => {
+      return (<any>showdown).helper.replaceRecursiveRegExp(text, replacement, left, right, flags);
+    }
+  };
+};
+
+
+// Import default syntax-highlighting supported languages
+highlightedLanguages.forEach((langName) => addHighlightedLanguage(langName));
+
+
+/**
+ * Markdown editor and view module.
+ */
+@NgModule({
+  imports: [],
+  declarations: [],
+  providers: [
+    {provide: 'markdownConverter', useValue: new Converter({extensions: [<any>showdownHighlight]})},
+  ],
+})
+export class MarkdownModule {
+
+}