Linting, changed line endings from Windows to Unix

This commit is contained in:
Oleksandr Zhurbenko 2016-05-30 15:07:02 -07:00
parent ba7cdca648
commit 949511f9b5
16 changed files with 389 additions and 372 deletions

View File

@ -10,16 +10,22 @@ module.exports = function (grunt) {
var SETTINGS_PROD = require('./settings-production.json');
// root URL in development/production:
var devRootURL = (SETTINGS_DEV.rootURL == undefined) ? 'http://127.0.0.1/html5client' : SETTINGS_DEV.rootURL;
var prodRootURL = (SETTINGS_PROD.rootURL == undefined) ? 'http://127.0.0.1/html5client' : SETTINGS_PROD.rootURL;
var devRootURL = (SETTINGS_DEV.rootURL == undefined)
? 'http://127.0.0.1/html5client'
: SETTINGS_DEV.rootURL;
var prodRootURL = (SETTINGS_PROD.rootURL == undefined)
? 'http://127.0.0.1/html5client'
: SETTINGS_PROD.rootURL;
// command line string containing the Meteor's home directory in development/production:
var devHomeStr = (SETTINGS_DEV.home == undefined) ? '' : ('HOME=' + SETTINGS_DEV.home + ' ');
var prodHomeStr = (SETTINGS_PROD.home == undefined) ? '' : ('HOME=' + SETTINGS_PROD.home + ' ');
// final commands:
var METEOR_DEV_COMMAND = devHomeStr + 'ROOT_URL=' + devRootURL + ' meteor --settings settings-development.json';
var METEOR_PROD_COMMAND = prodHomeStr + 'ROOT_URL=' + prodRootURL + ' meteor --settings settings-production.json';
var METEOR_DEV_COMMAND = devHomeStr + 'ROOT_URL=' +
devRootURL + ' meteor --settings settings-development.json';
var METEOR_PROD_COMMAND = prodHomeStr + 'ROOT_URL=' +
prodRootURL + ' meteor --settings settings-production.json';
// configure Grunt
grunt.initConfig({

View File

@ -19,7 +19,7 @@ locale = locale[1] ? `${locale[0]}-${locale[1].toUpperCase()}` : navigator.langu
/* TODO: We should load the en first then merge with the en-US
(eg: load country translation then region) */
let messages = Locales[locale] || Locales['en'] || {};
let messages = Locales[locale] || Locales.en || {};
// Helper to load javascript libraries from the BBB server
function loadLib(libname, successCallback) {

View File

@ -27,10 +27,10 @@ class MediaContainer extends Component {
}
componentWillReceiveProps(nextProps) {
if(nextProps.current_presentation != this.props.current_presentation) {
if(nextProps.current_presentation) {
if (nextProps.current_presentation != this.props.current_presentation) {
if (nextProps.current_presentation) {
this.setState({ content: this.props.content });
} else {
} else {
this.setState({ content: this.props.defaultContent });
}
}

View File

@ -1,18 +1,18 @@
import Slides from '/imports/api/slides';
import Presentations from '/imports/api/presentations';
let getPresentationInfo = () => {
let currentPresentation;
currentPresentation = Presentations.findOne({
'presentation.current': true,
});
return {
current_presentation: (currentPresentation != null ? true : false),
};
};
export default {
getPresentationInfo,
};
import Presentations from '/imports/api/presentations';
import Slides from '/imports/api/slides';
let getPresentationInfo = () => {
let currentPresentation;
currentPresentation = Presentations.findOne({
'presentation.current': true,
});
return {
current_presentation: (currentPresentation != null ? true : false),
};
};
export default {
getPresentationInfo,
};

View File

@ -1,72 +1,72 @@
import React, { PropTypes } from 'react';
import WhiteboardShapeModel from './shape-factory/component.jsx';
import { createContainer } from 'meteor/react-meteor-data';
import Slide from './slide/component.jsx';
import styles from './styles.scss';
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
export default class Whiteboard extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<div
id="whiteboard-paper"
style={this.props.svgStyle}
className={styles.whiteboard}
>
<div id="svggroup">
{ this.props.current_slide ?
<ReactCSSTransitionGroup
transitionName={ {
enter: styles.enter,
enterActive: styles.enterActive,
appear: styles.appear,
appearActive: styles.appearActive
} }
transitionAppear={true}
transitionEnter={true}
transitionLeave={false}
transitionAppearTimeout={400}
transitionEnterTimeout={400}
transitionLeaveTimeout={400}
>
<svg
{...this.props.svgProps}
version="1.1"
xmlNS="http://www.w3.org/2000/svg"
style={this.props.svgStyle}
key={this.props.current_slide.slide.id}
>
<Slide current_slide={this.props.current_slide} />
{ this.props.shapes ? this.props.shapes.map((shape) =>
<WhiteboardShapeModel
shape={shape}
key={shape.shape.id}
/>
)
: null }
</svg>
</ReactCSSTransitionGroup>
: null }
</div>
</div>
);
}
}
Whiteboard.defaultProps = {
svgProps: {
width:'1134',
height:'850.5',
preserveAspectRatio: 'xMinYMin slice',
viewBox:'0 0 1134 850.5',
},
svgStyle: {
overflow: 'hidden',
position: 'relative',
},
};
import React, { PropTypes } from 'react';
import WhiteboardShapeModel from './shape-factory/component.jsx';
import { createContainer } from 'meteor/react-meteor-data';
import Slide from './slide/component.jsx';
import styles from './styles.scss';
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
export default class Whiteboard extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<div
id="whiteboard-paper"
style={this.props.svgStyle}
className={styles.whiteboard}
>
<div id="svggroup">
{ this.props.current_slide ?
<ReactCSSTransitionGroup
transitionName={ {
enter: styles.enter,
enterActive: styles.enterActive,
appear: styles.appear,
appearActive: styles.appearActive,
} }
transitionAppear={true}
transitionEnter={true}
transitionLeave={false}
transitionAppearTimeout={400}
transitionEnterTimeout={400}
transitionLeaveTimeout={400}
>
<svg
{...this.props.svgProps}
version="1.1"
xmlNS="http://www.w3.org/2000/svg"
style={this.props.svgStyle}
key={this.props.current_slide.slide.id}
>
<Slide current_slide={this.props.current_slide} />
{ this.props.shapes ? this.props.shapes.map((shape) =>
<WhiteboardShapeModel
shape={shape}
key={shape.shape.id}
/>
)
: null }
</svg>
</ReactCSSTransitionGroup>
: null }
</div>
</div>
);
}
}
Whiteboard.defaultProps = {
svgProps: {
width:'1134',
height:'850.5',
preserveAspectRatio: 'xMinYMin slice',
viewBox:'0 0 1134 850.5',
},
svgStyle: {
overflow: 'hidden',
position: 'relative',
},
};

View File

@ -14,7 +14,7 @@ export default class DefaultContent extends Component {
<ReactCSSTransitionGroup
transitionName={ {
appear: styles.appear,
appearActive: styles.appearActive
appearActive: styles.appearActive,
} }
transitionAppear={true}
transitionEnter={true}

View File

@ -1,29 +1,36 @@
import Shapes from '/imports/api/shapes';
import Presentations from '/imports/api/presentations';
import Slides from '/imports/api/slides';
let getWhiteboardData = () => {
let currentPresentation, currentSlide, presentationId, shapes, ref;
currentPresentation = Presentations.findOne({
'presentation.current': true,
});
presentationId = currentPresentation != null ? (ref = currentPresentation.presentation) != null ? ref.id : void 0 : void 0;
currentSlide = Slides.findOne({
presentationId: presentationId,
'slide.current': true,
});
if (currentSlide != null) {
shapes = Shapes.find({
whiteboardId: currentSlide.slide.id,
}).fetch();
}
return {
current_slide: currentSlide,
shapes: shapes,
};
};
export default {
getWhiteboardData,
};
import Presentations from '/imports/api/presentations';
import Shapes from '/imports/api/shapes';
import Slides from '/imports/api/slides';
let getWhiteboardData = () => {
let currentPresentation;
let currentSlide;
let presentationId;
let shapes;
let ref;
currentPresentation = Presentations.findOne({
'presentation.current': true,
});
if (currentPresentation != null) {
currentSlide = Slides.findOne({
presentationId: currentPresentation.presentation.id,
'slide.current': true,
});
}
if (currentSlide != null) {
shapes = Shapes.find({
whiteboardId: currentSlide.slide.id,
}).fetch();
}
return {
current_slide: currentSlide,
shapes: shapes,
};
};
export default {
getWhiteboardData,
};

View File

@ -1,33 +1,33 @@
import React, { PropTypes } from 'react';
import Ellipse from '../shapes/ellipse/component.jsx';
import Line from '../shapes/line/component.jsx';
import Poll from '../shapes/poll/component.jsx';
import Rectangle from '../shapes/rectangle/component.jsx';
import Text from '../shapes/text/component.jsx';
import Triangle from '../shapes/triangle/component.jsx';
import Pencil from '../shapes/pencil/component.jsx';
export default class WhiteboardShapeModel extends React.Component {
constructor(props) {
super(props);
}
render() {
var Component = this.props.shapes[this.props.shape.shape.shape_type];
return (
<Component />
);
}
}
WhiteboardShapeModel.defaultProps = {
shapes: {
ellipse: Ellipse,
line: Line,
poll: Poll,
rectangle: Rectangle,
text: Text,
triangle: Triangle,
pencil: Pencil,
},
};
import React, { PropTypes } from 'react';
import Ellipse from '../shapes/ellipse/component.jsx';
import Line from '../shapes/line/component.jsx';
import Poll from '../shapes/poll/component.jsx';
import Rectangle from '../shapes/rectangle/component.jsx';
import Text from '../shapes/text/component.jsx';
import Triangle from '../shapes/triangle/component.jsx';
import Pencil from '../shapes/pencil/component.jsx';
export default class WhiteboardShapeModel extends React.Component {
constructor(props) {
super(props);
}
render() {
var Component = this.props.shapes[this.props.shape.shape.shape_type];
return (
<Component />
);
}
}
WhiteboardShapeModel.defaultProps = {
shapes: {
ellipse: Ellipse,
line: Line,
poll: Poll,
rectangle: Rectangle,
text: Text,
triangle: Triangle,
pencil: Pencil,
},
};

View File

@ -1,27 +1,27 @@
import React, { PropTypes } from 'react';
export default class EllipseDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
// style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0);"
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
<ellipse
cx=""
cy=""
rx=""
ry=""
fill=""
stroke=""
stroke-width=""
style={style}
>
</ellipse>
);
}
}
import React, { PropTypes } from 'react';
export default class EllipseDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
// style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0);"
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
<ellipse
cx=""
cy=""
rx=""
ry=""
fill=""
stroke=""
stroke-width=""
style={style}
>
</ellipse>
);
}
}

