| {_("Used")} | {used_fmt[0]} {used_fmt[1]} |
| {_("Total")} | {total_fmt[0]} {total_fmt[1]} |
| {_("Used")} | {used_fmt[0]} {used_fmt[1]} |
| {_("Total")} | {total_fmt[0]} {total_fmt[1]} |
diff --git a/pkg/kdump/kdump-view.jsx b/pkg/kdump/kdump-view.jsx
index bacb280eaa7f..a5d14ec00a0c 100644
--- a/pkg/kdump/kdump-view.jsx
+++ b/pkg/kdump/kdump-view.jsx
@@ -21,6 +21,7 @@ var cockpit = require("cockpit");
var _ = cockpit.gettext;
var React = require("react");
+var createReactClass = require('create-react-class');
var OnOffSwitch = require("cockpit-components-onoff.jsx").OnOffSwitch;
var Select = require("cockpit-components-select.jsx");
@@ -43,7 +44,7 @@ var Tooltip = require("cockpit-components-tooltip.jsx").Tooltip;
* nfs and ssh are disabled for now
*/
-var KdumpTargetBody = React.createClass({
+var KdumpTargetBody = createReactClass({
getInitialState: function() {
return {
storeDest: this.props.initialTarget.target, // dialog mode, depends on location
@@ -218,7 +219,7 @@ var KdumpTargetBody = React.createClass({
* reservedMemory memory reserved at boot time for kdump use
* onCrashKernel callback to crash the kernel via kdumpClient, expects a promise
*/
-var KdumpPage = React.createClass({
+var KdumpPage = createReactClass({
getInitialState: function() {
return {
dialogSettings: undefined,
diff --git a/pkg/lib/cockpit-components-detail-page.jsx b/pkg/lib/cockpit-components-detail-page.jsx
index 7187462f4872..afc9af04c4af 100644
--- a/pkg/lib/cockpit-components-detail-page.jsx
+++ b/pkg/lib/cockpit-components-detail-page.jsx
@@ -20,6 +20,7 @@
'use strict';
const React = require('react');
+const PropTypes = require("prop-types");
require('./listing.less');
// TODO remove next line and detail-page.less file as well once React 16 is merged
@@ -48,8 +49,8 @@ const DetailPageRow = ({title, idPrefix, children}) => {
};
DetailPageRow.propTypes = {
- title: React.PropTypes.string,
- idPrefix: React.PropTypes.string, // row will have no elements with id if not specified
+ title: PropTypes.string,
+ idPrefix: PropTypes.string, // row will have no elements with id if not specified
};
const DetailPageHeader = ({title, iconClass, navigateUpTitle, onNavigateUp, actions, idPrefix}) => {
@@ -75,12 +76,12 @@ const DetailPageHeader = ({title, iconClass, navigateUpTitle, onNavigateUp, acti
};
DetailPageHeader.propTypes = {
- title: React.PropTypes.string,
- iconClass: React.PropTypes.string, // className used for an icon
- navigateUpTitle: React.PropTypes.string,
- onNavigateUp: React.PropTypes.func,
- actions: React.PropTypes.object,
- idPrefix: React.PropTypes.string, // header will have no elements with id if not specified
+ title: PropTypes.string,
+ iconClass: PropTypes.string, // className used for an icon
+ navigateUpTitle: PropTypes.string,
+ onNavigateUp: PropTypes.func,
+ actions: PropTypes.object,
+ idPrefix: PropTypes.string, // header will have no elements with id if not specified
};
module.exports = {
diff --git a/pkg/lib/cockpit-components-dialog.jsx b/pkg/lib/cockpit-components-dialog.jsx
index ecddabc93a60..2a9fc503d46a 100644
--- a/pkg/lib/cockpit-components-dialog.jsx
+++ b/pkg/lib/cockpit-components-dialog.jsx
@@ -20,6 +20,9 @@
var cockpit = require("cockpit");
var React = require("react");
var ReactDOM = require("react-dom");
+var PropTypes = require("prop-types");
+var createReactClass = require('create-react-class');
+
var _ = cockpit.gettext;
require("page.css");
@@ -46,13 +49,13 @@ require("cockpit-components-dialog.css");
* - idle_message optional, always show this message on the last row when idle
* - dialog_done optional, callback when dialog is finished (param true if success, false on cancel)
*/
-var DialogFooter = React.createClass({
+var DialogFooter = createReactClass({
propTypes: {
- cancel_clicked: React.PropTypes.func,
- cancel_caption: React.PropTypes.string,
- actions: React.PropTypes.array,
- static_error: React.PropTypes.string,
- dialog_done: React.PropTypes.func,
+ cancel_clicked: PropTypes.func,
+ cancel_caption: PropTypes.string,
+ actions: PropTypes.array,
+ static_error: PropTypes.string,
+ dialog_done: PropTypes.func,
},
getInitialState: function() {
return {
@@ -72,11 +75,11 @@ var DialogFooter = React.createClass({
},
componentDidMount: function() {
document.body.classList.add("modal-in");
- document.addEventListener('keyup', this.keyUpHandler.bind(this));
+ document.addEventListener('keyup', this.keyUpHandler);
},
componentWillUnmount: function() {
document.body.classList.remove("modal-in");
- document.removeEventListener('keyup', this.keyUpHandler.bind(this));
+ document.removeEventListener('keyup', this.keyUpHandler);
},
update_progress: function(msg, cancel) {
this.setState({ action_progress_message: msg, action_progress_cancel: cancel });
@@ -93,7 +96,7 @@ var DialogFooter = React.createClass({
action_canceled: false,
});
- var p = handler(this.update_progress.bind(this))
+ var p = handler(this.update_progress)
.then(function() {
self.setState({ action_in_progress: false, error_message: null });
if (self.props.dialog_done)
@@ -113,7 +116,7 @@ var DialogFooter = React.createClass({
});
if (p.progress)
- p.progress(this.update_progress.bind(this));
+ p.progress(this.update_progress);
this.setState({ action_in_progress_promise: p });
@@ -222,7 +225,7 @@ var DialogFooter = React.createClass({
{ wait_element }
{ action_buttons }
@@ -246,14 +249,14 @@ var DialogFooter = React.createClass({
* - footer (react element, top element should be of class modal-footer)
* - id optional, id that is assigned to the top level dialog node, but not the backdrop
*/
-var Dialog = React.createClass({
+var Dialog = createReactClass({
propTypes: {
// TODO: fix following by refactoring the logic showing modal dialog (recently show_modal_dialog())
- title: React.PropTypes.string, // is effectively required, but show_modal_dialog() provides initially no props and resets them later.
- no_backdrop: React.PropTypes.bool,
- body: React.PropTypes.element, // is effectively required, see above
- footer: React.PropTypes.element, // is effectively required, see above
- id: React.PropTypes.string,
+ title: PropTypes.string, // is effectively required, but show_modal_dialog() provides initially no props and resets them later.
+ no_backdrop: PropTypes.bool,
+ body: PropTypes.element, // is effectively required, see above
+ footer: PropTypes.element, // is effectively required, see above
+ id: PropTypes.string
},
componentDidMount: function() {
// if we used a button to open this, make sure it's not focused anymore
diff --git a/pkg/lib/cockpit-components-file-autocomplete.jsx b/pkg/lib/cockpit-components-file-autocomplete.jsx
index acb73e115110..5db1c7ec9e3d 100644
--- a/pkg/lib/cockpit-components-file-autocomplete.jsx
+++ b/pkg/lib/cockpit-components-file-autocomplete.jsx
@@ -21,16 +21,19 @@
var cockpit = require("cockpit");
var React = require("react");
+var PropTypes = require("prop-types");
+var createReactClass = require('create-react-class');
+
var _ = cockpit.gettext;
require("./cockpit-components-file-autocomplete.css");
-var FileAutoComplete = React.createClass({
+var FileAutoComplete = createReactClass({
propTypes: {
- id: React.PropTypes.string,
- placeholder: React.PropTypes.string,
- value: React.PropTypes.string,
- superuser: React.PropTypes.string,
- onChange: React.PropTypes.func,
+ id: PropTypes.string,
+ placeholder: PropTypes.string,
+ value: PropTypes.string,
+ superuser: PropTypes.string,
+ onChange: PropTypes.func,
},
getInitialState () {
var value = this.props.value || "";
diff --git a/pkg/lib/cockpit-components-onoff.jsx b/pkg/lib/cockpit-components-onoff.jsx
index 4b2416072856..b823e058eb12 100644
--- a/pkg/lib/cockpit-components-onoff.jsx
+++ b/pkg/lib/cockpit-components-onoff.jsx
@@ -21,6 +21,8 @@
var cockpit = require("cockpit");
var React = require("react");
+var createReactClass = require('create-react-class');
+
var _ = cockpit.gettext;
require("./cockpit-components-onoff.css");
@@ -32,7 +34,7 @@ require("./cockpit-components-onoff.css");
* onChange triggered when the switch is flipped, parameter: new state
* enabled whether the component is enabled or not, defaults to true
*/
-var OnOffSwitch = React.createClass({
+var OnOffSwitch = createReactClass({
getDefaultProps: function() {
return {
captionOff: _("Off"),
diff --git a/pkg/lib/cockpit-components-terminal.jsx b/pkg/lib/cockpit-components-terminal.jsx
index 6d50f8a843f9..d9af9d35674b 100644
--- a/pkg/lib/cockpit-components-terminal.jsx
+++ b/pkg/lib/cockpit-components-terminal.jsx
@@ -22,6 +22,9 @@
var React = require("react");
var ReactDOM = require("react-dom");
+ var PropTypes = require("prop-types");
+ var createReactClass = require('create-react-class');
+
var Term = require("term");
require("console.css");
@@ -41,12 +44,12 @@
*
* Call focus() to set the input focus on the terminal.
*/
- var Terminal = React.createClass({
+ var Terminal = createReactClass({
propTypes: {
- cols: React.PropTypes.number,
- rows: React.PropTypes.number,
- channel: React.PropTypes.object.isRequired,
- onTitleChanged: React.PropTypes.func
+ cols: PropTypes.number,
+ rows: PropTypes.number,
+ channel: PropTypes.object.isRequired,
+ onTitleChanged: PropTypes.func
},
componentWillMount: function () {
diff --git a/pkg/lib/cockpit-components-tooltip.jsx b/pkg/lib/cockpit-components-tooltip.jsx
index fac67095840b..0e6c5c57d058 100644
--- a/pkg/lib/cockpit-components-tooltip.jsx
+++ b/pkg/lib/cockpit-components-tooltip.jsx
@@ -20,6 +20,7 @@
"use strict";
var React = require('react');
+var createReactClass = require('create-react-class');
require('./tooltip.css');
@@ -38,7 +39,7 @@ require('./tooltip.css');
* outermost element of the tooltip.
*/
-var Tooltip = React.createClass({
+var Tooltip = createReactClass({
getInitialState: function () {
return { open: false, pos: "top" };
},
diff --git a/pkg/machines/app.jsx b/pkg/machines/app.jsx
index e7177fab8c89..da9d67b24597 100644
--- a/pkg/machines/app.jsx
+++ b/pkg/machines/app.jsx
@@ -16,7 +16,9 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Cockpit; If not, see