Splitted and moved Exporting module.

rikapo · Jul 7, 2021 · c960588 · c960588
1 parent 47dfb49
commit c960588
Show file tree

Hide file tree

Showing 22 changed files with 1,709 additions and 1,407 deletions.
diff --git a/samples/highcharts/exporting/multiple-charts/demo.js b/samples/highcharts/exporting/multiple-charts/demo.js
@@ -45,7 +45,7 @@ Highcharts.exportCharts = function (charts, options) {
     options = Highcharts.merge(Highcharts.getOptions().exporting, options);
 
     // Post to export server
-    Highcharts.post(options.url, {
+    Highcharts.Chart.prototype.post(options.url, {
         filename: options.filename || 'chart',
         type: options.type,
         width: options.width,

diff --git a/samples/unit-tests/exporting/backgroundcolor/demo.js b/samples/unit-tests/exporting/backgroundcolor/demo.js
@@ -53,12 +53,12 @@ QUnit.test('Capture POST', function (assert) {
         }
     });
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
     try {
         var postData;
 
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             postData = data;
         };
 
@@ -68,6 +68,7 @@ QUnit.test('Capture POST', function (assert) {
                 backgroundColor: '#ffeeff'
             }
         });
+
         assert.strictEqual(postData.type, 'image/png', 'Posting for PNG');
 
         assert.strictEqual(typeof postData.svg, 'string', 'SVG is there');
@@ -84,6 +85,6 @@ QUnit.test('Capture POST', function (assert) {
             'Solid background is there'
         );
     } finally {
-        Highcharts.post = originalPost;
+        Highcharts.Chart.prototype.post = originalPost;
     }
 });
diff --git a/samples/unit-tests/exporting/buttons/demo.js b/samples/unit-tests/exporting/buttons/demo.js
@@ -122,21 +122,22 @@ QUnit.test('Export buttons', function (assert) {
 
     assert.strictEqual(button.nodeName, 'g', 'Button is there');
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
     try {
         var postData;
 
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             postData = data;
         };
 
         // Click it
         Highcharts.fireEvent(button, 'click');
+
         assert.strictEqual(postData.type, 'image/png', 'Posting for PNG');
         assert.strictEqual(typeof postData.svg, 'string', 'SVG is posted');
     } finally {
-        Highcharts.post = originalPost;
+        Highcharts.Chart.prototype.post = originalPost;
     }
 });
 

diff --git a/samples/unit-tests/exporting/exportchart/demo.js b/samples/unit-tests/exporting/exportchart/demo.js
@@ -42,12 +42,12 @@ QUnit.test('Testing exportChart', function (assert) {
         }
     });
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
     try {
         var postData;
 
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             postData = data;
         };
 
@@ -60,6 +60,6 @@ QUnit.test('Testing exportChart', function (assert) {
             'Custom filename'
         );
     } finally {
-        Highcharts.post = originalPost;
+        Highcharts.Chart.prototype.post = originalPost;
     }
 });
diff --git a/samples/unit-tests/exporting/filename/demo.js b/samples/unit-tests/exporting/filename/demo.js
@@ -92,12 +92,12 @@ QUnit.test('POST filename', function (assert) {
         }
     });
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
     try {
         var postData;
 
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             postData = data;
         };
 
@@ -114,10 +114,10 @@ QUnit.test('POST filename', function (assert) {
             'File name came through'
         );
     } finally {
-        Highcharts.post = originalPost;
+        Highcharts.Chart.prototype.post = originalPost;
     }
     try {
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             postData = data;
         };
 
@@ -133,7 +133,7 @@ QUnit.test('POST filename', function (assert) {
             'Forward slash in filename was replaced'
         );
     } finally {
-        Highcharts.post = originalPost;
+        Highcharts.Chart.prototype.post = originalPost;
     }
 });
 

