Skip to content

Commit

Permalink
Use the migrated react-bootstrap-datetimepicker and react-bootstrap-t…
Browse files Browse the repository at this point in the history
…ypeahead.
  • Loading branch information
ledsoft committed Feb 3, 2017
1 parent 0a95a74 commit 3ce013e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"object-assign": "^4.1.0",
"jsonld": "^0.4.6",
"moment": "^2.14.1",
"kbss-react-bootstrap-datetimepicker": "https://dev.inbas.cz/dist/kbss-react-bootstrap-datetimepicker-0.0.5.tgz",
"react-bootstrap-typeahead": "https://dev.inbas.cz/dist/react-bootstrap-typeahead-0.0.9.tgz",
"react-bootstrap-datetimepicker": "https://kbss.felk.cvut.cz/dist/react-bootstrap-datetimepicker-0.0.5.tgz",
"react-bootstrap-typeahead": "https://kbss.felk.cvut.cz/dist/react-bootstrap-typeahead-0.0.10.tgz",
"jsonld-utils": "https://kbss.felk.cvut.cz/dist/jsonld-utils-0.0.3.tgz",
"inputmask-core": "^2.1.1",
"babel-runtime": "^6.9.2"
Expand All @@ -53,9 +53,9 @@
"babelify": "^7.2.0",
"browserify": "^13.0.0",
"lodash": "^4.11.1",
"react": "^15.0.1",
"react-addons-test-utils": "^15.3.2",
"react-dom": "^15.3.2",
"react": "~15.3.2",
"react-addons-test-utils": "~15.3.2",
"react-dom": "~15.3.2",
"react-tools": "^0.13.3",
"watchify": "^3.7.0",
"webpack": "^1.12.15",
Expand Down
2 changes: 1 addition & 1 deletion src/components/answer/DateTimeAnswer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React from "react";
import moment from "moment";
import DateTimePicker from "kbss-react-bootstrap-datetimepicker";
import DateTimePicker from "react-bootstrap-datetimepicker";
import Constants from '../../constants/Constants';
import Utils from "../../util/Utils";

Expand Down
2 changes: 1 addition & 1 deletion src/util/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default class Utils {
/**
* Resolves mode for the date time picker.
* @param question Question specifying the mode
* @return {*} mode for kbss-react-bootstrap-datetimepicker
* @return {*} mode for react-bootstrap-datetimepicker
*/
static resolveDateTimeMode(question) {
if (FormUtils.isDateTime(question)) {
Expand Down
8 changes: 4 additions & 4 deletions test/__tests__/AnswerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ describe('Answer component', () => {
question[Constants.LAYOUT_CLASS].push(Constants.LAYOUT.DATE);
var component = Environment.render(<Answer answer={answer} question={question} onChange={onChange}/>),

picker = TestUtils.findRenderedComponentWithType(component, require('kbss-react-bootstrap-datetimepicker').default);
picker = TestUtils.findRenderedComponentWithType(component, require('react-bootstrap-datetimepicker').default);
expect(picker).not.toBeNull();
expect(picker.props.mode).toEqual('date');
expect(picker.props.dateTime).toEqual(value);
Expand All @@ -136,7 +136,7 @@ describe('Answer component', () => {
question[Constants.LAYOUT_CLASS].push(Constants.LAYOUT.TIME);
var component = Environment.render(<Answer answer={answer} question={question} onChange={onChange}/>),

picker = TestUtils.findRenderedComponentWithType(component, require('kbss-react-bootstrap-datetimepicker').default);
picker = TestUtils.findRenderedComponentWithType(component, require('react-bootstrap-datetimepicker').default);
expect(picker).not.toBeNull();
expect(picker.props.mode).toEqual('time');
expect(picker.props.dateTime).toEqual(value);
Expand All @@ -151,7 +151,7 @@ describe('Answer component', () => {
question[Constants.LAYOUT_CLASS].push(Constants.LAYOUT.DATETIME);
var component = Environment.render(<Answer answer={answer} question={question} onChange={onChange}/>),

picker = TestUtils.findRenderedComponentWithType(component, require('kbss-react-bootstrap-datetimepicker').default);
picker = TestUtils.findRenderedComponentWithType(component, require('react-bootstrap-datetimepicker').default);
expect(picker).not.toBeNull();
expect(picker.props.mode).toEqual('datetime');
expect(picker.props.dateTime).toEqual(value);
Expand All @@ -167,7 +167,7 @@ describe('Answer component', () => {
question[Constants.LAYOUT_CLASS].push(Constants.LAYOUT.DATETIME);
var component = Environment.render(<Answer answer={answer} question={question} onChange={onChange}/>),

picker = TestUtils.findRenderedComponentWithType(component, require('kbss-react-bootstrap-datetimepicker').default);
picker = TestUtils.findRenderedComponentWithType(component, require('react-bootstrap-datetimepicker').default);
expect(picker).not.toBeNull();
expect(picker.props.mode).toEqual('datetime');
expect(picker.props.dateTime).toEqual(value);
Expand Down

0 comments on commit 3ce013e

Please sign in to comment.