View File

@ -1,26 +1,26 @@
import React, { PropTypes } from 'react';
export default class LineDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
//stroke and stroke-width might be inside of the style
<line
x1=""
y1=""
x2=""
y2=""
stroke=""
stroke-width=""
style={style}
/>
);
}
}
import React, { PropTypes } from 'react';
export default class LineDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
//stroke and stroke-width might be inside of the style
<line
x1=""
y1=""
x2=""
y2=""
stroke=""
stroke-width=""
style={style}
/>
);
}
}

View File

@ -1,28 +1,29 @@
import React, { PropTypes } from 'react';
export default class PencilDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
// this is how style might look like with Raphael:
// style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0); stroke-linejoin: round; stroke-linecap: round;">
var style = {
strokeLinejoin: 'round',
strokeLinecap: 'round',
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
<path
fill=""
stroke=""
d=""
strokeWidth=""
strokeLinejoin=""
strokeLinecap=""
style={style}>
</path>
);
}
}
import React, { PropTypes } from 'react';
export default class PencilDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
// this is how style might look like with Raphael:
// style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
//stroke-linejoin: round; stroke-linecap: round;">
var style = {
strokeLinejoin: 'round',
strokeLinecap: 'round',
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
<path
fill=""
stroke=""
d=""
strokeWidth=""
strokeLinejoin=""
strokeLinecap=""
style={style}>
</path>
);
}
}

