From 3a19890be9c3855ec26131c08852bf9953fa6800 Mon Sep 17 00:00:00 2001 From: David Hudson Date: Fri, 2 Sep 2016 03:11:26 +0900 Subject: [PATCH] [Formatting] Linting --- main.js | 7 +++--- platform/features/plot/src/PlotController.js | 6 ++--- .../plot/src/services/ExportImageService.js | 24 +++++++++++-------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/main.js b/main.js index 057346d91e..58ea2b1756 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ requirejs.config({ "csv": "bower_components/comma-separated-values/csv.min", "es6-promise": "bower_components/es6-promise/promise.min", "html2canvas": "bower_components/html2canvas/build/html2canvas.min", - "jspdf": "bower_components/jspdf/dist/jspdf.min", + "jsPDF": "bower_components/jspdf/dist/jspdf.min", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", @@ -48,6 +48,9 @@ requirejs.config({ "html2canvas": { "exports": "html2canvas" }, + "jsPDF": { + "exports": "jsPDF" + }, "moment-duration-format": { "deps": ["moment"] }, @@ -64,8 +67,6 @@ define([ './platform/framework/src/Main', 'legacyRegistry', - 'html2canvas', - 'jspdf', './platform/framework/bundle', './platform/core/bundle', './platform/representation/bundle', diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 1cbccb8cfb..0e134c05e9 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -258,15 +258,15 @@ define( new PlotAxis("ranges", [], AXIS_DEFAULTS[1]) ]; - $scope.exportPDF = function() { + $scope.exportPDF = function () { PlotController.prototype.exportPDF(self.$element, 'plot.pdf'); }; - $scope.exportPNG = function() { + $scope.exportPNG = function () { PlotController.prototype.exportPNG(self.$element, 'plot.png'); }; - $scope.exportJPG = function() { + $scope.exportJPG = function () { PlotController.prototype.exportJPG(self.$element, 'plot.jpg'); }; diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js index b1dc8a51d7..2f55c4eaad 100644 --- a/platform/features/plot/src/services/ExportImageService.js +++ b/platform/features/plot/src/services/ExportImageService.js @@ -24,15 +24,19 @@ * Module defining ExportImageService. Created by hudsonfoo on 09/02/16 */ define( - ['saveAs'], - function (saveAs) { + [ + 'html2canvas', + 'jsPDF', + 'saveAs' + ], + function (html2canvas, jsPDF, saveAs) { /** * The export image service will export any HTML node to * PDF, JPG, or PNG. * @constructor */ - function ExportImageService() { + function ExportImageService () { } /** @@ -47,7 +51,7 @@ define( type = type || 'jpeg'; html2canvas(element, { - onrendered: function(canvas) { + onrendered: function (canvas) { switch (type.toLowerCase()) { case "blob": canvas.toBlob(callback); @@ -67,22 +71,22 @@ define( }); } - ExportImageService.exportPDF = function(element, filename) { - renderElement(element, function(img) { + ExportImageService.exportPDF = function (element, filename) { + renderElement(element, function (img) { var pdf = new jsPDF('l', 'px', [element.offsetHeight, element.offsetWidth]); pdf.addImage(img, 'JPEG', 0, 0, element.offsetWidth, element.offsetHeight); pdf.save(filename); }, 'jpeg'); }; - ExportImageService.exportJPG = function(element, filename) { - renderElement(element, function(img) { + ExportImageService.exportJPG = function (element, filename) { + renderElement(element, function (img) { saveAs(img, filename); }, "blob"); }; - ExportImageService.exportPNG = function(element, filename) { - renderElement(element, function(img) { + ExportImageService.exportPNG = function (element, filename) { + renderElement(element, function (img) { saveAs(img, filename); }, "blob"); };