Merged from master to resolve build issues

2025-06-17 06:38:17 +00:00 · 2016-10-05 12:25:04 -07:00
parent f1d2072bb9 8a0018177a
commit 3e9c0eb7a5
92 changed files with 623 additions and 290 deletions
--- a/platform/features/plot/test/PlotControllerSpec.js
+++ b/platform/features/plot/test/PlotControllerSpec.js
@ -73,7 +73,7 @@ define(
                mockElement = angular.element('<div />');
                mockExportImageService = jasmine.createSpyObj(
                    "ExportImageService",
-                    ["exportJPG", "exportPNG", "exportPDF"]
+                    ["exportJPG", "exportPNG"]
                );
                mockFormatter = jasmine.createSpyObj(
                    "formatter",