diff --git a/samples/unit-tests/exporting/scale/demo.js b/samples/unit-tests/exporting/scale/demo.js
@@ -50,9 +50,9 @@ QUnit.skip('Exported chart scale', function (assert) {
         count = 0;
 
     function testScale(scale) {
-        var originalPost = Highcharts.post;
+        var originalPost = Highcharts.Chart.prototype.post;
 
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             function serialize(obj) {
                 var str = [];
 
@@ -88,15 +88,15 @@ QUnit.skip('Exported chart scale', function (assert) {
 
                         count++;
                         if (count === 2) {
-                            Highcharts.post = originalPost;
+                            Highcharts.Chart.prototype.post = originalPost;
                             done();
                         }
                     };
                 },
                 error: function () {
                     count++;
                     if (count === 2) {
-                        Highcharts.post = originalPost;
+                        Highcharts.Chart.prototype.post = originalPost;
 
                         console.log(
                             assert.test.testName,

diff --git a/samples/unit-tests/exporting/sourcewidth/demo.js b/samples/unit-tests/exporting/sourcewidth/demo.js
@@ -56,9 +56,9 @@ QUnit.skip('Exported chart sourceWidth and sourceHeight', function (assert) {
         }),
         done = assert.async();
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
-    Highcharts.post = function (url, data) {
+    Highcharts.Chart.prototype.post = function (url, data) {
         function serialize(obj) {
             var str = [];
 
@@ -98,12 +98,12 @@ QUnit.skip('Exported chart sourceWidth and sourceHeight', function (assert) {
 
                     document.body.appendChild(img);
 
-                    Highcharts.post = originalPost;
+                    Highcharts.Chart.prototype.post = originalPost;
                     done();
                 };
             },
             error: function () {
-                Highcharts.post = originalPost;
+                Highcharts.Chart.prototype.post = originalPost;
 
                 console.log(
                     assert.test.testName,

diff --git a/samples/unit-tests/exporting/type/demo.js b/samples/unit-tests/exporting/type/demo.js
@@ -48,17 +48,17 @@ QUnit.test('Test type option with exportChart', function (assert) {
         }),
         postData;
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
     try {
-        Highcharts.post = function (url, data) {
+        Highcharts.Chart.prototype.post = function (url, data) {
             postData = data;
         };
 
         // Run export
         chart.exportChart();
         assert.strictEqual(postData.type, 'image/jpeg', 'Posting for JPG');
     } finally {
-        Highcharts.post = originalPost;
+        Highcharts.Chart.prototype.post = originalPost;
     }
 });
diff --git a/samples/unit-tests/exporting/width/demo.js b/samples/unit-tests/exporting/width/demo.js
@@ -46,9 +46,9 @@ QUnit.skip('Exported chart width', function (assert) {
         }),
         done = assert.async();
 
-    var originalPost = Highcharts.post;
+    var originalPost = Highcharts.Chart.prototype.post;
 
-    Highcharts.post = function (url, data) {
+    Highcharts.Chart.prototype.post = function (url, data) {
         function serialize(obj) {
             var str = [];
 
@@ -78,13 +78,13 @@ QUnit.skip('Exported chart width', function (assert) {
                         'Generated image is 200px'
                     );
 
-                    Highcharts.post = originalPost;
+                    Highcharts.Chart.prototype.post = originalPost;
 
                     done();
                 };
             },
             error: function () {
-                Highcharts.post = originalPost;
+                Highcharts.Chart.prototype.post = originalPost;
                 console.log(
                     assert.test.testName,
                     'Export server XHR error or timeout'

diff --git a/ts/Accessibility/Options/Options.ts b/ts/Accessibility/Options/Options.ts
@@ -63,6 +63,12 @@ declare module '../../Core/Options'{
     }
 }
 
+declare module '../../Extensions/Exporting/ExportingOptions' {
+    interface ExportingOptions {
+        accessibility?: Highcharts.ExportingAccessibilityOptions;
+    }
+}
+
 /**
  * Internal types.
  * @private
@@ -150,9 +156,6 @@ declare global {
         interface ExportingAccessibilityOptions {
             enabled: boolean;
         }
-        interface ExportingOptions {
-            accessibility?: ExportingAccessibilityOptions;
-        }
         interface FocusBorderStyleObject {
             borderRadius?: number;
             color?: ColorType;

diff --git a/ts/Extensions/Annotations/Annotations.ts b/ts/Extensions/Annotations/Annotations.ts
@@ -33,6 +33,7 @@ import type { DataLabelOverflowValue } from '../../Core/Series/DataLabelOptions'
 import type EventCallback from '../../Core/EventCallback';
 import type FormatUtilities from '../../Core/FormatUtilities';
 import type MockPointOptions from './MockPointOptions';
+import type NavigationOptions from '../Exporting/NavigationOptions';
 import type Options from '../../Core/Options';
 import type Point from '../../Core/Series/Point';
 import type Series from '../../Core/Series/Series';

diff --git a/ts/Extensions/Annotations/NavigationBindings.ts b/ts/Extensions/Annotations/NavigationBindings.ts
@@ -12,6 +12,7 @@
 
 import type { HTMLDOMElement } from '../../Core/Renderer/DOMElementType';
 import type MockPointOptions from './MockPointOptions';
+import type NavigationOptions from '../Exporting/NavigationOptions';
 import type Pointer from '../../Core/Pointer';
 import type PointerEvent from '../../Core/PointerEvent';
 
@@ -57,6 +58,16 @@ declare module '../../Core/PointerEvent' {
     }
 }
 
+declare module '../Exporting/NavigationOptions' {
+    interface NavigationOptions {
+        annotationsOptions?: DeepPartial<Highcharts.AnnotationsOptions>;
+        bindings?: Record<string, Highcharts.NavigationBindingsOptionsObject>;
+        bindingsClassName?: string;
+        events?: Highcharts.NavigationEventsOptions;
+        iconsURL?: string;
+    }
+}
+
 /**
  * Internal types.
  * @private
@@ -110,13 +121,6 @@ declare global {
             selectButton?: Function;
             showPopup?: Function;
         }
-        interface NavigationOptions {
-            annotationsOptions?: DeepPartial<AnnotationsOptions>;
-            bindings?: Record<string, NavigationBindingsOptionsObject>;
-            bindingsClassName?: string;
-            events?: NavigationEventsOptions;
-            iconsURL?: string;
-        }
     }
 }
 
@@ -337,7 +341,7 @@ class NavigationBindings {
 
     public constructor(
         chart: Highcharts.AnnotationChart,
-        options: Highcharts.NavigationOptions
+        options: NavigationOptions
     ) {
         this.chart = chart;
         this.options = options;
@@ -361,7 +365,7 @@ class NavigationBindings {
     public eventsToUnbind: Array<Function>;
     public mouseMoveEvent?: (false|Function);
     public nextEvent?: (false|Function);
-    public options: Highcharts.NavigationOptions;
+    public options: NavigationOptions;
     public popup?: Highcharts.Popup;
     public selectedButtonElement?: (HTMLDOMElement|null);
     public selectedButton: (Highcharts.NavigationBindingsOptionsObject|null) = void 0 as any;
@@ -487,7 +491,7 @@ class NavigationBindings {
     public initUpdate(): void {
         const navigation = this;
         chartNavigationMixin.addUpdate(
-            function (options: Highcharts.NavigationOptions): void {
+            function (options: NavigationOptions): void {
                 navigation.update(options);
             },
             this.chart
@@ -998,7 +1002,7 @@ class NavigationBindings {
      * @private
      * @function Highcharts.NavigationBindings#update
      */
-    public update(options?: Highcharts.NavigationOptions): void {
+    public update(options?: NavigationOptions): void {
         this.options = merge(true, this.options, options);
         this.removeEvents();
         this.initEvents();

diff --git a/ts/Extensions/ExportData.ts b/ts/Extensions/ExportData.ts
@@ -102,6 +102,14 @@ declare module '../Core/Series/SeriesOptions' {
     }
 }
 
+declare module './Exporting/ExportingOptions' {
+    interface ExportingOptions {
+        csv?: Highcharts.ExportingCsvOptions;
+        showTable?: boolean;
+        tableCaption?: (boolean|string);
+    }
+}
+
 /**
  * Internal types
  * @private
@@ -127,11 +135,6 @@ declare global {
             itemDelimiter?: (string|null);
             lineDelimiter?: string;
         }
-        interface ExportingOptions {
-            csv?: ExportingCsvOptions;
-            showTable?: boolean;
-            tableCaption?: (boolean|string);
-        }
         interface ExportDataPoint {
             series: ExportDataSeries;
             x?: number;
@@ -1241,7 +1244,7 @@ function getBlobFromContent(
 
     try {
         // MS specific
-        if (nav.msSaveOrOpenBlob && win.MSBlobBuilder) {
+        if ((nav.msSaveOrOpenBlob) && win.MSBlobBuilder) {
             const blob = new win.MSBlobBuilder();
             blob.append(content);
             return blob.getBlob('image/svg+xml') as any;