Commit 8e5f8dd3 authored by Matthew Noorenberghe's avatar Matthew Noorenberghe
Browse files

Bug 1648858 - Move d3.js from devtools/ to third_party/js/. r=mossop

parent 8b472f27
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ var whitelist = [
  },
  // Bug 1356031 (only used by devtools)
  { file: "chrome://global/skin/icons/error-16.png" },
  // Bug 1641777 (only used by devtools)
  { file: "chrome://global/content/third_party/d3/d3.js" },
  // Bug 1344267
  { file: "chrome://marionette/content/test.xhtml" },
  { file: "chrome://marionette/content/test_dialog.properties" },
+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@

devtools.jar:
%   content devtools %content/
    content/shared/vendor/d3.js (shared/vendor/d3.js)
    content/shared/vendor/dagre-d3.js (shared/vendor/dagre-d3.js)
    content/shared/widgets/widgets.css (shared/widgets/widgets.css)
    content/webconsole/index.html (webconsole/index.html)
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
            defer="true">
    </script>

    <script src="chrome://devtools/content/shared/vendor/d3.js"
    <script src="chrome://global/content/third_party/d3/d3.js"
            defer="true">
    </script>

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
const CanvasUtils = require("devtools/client/memory/components/tree-map/canvas-utils");
const D3_SCRIPT =
  '<script type="application/javascript" ' +
  'src="chrome://devtools/content/shared/vendor/d3.js>';
  'src="chrome://global/content/third_party/d3/d3.js">';
const TEST_URL = `data:text/html,<html><body>${D3_SCRIPT}</body></html>`;

this.test = makeMemoryTest(TEST_URL, async function({ tab, panel }) {
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Test that the ShortestPaths component properly renders a graph of the merged sho
    <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">

    <script type="application/javascript"
            src="chrome://devtools/content/shared/vendor/d3.js">
            src="chrome://global/content/third_party/d3/d3.js">
    </script>
    <script type="application/javascript"
            src="chrome://devtools/content/shared/vendor/dagre-d3.js">
Loading