View File

@ -1,14 +1,14 @@
import React, { PropTypes } from 'react';
export default class PollDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<g></g>
);
}
}
import React, { PropTypes } from 'react';
export default class PollDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<g></g>
);
}
}

View File

@ -1,31 +1,31 @@
import React, { PropTypes } from 'react';
export default class RectangleDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
//style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0);"
<rect
x=""
y=""
width=""
height=""
r=""
rx=""
ry=""
fill=""
stroke=""
stroke-width=""
style={style}
>
</rect>
);
}
}
import React, { PropTypes } from 'react';
export default class RectangleDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
//style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0);"
<rect
x=""
y=""
width=""
height=""
r=""
rx=""
ry=""
fill=""
stroke=""
stroke-width=""
style={style}
>
</rect>
);
}
}

View File

@ -1,35 +1,38 @@
import React, { PropTypes } from 'react';
export default class TextDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
// style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0); text-anchor: start; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; font-size: 20px; line-height: normal; font-family: Arial;"
<text
x=""
y=""
text-anchor=""
font=""
stroke=""
fill=""
style={style}
font-family=""
font-size=""
stroke-width=""
import React, { PropTypes } from 'react';
export default class TextDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
// style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
//text-anchor: start; font-style: normal; font-variant: normal;
//font-weight: normal; font-stretch: normal; font-size: 20px;
//line-height: normal; font-family: Arial;"
<text
x=""
y=""
text-anchor=""
font=""
stroke=""
fill=""
style={style}
font-family=""
font-size=""
stroke-width=""
>
<tspan
x=""
dy=""
>
<tspan
x=""
dy=""
>
</tspan>
</text>
);
}
}
</text>
);
}
}

