@@ -246,7 +279,9 @@ Preferences.propTypes = {
fontSize: PropTypes.number.isRequired,
setFontSize: PropTypes.func.isRequired,
autosave: PropTypes.bool.isRequired,
+ linewrap: PropTypes.bool.isRequired,
setAutosave: PropTypes.func.isRequired,
+ setLinewrap: PropTypes.func.isRequired,
textOutput: PropTypes.bool.isRequired,
gridOutput: PropTypes.bool.isRequired,
soundOutput: PropTypes.bool.isRequired,
diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx
index 8dda673a..5967c9e3 100644
--- a/client/modules/IDE/pages/IDEView.jsx
+++ b/client/modules/IDE/pages/IDEView.jsx
@@ -204,7 +204,9 @@ class IDEView extends React.Component {
fontSize={this.props.preferences.fontSize}
setFontSize={this.props.setFontSize}
autosave={this.props.preferences.autosave}
+ linewrap={this.props.preferences.linewrap}
setAutosave={this.props.setAutosave}
+ setLinewrap={this.props.setLinewrap}
lintWarning={this.props.preferences.lintWarning}
setLintWarning={this.props.setLintWarning}
textOutput={this.props.preferences.textOutput}
@@ -261,6 +263,7 @@ class IDEView extends React.Component {
>
{
return Object.assign({}, state, { fontSize: action.value });
case ActionTypes.SET_AUTOSAVE:
return Object.assign({}, state, { autosave: action.value });
+ case ActionTypes.SET_LINEWRAP:
+ return Object.assign({}, state, { linewrap: action.value });
case ActionTypes.SET_LINT_WARNING:
return Object.assign({}, state, { lintWarning: action.value });
case ActionTypes.SET_TEXT_OUTPUT:
diff --git a/client/styles/components/_overlay.scss b/client/styles/components/_overlay.scss
index 2065a230..8662bc2d 100644
--- a/client/styles/components/_overlay.scss
+++ b/client/styles/components/_overlay.scss
@@ -22,7 +22,7 @@
display: flex;
flex-wrap: wrap;
flex-flow: column;
- max-height: 80%;
+ max-height: 88%;
max-width: 65%;
}
diff --git a/server/models/user.js b/server/models/user.js
index 168a71ca..ec4037e2 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -27,6 +27,7 @@ const userSchema = new Schema({
indentationAmount: { type: Number, default: 2 },
isTabIndent: { type: Boolean, default: false },
autosave: { type: Boolean, default: true },
+ linewrap: { type: Boolean, default: true },
lintWarning: { type: Boolean, default: false },
textOutput: { type: Boolean, default: false },
gridOutput: { type: Boolean, default: false },