From 134b020200176b979ff066466891a62212fc2375 Mon Sep 17 00:00:00 2001 From: Matt Earnshaw Date: Fri, 20 Oct 2017 15:51:05 +0100 Subject: [PATCH 1/2] add plotly heatmap component (for colorbar) --- src/main/webapp/js/components/widgets/plot/Plot.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/webapp/js/components/widgets/plot/Plot.js b/src/main/webapp/js/components/widgets/plot/Plot.js index 07473ae12..7ed43582e 100644 --- a/src/main/webapp/js/components/widgets/plot/Plot.js +++ b/src/main/webapp/js/components/widgets/plot/Plot.js @@ -12,6 +12,11 @@ define(function (require) { var $ = require('jquery'); var math = require('mathjs'); var Plotly = require('plotly.js/lib/core'); + + Plotly.register([ + require('plotly.js/lib/heatmap'), + ]); + var FileSaver = require('file-saver'); var pako = require('pako'); From 2ecaae222136e1ba4a4a3cbbef2098fc24877550 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 23 Oct 2017 13:52:57 -0700 Subject: [PATCH 2/2] fix Escape glitch --- src/main/webapp/js/components/widgets/Widget.js | 1 + src/main/webapp/js/components/widgets/WidgetCapability.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/webapp/js/components/widgets/Widget.js b/src/main/webapp/js/components/widgets/Widget.js index d5f2f4176..361025a12 100644 --- a/src/main/webapp/js/components/widgets/Widget.js +++ b/src/main/webapp/js/components/widgets/Widget.js @@ -660,6 +660,7 @@ define(function (require) { top: 10, height: 300, width: 350, + closeOnEscape: false, close: function (event, ui) { if (event.originalEvent && $(event.originalEvent.target).closest(".ui-dialog-titlebar-close").length) { diff --git a/src/main/webapp/js/components/widgets/WidgetCapability.js b/src/main/webapp/js/components/widgets/WidgetCapability.js index fc6184a65..fbacfa344 100644 --- a/src/main/webapp/js/components/widgets/WidgetCapability.js +++ b/src/main/webapp/js/components/widgets/WidgetCapability.js @@ -544,6 +544,7 @@ define(function (require) { top: 10, height: this.props.size.height, width: this.props.size.width, + closeOnEscape: false, position: { my: "left+" + this.props.position.left + " top+" + this.props.position.top, at: "left top",