فهرست منبع

Merge pull request #14178 from GordonSmith/HPCC-24744

HPCC-24744 IE11 Rendering Issues

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 سال پیش
والد
کامیت
4435e8dd72
3فایلهای تغییر یافته به همراه56 افزوده شده و 4 حذف شده
  1. 0 1
      esp/src/package.json
  2. 1 2
      esp/src/src/ECLArchiveWidget.ts
  3. 55 1
      esp/src/stub.htm

+ 0 - 1
esp/src/package.json

@@ -31,7 +31,6 @@
   },
   "main": "src/stub.js",
   "dependencies": {
-    "d3-array": "2.7.1",
     "@hpcc-js/chart": "2.50.0",
     "@hpcc-js/codemirror": "2.31.0",
     "@hpcc-js/common": "2.40.0",

+ 1 - 2
esp/src/src/ECLArchiveWidget.ts

@@ -1,11 +1,10 @@
 import { ECLEditor } from "@hpcc-js/codemirror";
-import { Palette } from "@hpcc-js/common";
+import { extent, Palette } from "@hpcc-js/common";
 import { Workunit } from "@hpcc-js/comms";
 import { HTMLTooltip } from "@hpcc-js/html";
 import { SplitPanel } from "@hpcc-js/phosphor";
 import { DirectoryTree } from "@hpcc-js/tree";
 import { xml2json } from "@hpcc-js/util";
-import { extent } from "d3-array";
 import "dijit/form/Button";
 import "dijit/layout/BorderContainer";
 import "dijit/layout/ContentPane";

+ 55 - 1
esp/src/stub.htm

@@ -6,6 +6,60 @@
     <meta charset="utf-8">
     <title>ECL Watch</title>
     <script src="/esp/files/node_modules/es6-promise/dist/es6-promise.auto.min.js"></script>
+    <script>
+        //  Polyfills  ---
+        if (typeof Object.assign !== 'function') {
+            Object.defineProperty(Object, "assign", {
+                value: function assign(target, varArgs) {
+                    'use strict';
+                    if (target === null || target === undefined) {
+                        throw new TypeError('Cannot convert undefined or null to object');
+                    }
+                    var to = Object(target);
+                    for (var index = 1; index < arguments.length; index++) {
+                        var nextSource = arguments[index];
+                        if (nextSource !== null && nextSource !== undefined) {
+                            for (var nextKey in nextSource) {
+                                if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+                                    to[nextKey] = nextSource[nextKey];
+                                }
+                            }
+                        }
+                    }
+                    return to;
+                },
+                writable: true,
+                configurable: true
+            });
+        }
+
+        if (!Array.prototype.find) {
+            Object.defineProperty(Array.prototype, 'find', {
+                value: function (predicate) {
+                    if (this == null) {
+                        throw TypeError('"this" is null or not defined');
+                    }
+                    var o = Object(this);
+                    var len = o.length >>> 0;
+                    if (typeof predicate !== 'function') {
+                        throw TypeError('predicate must be a function');
+                    }
+                    var thisArg = arguments[1];
+                    var k = 0;
+                    while (k < len) {
+                        var kValue = o[k];
+                        if (predicate.call(thisArg, kValue, k, o)) {
+                            return kValue;
+                        }
+                        k++;
+                    }
+                    return undefined;
+                },
+                configurable: true,
+                writable: true
+            });
+        }
+    </script>
     <link rel="stylesheet" href="/esp/files/dist/font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/esp/files/img/favlogo.png">
     <script type="text/javascript" src="/esp/files/dist/stub.eclwatch.js" charset="utf-8"></script>
@@ -61,4 +115,4 @@
     <!-- application -->
 </body>
 
-</html>
+</html>