Skip to content

Commit

Permalink
Revert "Swik 2103 support for nv3 d charts in front end"
Browse files Browse the repository at this point in the history
  • Loading branch information
kadevgraaf authored Oct 29, 2018
1 parent 0bef040 commit bfdebac
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 223 deletions.
2 changes: 0 additions & 2 deletions assets/css/nv.d3.min.css

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
import {connectToStores} from 'fluxible-addons-react';
import {NavLink, navigateAction} from 'fluxible-router';
import PropTypes from 'prop-types';
import React from 'react';
let ReactDOM = require('react-dom');

import ChartRender from '../../util/ChartRender';
import {NavLink, navigateAction} from 'fluxible-router';
import {connectToStores} from 'fluxible-addons-react';
import SlideEditStore from '../../../../../stores/SlideEditStore';
import DataSourceStore from '../../../../../stores/DataSourceStore';
import DeckTreeStore from '../../../../../stores/DeckTreeStore';
import { findDOMNode } from 'react-dom';
import {FormattedMessage, defineMessages} from 'react-intl';
import handleDroppedFile from '../../../../../actions/media/handleDroppedFile';
import {HotKeys} from 'react-hotkeys';
import SlideViewStore from '../../../../../stores/SlideViewStore';
import MediaStore from '../../../../../stores/MediaStore';
import {Microservices} from '../../../../../configs/microservices';
import PaintModalStore from '../../../../../stores/PaintModalStore';
import addSlide from '../../../../../actions/slide/addSlide';
import saveSlide from '../../../../../actions/slide/saveSlide';
import editImageWithSrc from '../../../../../actions/paint/editImageWithSrc';
import editSVGwithSVG from '../../../../../actions/paint/editSVGwithSVG';
import loadSlideAll from '../../../../../actions/slide/loadSlideAll';
import handleDroppedFile from '../../../../../actions/media/handleDroppedFile';
import contentEditorClick from '../../../../../actions/slide/contentEditorClick';
//import ResizeAware from 'react-resize-aware';
import SlideEditStore from '../../../../../stores/SlideEditStore';
import SlideViewStore from '../../../../../stores/SlideViewStore';
import { findDOMNode } from 'react-dom';
import UserProfileStore from '../../../../../stores/UserProfileStore';
import {Microservices} from '../../../../../configs/microservices';
import DeckTreeStore from '../../../../../stores/DeckTreeStore';
//import TemplateDropdown from '../../../../common/TemplateDropdown';
import {HotKeys} from 'react-hotkeys';
import UploadMediaModal from '../../../../common/UploadMediaModal';
import UserProfileStore from '../../../../../stores/UserProfileStore';
import Util from '../../../../common/Util';
import {FormattedMessage, defineMessages} from 'react-intl';
import changeSlideSizeText from '../../../../../actions/slide/changeSlideSizeText';



let ReactDOM = require('react-dom');

class SlideContentEditor extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -1103,7 +1100,7 @@ class SlideContentEditor extends React.Component {
//CKEDITOR.instances.inlineContent.on('blur',(evt) => {
// return false;
//});

CKEDITOR.instances.inlineContent.on('focus',(evt) => {
this.context.executeAction(contentEditorClick, {
focus: true
Expand Down Expand Up @@ -1210,11 +1207,6 @@ class SlideContentEditor extends React.Component {

this.correctDimensionsBoxesImg();
this.resetZIndexSpeakerNotes();
//('img');

// WARNING: Since this function is affected by the usage of contextMenuAll I decided to put it here right after of it...
ChartRender.renderCharts(true);

let slideSizeTextTemp;
if (this.refs.inlineContent.innerHTML.includes('pptx2html'))
{
Expand All @@ -1235,10 +1227,6 @@ class SlideContentEditor extends React.Component {
// add to the mathjax rendering queue the command to type-set the inlineContent
//MathJax.Hub.Queue(['Typeset',MathJax.Hub,'inlineContent']);
this.resize();

// WARNING: Since this function is affected by the usage of contextMenuAll I decided to put it here right after of it...
ChartRender.renderCharts(false);

}

correctDimensionsBoxesIframe()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import {findDOMNode} from 'react-dom';
import ChartRender from '../../util/ChartRender';
import {connectToStores} from 'fluxible-addons-react';
import SlideViewStore from '../../../../../stores/SlideViewStore';
const ReactDOM = require('react-dom');
Expand Down Expand Up @@ -34,14 +33,9 @@ class SlideContentView extends React.Component {
//window.addEventListener('resize', this.handleResize);
}
this.forceUpdate();

// Resize of charts only necessary here.
ChartRender.renderCharts(true);

}

componentDidUpdate() {
ChartRender.renderCharts(false);
// update mathjax rendering
// add to the mathjax rendering queue the command to type-set the inlineContent
MathJax.Hub.Queue(['Typeset',MathJax.Hub,'inlineContent']);
Expand Down
172 changes: 0 additions & 172 deletions components/Deck/ContentPanel/util/ChartRender.js

This file was deleted.

Loading

0 comments on commit bfdebac

Please sign in to comment.