Merge branch 'develop'

src/Reactables.jsx

@@ -1,9 +1,9 @@
-import React from 'react'
-import Main from './components/Main.js'
-import Tools from './components/Tools.js'
-import Editor from './components/Editor.js'
-import Pagination from './components/Pagination.js'
-import styles from './css/styles.css'
+import React, { PropTypes } from 'react';
+import Main from './components/Main.js';
+import Tools from './components/Tools.js';
+import Editor from './components/Editor.js';
+import Pagination from './components/Pagination.js';
+import styles from './css/styles.css';
 import { DataException } from './components/Exceptions';
 
 var CommonConstants = require('./components/CommonConstants');
@@ -410,8 +410,8 @@ class Reactables extends Main {
 }
 
 Reactables.propTypes = {
-  editor: React.PropTypes.object,
-  settings: React.PropTypes.object.isRequired
+  editor: PropTypes.object,
+  settings: PropTypes.object.isRequired
 }
 
 export default Reactables

src/components/Button.js

@@ -1,12 +1,12 @@
-import React, { PropTypes } from 'react'
-import styles from '../css/styles.css'
-import editor from '../css/editor.css'
+import React, { Component, PropTypes } from 'react';
+import styles from '../css/styles.css';
+import editor from '../css/editor.css';
 import classNames from 'classnames/bind';
 
 var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 
-class Button extends React.Component {
+class Button extends Component {
   constructor(props) {
     super(props);
     this.onClick = this.onClick.bind(this);

src/components/Column.js

@@ -1,6 +1,6 @@
-import React, { PropTypes } from 'react'
+import React, { Component, PropTypes } from 'react';
 
-class Column extends React.Component {
+class Column extends Component {
   shouldComponentUpdate(nextProps) {
     const { gteRowId, count, selectedRows, dataIndex } = this.props;
     return gteRowId !== nextProps.gteRowId

src/components/Editor.js

@@ -1,5 +1,5 @@
-import React from 'react';
-import {EditorException} from './Exceptions';
+import React, { Component } from 'react';
+import { EditorException } from './Exceptions';
 import editorStyles from '../css/editor.css';
 import classNames from 'classnames/bind';
 import superagent from 'superagent';
@@ -8,7 +8,7 @@ var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 var Lang = require('./Lang');
 
-class Editor extends React.Component {
+class Editor extends Component {
   constructor(props)
   {
     super(props);

src/components/Header.js

@@ -1,10 +1,10 @@
-import React from 'react'
+import React, { Component } from 'react';
 import classNames from 'classnames/bind';
-import styles from '../css/styles.css'
+import styles from '../css/styles.css';
 
 var CommonConstants = require('./CommonConstants');
 
-class Header extends React.Component {
+class Header extends Component {
 
   constructor(props)
   {

src/components/Main.js

@@ -1,13 +1,13 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import Row from './Row.js'
-import Column from './Column.js'
+import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
+import Row from './Row.js';
+import Column from './Column.js';
 
 var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 var Lang = require('./Lang');
 
-class Main extends React.Component {
+class Main extends Component {
 
   constructor(props)
   {

src/components/PagesSelector.js

@@ -1,11 +1,11 @@
-import React, { PropTypes } from 'react'
-import styles from '../css/styles.css'
+import React, { Component, PropTypes } from 'react';
+import styles from '../css/styles.css';
 
 var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 var Lang = require('./Lang');
 
-class PagesSelector extends React.Component {
+class PagesSelector extends Component {
   shouldComponentUpdate(nextProps) {
     return this.props.perPageRows !== nextProps.perPageRows
       || this.props.perPage !== nextProps.perPage;

src/components/Pagination.js

@@ -1,12 +1,12 @@
-import React, { PropTypes } from 'react'
+import React, { Component, PropTypes } from 'react';
 import classNames from 'classnames/bind';
-import styles from '../css/styles.css'
+import styles from '../css/styles.css';
 
 var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 var Lang = require('./Lang');
 
-class Pagination extends React.Component {
+class Pagination extends Component {
   shouldComponentUpdate(nextProps)
   {
     return this.props.countRows !== nextProps.countRows

src/components/Row.js

@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react'
-import styles from '../css/styles.css'
-import classNames from 'classnames/bind'
+import React, { Component, PropTypes } from 'react';
+import styles from '../css/styles.css';
+import classNames from 'classnames/bind';
 
-class Row extends React.Component {
+class Row extends Component {
   shouldComponentUpdate(nextProps) {
     const { gteRowId, count, selectedRows, minRow, maxRow } = this.props;
     return gteRowId !== nextProps.gteRowId

src/components/Search.js

@@ -1,12 +1,12 @@
-import React from 'react'
-import styles from '../css/styles.css'
-import editor from '../css/editor.css'
+import React, { Component } from 'react';
+import styles from '../css/styles.css';
+import editor from '../css/editor.css';
 
 var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 var Lang = require('./Lang');
 
-class Search extends React.Component {
+class Search extends Component {
   shouldComponentUpdate(nextProps) {
     return this.props.search !== nextProps.search;
   }

src/components/Tools.js

@@ -1,14 +1,14 @@
-import React from 'react'
-import Button from './Button.js'
-import PagesSelector from './PagesSelector.js'
-import Search from './Search.js'
-import styles from '../css/styles.css'
+import React, { Component } from 'react';
+import Button from './Button.js';
+import PagesSelector from './PagesSelector.js';
+import Search from './Search.js';
+import styles from '../css/styles.css';
 
 var CommonConstants = require('./CommonConstants');
 var EditorConstants = require('./EditorConstants');
 var Lang = require('./Lang');
 
-class Tools extends React.Component {
+class Tools extends Component {
   getPagesSelection()
   {
     const {