+ 
);
}
diff --git a/src/firefly/js/ui/ColorPicker.jsx b/src/firefly/js/ui/ColorPicker.jsx
index 2ab9a7bdea..544e0285c5 100644
--- a/src/firefly/js/ui/ColorPicker.jsx
+++ b/src/firefly/js/ui/ColorPicker.jsx
@@ -7,7 +7,7 @@ import {dispatchShowDialog} from '../core/ComponentCntlr.js';
import {PopupPanel} from './PopupPanel.jsx';
import CompleteButton from './CompleteButton.jsx';
import DialogRootContainer from './DialogRootContainer.jsx';
-import ColorPicker from 'react-color';
+import {SketchPicker} from 'react-color';
@@ -26,7 +26,7 @@ var lastEv;
function ColorPickerWrapper ({callback,color,callbackOnOKOnly, callbackOnBoth}) {
return (
- {
lastEv=ev;
if (!callbackOnOKOnly) callback(ev, false);
diff --git a/src/firefly/js/ui/ExampleDialog.jsx b/src/firefly/js/ui/ExampleDialog.jsx
index 7a1f3719f8..c068fb346a 100644
--- a/src/firefly/js/ui/ExampleDialog.jsx
+++ b/src/firefly/js/ui/ExampleDialog.jsx
@@ -11,7 +11,7 @@ import {CheckboxGroupInputField} from './CheckboxGroupInputField.jsx';
import {RadioGroupInputField} from './RadioGroupInputField.jsx';
import {ListBoxInputField} from './ListBoxInputField.jsx';
import {SuggestBoxInputField} from './SuggestBoxInputField.jsx';
-import Histogram from '../charts/ui/Histogram.jsx';
+import {Histogram} from '../charts/ui/Histogram.jsx';
import CompleteButton from './CompleteButton.jsx';
import {FieldGroup} from './FieldGroup.jsx';
import {dispatchMultiValueChange, dispatchRestoreDefaults} from '../fieldGroup/FieldGroupCntlr.js';
@@ -138,7 +138,7 @@ var AllTest = React.createClass({
-
+
- {React.Children.map(children,function(inChild) {
- return (
-
-
+
+
- { inChild && React.cloneElement(inChild, {labelWidth})}
-
- );
- })}
- {elements}
);
}
diff --git a/src/firefly/js/ui/Menu.jsx b/src/firefly/js/ui/Menu.jsx
index 580f6a16bd..b719450ec4 100644
--- a/src/firefly/js/ui/Menu.jsx
+++ b/src/firefly/js/ui/Menu.jsx
@@ -31,15 +31,15 @@ function handleAction (menuItem) {
function makeMenuItem(menuItem, isSelected) {
var clsname = 'menu__item' + (isSelected ? ' menu__item-selected' : '');
return (
-
-
+
| - | + | + |
{menuItem.label}
diff --git a/src/firefly/js/ui/PopupPanel.jsx b/src/firefly/js/ui/PopupPanel.jsx
index c0494a3c68..d2e2af2ab9 100644
--- a/src/firefly/js/ui/PopupPanel.jsx
+++ b/src/firefly/js/ui/PopupPanel.jsx
@@ -10,7 +10,7 @@ import ReactDOM from 'react-dom';
import {getPopupPosition, humanStart, humanMove, humanStop } from './PopupPanelHelper.js';
import './PopupPanel.css';
-import DEL_ICO from 'html/images/blue_delete_10x10.gif';
+import DEL_ICO from 'html/images/blue_delete_10x10.png';
export const LayoutType= new Enum(['CENTER', 'TOP_EDGE_CENTER', 'TOP_CENTER', 'TOP_LEFT', 'TOP_RIGHT', 'NONE', 'USER_POSITION']);
@@ -163,10 +163,10 @@ export var PopupPanel= React.createClass(
{title}
-
diff --git a/src/firefly/js/ui/RadioGroupInputFieldView.jsx b/src/firefly/js/ui/RadioGroupInputFieldView.jsx
index 192a98ed45..aada35e42e 100644
--- a/src/firefly/js/ui/RadioGroupInputFieldView.jsx
+++ b/src/firefly/js/ui/RadioGroupInputFieldView.jsx
@@ -11,7 +11,6 @@ function makeOptions(options,alignment,fieldKey,value,onChange,tooltip) {
title={tooltip}
name={fieldKey}
value={option.value}
- defaultChecked={value===option.value}
checked={value===option.value}
onChange={onChange}
/> {option.label}
diff --git a/src/firefly/js/ui/panel/TabPanel.jsx b/src/firefly/js/ui/panel/TabPanel.jsx
index 2403775dda..6a4895ac69 100644
--- a/src/firefly/js/ui/panel/TabPanel.jsx
+++ b/src/firefly/js/ui/panel/TabPanel.jsx
@@ -33,7 +33,7 @@ class TabsHeader extends Component {
super(props);
this.state = {widthPx: 0};
this.onResize = debounce((size) => {
- if (size && size.width !== this.state.widthPx) {
+ if (size && size.width !== this.state.widthPx && !this.isUnmounted) {
this.setState({widthPx: size.width});
}
}, 100).bind(this);
@@ -43,6 +43,10 @@ class TabsHeader extends Component {
return sCompare(this, np, ns);
}
+ componentWillUnmount() {
+ this.isUnmounted = true;
+ }
+
render() {
const {widthPx} = this.state;
const {children, resizable} = this.props;
@@ -89,9 +93,14 @@ export class Tabs extends Component {
return sCompare(this, np, ns);
}
+ componentWillUnmount() {
+ this.isUnmounted = true;
+ }
+
+
onSelect(index,id,name) {
const {onTabSelect, componentKey} = this.props;
- if (this.state.selectedIdx !== index) {
+ if (this.state.selectedIdx !== index && !this.isUnmounted) {
if (componentKey) {
dispatchComponentStateChange(componentKey, {selectedIdx: index});
}
diff --git a/src/firefly/js/util/expr/__test__/Expression-test.js b/src/firefly/js/util/expr/__test__/Expression-test.js
index 85db96d05f..72d2a89964 100644
--- a/src/firefly/js/util/expr/__test__/Expression-test.js
+++ b/src/firefly/js/util/expr/__test__/Expression-test.js
@@ -1,7 +1,7 @@
/*eslint-env node, mocha */
// to run: from firefly/src/firefly
-// node ../../node_modules/mocha/bin/mocha js/util/expr/__test__/*test.js --compilers js:babel/register --requires ignore-styles
+// node ../../node_modules/mocha/bin/mocha js/util/expr/__test__/*test.js --compilers js:babel-core/register --requires ignore-styles
import {expect} from 'chai';
diff --git a/src/firefly/js/visualize/draw/DirectionArrowDrawObj.js b/src/firefly/js/visualize/draw/DirectionArrowDrawObj.js
index b541d7e652..5201b50901 100644
--- a/src/firefly/js/visualize/draw/DirectionArrowDrawObj.js
+++ b/src/firefly/js/visualize/draw/DirectionArrowDrawObj.js
@@ -30,7 +30,7 @@ const DIR_ARROW_DRAW_OBJ= 'DirectionArrayDrawObj';
* @param text
* @return {object}
*/
-function makeDirectionArrowDrawObj(startPt, endPt, text) {
+export function makeDirectionArrowDrawObj(startPt, endPt, text) {
if (!startPt || !endPt) return null;
var obj= DrawObj.makeDrawObj();
diff --git a/src/firefly/js/visualize/iv/ExpandedModeDisplay.jsx b/src/firefly/js/visualize/iv/ExpandedModeDisplay.jsx
index 4a0b59ad6c..1eec9c10e7 100644
--- a/src/firefly/js/visualize/iv/ExpandedModeDisplay.jsx
+++ b/src/firefly/js/visualize/iv/ExpandedModeDisplay.jsx
@@ -22,12 +22,12 @@ export class ExpandedModeDisplay extends Component {
componentWillUnmount() {
if (this.removeListener) this.removeListener();
+ this.isUnmounted = true;
if (this.props.forceExpandedMode) {
dispatchChangeExpandedMode(ExpandType.COLLAPSE);
}
}
-
componentDidMount() {
this.removeListener= flux.addListener(() => this.storeUpdate());
if (this.props.forceExpandedMode) {
@@ -36,12 +36,14 @@ export class ExpandedModeDisplay extends Component {
}
storeUpdate() {
- const {state}= this;
- const vr= visRoot();
- const mvR= getMultiViewRoot();
-
- if (vr!==state.visRoot || mvR!=state.multiViewRoot) {
- this.setState({visRoot:vr, multiViewRoot:mvR});
+ if (!this.isUnmounted) {
+ const {state}= this;
+ const vr= visRoot();
+ const mvR= getMultiViewRoot();
+
+ if (vr!==state.visRoot || mvR!=state.multiViewRoot) {
+ this.setState({visRoot:vr, multiViewRoot:mvR});
+ }
}
}
diff --git a/src/firefly/package.json b/src/firefly/package.json
index b7550eebae..7926bd93fa 100644
--- a/src/firefly/package.json
+++ b/src/firefly/package.json
@@ -5,6 +5,6 @@
"lint" : "DO_LINT=true npm run build",
"dev" : "DEBUG=true npm run build -- -w -d --no-color",
"test-watch": "npm run build && node ../../node_modules/karma/bin/karma start --singleRun=false",
- "test-unit": "node ../../node_modules/mocha/bin/mocha **/__test__/*test.js --compilers js:babel/register"
+ "test-unit": "node ../../node_modules/mocha/bin/mocha **/__test__/*test.js --compilers js:babel-core/register"
}
}
diff --git a/src/firefly/webpack.config.js b/src/firefly/webpack.config.js
index 595b7247f7..b68ac87488 100644
--- a/src/firefly/webpack.config.js
+++ b/src/firefly/webpack.config.js
@@ -1,10 +1,10 @@
/* eslint-env node */
-require('babel/register');
+require('babel-core/register')({presets: ['es2015', 'react', 'stage-2']});
var path = require('path');
var firefly_root = path.resolve(__dirname, '../..');
var name = 'firefly';
var entry = {firefly: path.resolve(firefly_root, 'src/firefly/js/FFEntryPoint.js')};
-module.exports = require(firefly_root + '/buildScript/webpack.config.js')({firefly_root, name, entry});
+module.exports = require(firefly_root + '/buildScript/webpack.config.js').default({firefly_root, name, entry});
|