View File

@ -1,26 +1,26 @@
import React, { PropTypes } from 'react';
export default class TriangleDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
//style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0); stroke-linejoin: round;"
<path
style={style}
fill=""
stroke=""
d=""
stroke-width=""
stroke-linejoin=""
>
</path>
);
}
}
import React, { PropTypes } from 'react';
export default class TriangleDrawComponent extends React.Component {
constructor(props) {
super(props);
}
render() {
var style = {
WebkitTapHighlightColor: 'rgba(0, 0, 0, 0)',
};
return (
//style="-webkit-tap-highlight-color: rgba(0, 0, 0, 0); stroke-linejoin: round;"
<path
style={style}
fill=""
stroke=""
d=""
stroke-width=""
stroke-linejoin=""
>
</path>
);
}
}

View File

@ -1,26 +1,26 @@
import React, { PropTypes } from 'react';
export default class Slide extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<g>
{this.props.current_slide ?
<image x="0" y="0"
width="1134" height="850.7076923076924"
preserveAspectRatio="none"
xlink="http://www.w3.org/1999/xlink"
xlinkHref={this.props.current_slide.slide.img_uri}
style={{ WebkitTapHighlightColor: 'transparent' }} //need to figure why we need this
stroke-width="0.8">
</image>
: null
}
</g>
);
}
}
import React, { PropTypes } from 'react';
export default class Slide extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<g>
{this.props.current_slide ?
<image x="0" y="0"
width="1134" height="850.7076923076924"
preserveAspectRatio="none"
xlink="http://www.w3.org/1999/xlink"
xlinkHref={this.props.current_slide.slide.img_uri}
style={{ WebkitTapHighlightColor: 'transparent' }} //need to figure why we need this
stroke-width="0.8">
</image>
: null
}
</g>
);
}
}