Skip to content

Commit

Permalink
Merge pull request #2772 from coursemology-collab/jeremyyap/upgrade-f…
Browse files Browse the repository at this point in the history 
…rontend

Upgrade frontend dependencies
  • Loading branch information
@kxmbrian
kxmbrian committed Jan 22, 2018
2 parents a16e9e5 + dba42b3 commit 758bd75
Show file tree
Hide file tree
Showing 9 changed files with 927 additions and 256 deletions.
2 changes: 1 addition & 1 deletion client/app/bundles/course/achievement/pages/AchievementEdit/__test__/index.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('<AchievementEdit />', () => {
formData.append('achievement[title]', newTitle);
formData.append('achievement[description]', 'Awesome achievement');
formData.append('achievement[published]', false);
formData.append('achievement[badge]', '');
formData.append('achievement[badge]', undefined);
expect(spy).toHaveBeenCalledWith(id, formData);
});
});
4 changes: 2 additions & 2 deletions client/app/bundles/course/lesson-plan/containers/LessonPlanFilter/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class LessonPlanFilter extends React.Component {
};
}

handleTouchTap = (event) => {
handleClick = (event) => {
// This prevents ghost click.
event.preventDefault();

Expand All @@ -57,7 +57,7 @@ class LessonPlanFilter extends React.Component {
<div>
<RaisedButton
secondary
onClick={this.handleTouchTap}
onClick={this.handleClick}
label={<FormattedMessage {...translations.filter} />}
labelPosition="before"
icon={<KeyboardArrowUp />}
Expand Down
8 changes: 4 additions & 4 deletions client/app/bundles/course/lesson-plan/containers/LessonPlanNav/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { defineMessages, FormattedMessage } from 'react-intl';
import { scroller, Helpers } from 'react-scroll';
import { scroller, ScrollLink } from 'react-scroll';
import RaisedButton from 'material-ui/RaisedButton';
import Popover from 'material-ui/Popover';
import Menu from 'material-ui/Menu';
Expand Down Expand Up @@ -39,7 +39,7 @@ class LessonPlanNav extends React.Component {
};
}

handleTouchTap = (event) => {
handleClick = (event) => {
// This prevents ghost click.
event.preventDefault();

Expand All @@ -66,7 +66,7 @@ class LessonPlanNav extends React.Component {
*/
renderScrollSpies() {
const { groups } = this.props;
const ScrollSpy = Helpers.Scroll('span'); // eslint-disable-line new-cap
const ScrollSpy = ScrollLink('span');

return (
<span>
Expand Down Expand Up @@ -98,7 +98,7 @@ class LessonPlanNav extends React.Component {
{ this.renderScrollSpies() }
<RaisedButton
secondary
onClick={this.handleTouchTap}
onClick={this.handleClick}
label={this.state.text}
labelPosition="before"
icon={<KeyboardArrowUp />}
Expand Down
2 changes: 1 addition & 1 deletion client/app/bundles/course/survey/containers/SurveyLayout/__test__/index.test.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('<SurveyLayout />', () => {
buildContextOptions(store)
);

surveyLayout.find('TitleBar').prop('onLeftIconButtonTouchTap')();
surveyLayout.find('TitleBar').prop('onLeftIconButtonClick')();
expect(spyHistoryPush).toHaveBeenCalledWith(`/courses/${courseId}/surveys`);
});
});
2 changes: 1 addition & 1 deletion client/app/bundles/course/survey/containers/SurveyLayout/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class SurveyLayout extends React.Component {
title={survey.title}
iconElementRight={showAdminMenu ? <AdminMenu {...{ survey, surveyId }} /> : null}
iconElementLeft={<IconButton><ArrowBack /></IconButton>}
onLeftIconButtonTouchTap={() => history.push(backLocation)}
onLeftIconButtonClick={() => history.push(backLocation)}
/>
);
}
Expand Down
2 changes: 1 addition & 1 deletion client/app/lib/components/ChipInput.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class ChipInput extends React.Component {
}
};

this.autoComplete.handleItemTouchTap = (event, child) => {
this.autoComplete.handleItemClick = (event, child) => {
const index = parseInt(child.key, 10);
const chosenRequest = dataSource[index];
this.handleAddChip(chosenRequest);
Expand Down
4 changes: 2 additions & 2 deletions client/app/lib/components/Thumbnail.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class Thumbnail extends React.PureComponent {
objectFit: 'contain',
};

const onThumbnailTouchTap = onClick && typeof (onClick) === 'function' ?
const onThumbnailClick = onClick && typeof (onClick) === 'function' ?
(event) => {
onClick(event);
this.setState({ open: true });
Expand All @@ -86,7 +86,7 @@ class Thumbnail extends React.PureComponent {
return (
<div style={rootStyle}>
<div style={containerStyle}>
<a onClick={onThumbnailTouchTap}>
<a onClick={onThumbnailClick}>
<img
src={source}
alt={altText}
Expand Down
52 changes: 27 additions & 25 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
"jsx",
"json"
],
"setupFiles": [ "<rootDir>/app/__test__/requestAnimationFrame.js"],
"setupFiles": [
"<rootDir>/app/__test__/requestAnimationFrame.js"
],
"setupTestFrameworkScriptFile": "<rootDir>/app/__test__/setup.js",
"snapshotSerializers": [
"<rootDir>/node_modules/enzyme-to-json/serializer"
Expand Down Expand Up @@ -65,73 +67,73 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-runtime": "^6.6.1",
"brace": "^0.10.0",
"css-loader": "^0.28.2",
"brace": "^0.11.0",
"css-loader": "^0.28.9",
"enzyme-adapter-react-15": "^1.0.5",
"enzyme-adapter-react-16": "^1.1.1",
"expose-loader": "^0.7.3",
"fabric": "1.7.19",
"expose-loader": "^0.7.4",
"fabric": "1.7.22",
"glob": "^7.1.2",
"history": "^4.6.1",
"immutable": "^3.8.1",
"intl": "^1.2.5",
"jquery": "2.2.4",
"jquery-ui": "^1.12.1",
"json-loader": "^0.5.4",
"material-ui": "^0.19.4",
"material-ui": "^0.20.0",
"mirror-creator": "1.1.0",
"mkdirp": "^0.5.1",
"moment": "^2.19.2",
"moment": "^2.20.1",
"moment-timezone": "^0.5.13",
"node-sass": "^4.6.1",
"node-sass": "^4.7.2",
"prop-types": "^15.5.10",
"rc-slider": "^8.3.1",
"rc-slider": "^8.6.0",
"react": "^16.2.0",
"react-ace": "^5.5.0",
"react-ace": "^5.9.0",
"react-color": "^2.13.1",
"react-dnd": "^2.4.0",
"react-dnd-html5-backend": "^2.4.1",
"react-dom": "^16.2.0",
"react-dropzone": "^4.2.1",
"react-dropzone": "^4.2.5",
"react-intl": "^2.3.0",
"react-overlays": "^0.8.3",
"react-player": "^0.25.3",
"react-player": "^1.1.1",
"react-redux": "^5.0.5",
"react-router": "^4.1.1",
"react-router-dom": "^4.1.1",
"react-scroll": "^1.5.2",
"react-scroll": "^1.7.6",
"react-summernote": "^2.0.0",
"react-tooltip": "^3.3.0",
"redux": "^3.3.1",
"redux-form": "^7.1.2",
"redux-form": "^7.2.1",
"redux-immutable": "^4.0.0",
"redux-promise": "^0.5.3",
"redux-thunk": "^2.0.1",
"reselect": "^3.0.1",
"sass-loader": "^6.0.5",
"script-loader": "^0.7.0",
"style-loader": "^0.19.0",
"style-loader": "^0.19.1",
"webfontloader": "^1.6.27",
"webpack": "^3.8.1",
"webpack": "^3.10.0",
"webpack-manifest-plugin": "^1.3.1"
},
"devDependencies": {
"axios-mock-adapter": "^1.8.1",
"babel-eslint": "^8.0.1",
"axios-mock-adapter": "^1.11.0",
"babel-eslint": "^8.2.1",
"babel-jest": "^21.2.0",
"enzyme": "^3.2.0",
"enzyme-to-json": "^3.2.2",
"eslint": "^4.11.0",
"enzyme": "^3.3.0",
"enzyme-to-json": "^3.3.0",
"eslint": "^4.15.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-import-resolver-webpack": "^0.8.1",
"eslint-import-resolver-webpack": "^0.8.4",
"eslint-plugin-import": "^2.0.1",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.0.1",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.5.1",
"jest": "^21.2.1",
"react-dnd-test-backend": "^2.4.0",
"react-test-renderer": "^16.2.0",
"redux-logger": "^3.0.6",
"webpack-dev-server": "^2.4.5"
"webpack-dev-server": "^2.11.0"
},
"license": "MIT",
"repository": "git+https://github.com/Coursemology/coursemology2.git",
Expand Down
Loading

0 comments on commit 758bd75

Please sign in to comment.