Merge remote-tracking branch 'origin/master' into api-1124b

Conflicts:
	bower.json

bower.json

@@ -22,7 +22,6 @@
     "eventemitter3": "^1.2.0",
     "lodash": "3.10.1",
     "almond": "~0.3.2",
-    "html2canvas": "^0.4.1",
-    "jspdf": "1.2.x"
+    "html2canvas": "^0.4.1"
   }
 }

openmct.js

@@ -30,7 +30,6 @@ requirejs.config({
         "EventEmitter": "bower_components/eventemitter3/index",
         "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
-        "jsPDF": "bower_components/jspdf/dist/jspdf.debug",
         "moment": "bower_components/moment/moment",
         "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
         "saveAs": "bower_components/FileSaver.js/FileSaver.min",
@@ -53,9 +52,6 @@ requirejs.config({
         "html2canvas": {
             "exports": "html2canvas"
         },
-        "jsPDF": {
-            "exports": "jsPDF"
-        },
         "moment-duration-format": {
             "deps": ["moment"]
         },

platform/features/plot/bundle.js

@@ -146,16 +146,6 @@ define([
                     "copyright": "Copyright © 2012 Niklas von Hertzen.",
                     "license": "license-mit",
                     "link": "https://github.com/niklasvh/html2canvas/blob/master/LICENSE"
-                },
-                {
-                    "name": "jsPDF",
-                    "version": "1.2.61",
-                    "author": "James Hall",
-                    "description": "JavaScript HTML renderer",
-                    "website": "https://github.com/MrRio/jsPDF",
-                    "copyright": "Copyright © 2010-2016 James Hall",
-                    "license": "license-mit",
-                    "link": "https://github.com/MrRio/jsPDF/blob/master/MIT-LICENSE.txt"
                 }
             ]
         }

platform/features/plot/res/templates/plot.html

@@ -23,11 +23,6 @@
       class="abs holder holder-plot has-control-bar">
     <div class="l-control-bar" ng-show="!plot.hideExportButtons">
          <span class="l-btn-set">
-            <a class="s-button t-export icon-download labeled first"
-               ng-click="plot.exportPDF()"
-               title="Export This View's Data as PDF">
-                PDF
-            </a>
             <a class="s-button t-export labeled"
                ng-click="plot.exportPNG()"
                title="Export This View's Data as PNG">

platform/features/plot/src/PlotController.js

@@ -368,17 +368,6 @@ define(
             return this.pending;
         };
 
-        /**
-         * Export the plot to PDF
-         */
-        PlotController.prototype.exportPDF = function () {
-            var self = this;
-            self.hideExportButtons = true;
-            self.exportImageService.exportPDF(self.$element[0], "plot.pdf").finally(function () {
-                self.hideExportButtons = false;
-            });
-        };
-
         /**
          * Export the plot to PNG
          */

platform/features/plot/src/services/ExportImageService.js

@@ -26,32 +26,29 @@
 define(
     [
         "html2canvas",
-        "jsPDF",
         "saveAs"
     ],
     function (
         html2canvas,
-        jsPDF,
         saveAs
     ) {
         var self = this;
 
         /**
          * The export image service will export any HTML node to
-         * PDF, JPG, or PNG.
+         * JPG, or PNG.
          * @param {object} $q
          * @param {object} $timeout
          * @param {object} $log
          * @param {constant} EXPORT_IMAGE_TIMEOUT time in milliseconds before a timeout error is returned
          * @constructor
          */
-        function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injJsPDF, injSaveAs, injFileReader) {
+        function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injSaveAs, injFileReader) {
             self.$q = $q;
             self.$timeout = $timeout;
             self.$log = $log;
             self.EXPORT_IMAGE_TIMEOUT = EXPORT_IMAGE_TIMEOUT;
             self.html2canvas = injHtml2Canvas || html2canvas;
-            self.jsPDF = injJsPDF || jsPDF;
             self.saveAs = injSaveAs || saveAs;
             self.reader = injFileReader || new FileReader();
         }
@@ -128,23 +125,6 @@ define(
             }
         }
 
-        /**
-         * Takes a screenshot of a DOM node and exports to PDF.
-         * @param {node} element to be exported
-         * @param {string} filename the exported image
-         * @returns {promise}
-         */
-        ExportImageService.prototype.exportPDF = function (element, filename) {
-            return renderElement(element, "jpeg").then(function (img) {
-                self.reader.readAsDataURL(img);
-                self.reader.onloadend = function () {
-                    var pdf = new self.jsPDF("l", "px", [element.offsetHeight, element.offsetWidth]);
-                    pdf.addImage(self.reader.result, "JPEG", 0, 0, element.offsetWidth, element.offsetHeight);
-                    pdf.save(filename);
-                };
-            });
-        };
-
         /**
          * Takes a screenshot of a DOM node and exports to JPG.
          * @param {node} element to be exported

platform/features/plot/test/PlotControllerSpec.js

@@ -72,7 +72,7 @@ define(
                 mockElement = angular.element('<div />');
                 mockExportImageService = jasmine.createSpyObj(
                     "ExportImageService",
-                    ["exportJPG", "exportPNG", "exportPDF"]
+                    ["exportJPG", "exportPNG"]
                 );
                 mockFormatter = jasmine.createSpyObj(
                     "formatter",

platform/features/plot/test/services/ExportImageServiceSpec.js

@@ -33,8 +33,6 @@ define(
             mockLog,
             mockHtml2Canvas,
             mockCanvas,
-            mockJsPDF,
-            mockJsPDFSave,
             mockSaveAs,
             mockFileReader,
             mockExportTimeoutConstant,
@@ -79,13 +77,6 @@ define(
                     "canvas",
                     ["toBlob"]
                 );
-                mockJsPDFSave = jasmine.createSpy("jsPDFSave");
-                mockJsPDF = function () {
-                    return {
-                        "addImage": function () {},
-                        "save": mockJsPDFSave
-                    };
-                };
                 mockSaveAs = jasmine.createSpy("saveAs");
                 mockFileReader = jasmine.createSpyObj(
                     "FileReader",
@@ -100,23 +91,11 @@ define(
                     mockLog,
                     mockExportTimeoutConstant,
                     mockHtml2Canvas,
-                    mockJsPDF,
                     mockSaveAs,
                     mockFileReader
                 );
             });
 
-            it("runs html2canvas and tries to save a pdf", function () {
-                exportImageService.exportPDF(testElement, "plot.pdf");
-                mockFileReader.onloadend();
-
-                expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) });
-                expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/jpeg");
-                expect(mockDeferred.reject).not.toHaveBeenCalled();
-                expect(mockJsPDFSave).toHaveBeenCalled();
-                expect(mockPromise.finally).toHaveBeenCalled();
-            });
-
             it("runs html2canvas and tries to save a png", function () {
                 exportImageService.exportPNG(testElement, "plot.png");
 

test-main.js

@@ -56,7 +56,6 @@ requirejs.config({
         "EventEmitter": "bower_components/eventemitter3/index",
         "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
-        "jsPDF": "bower_components/jspdf/dist/jspdf.debug",
         "moment": "bower_components/moment/moment",
         "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format",
         "saveAs": "bower_components/FileSaver.js/FileSaver.min",