diff options
author | Samy Pesse <samypesse@gmail.com> | 2016-10-06 23:04:20 +0200 |
---|---|---|
committer | Samy Pesse <samypesse@gmail.com> | 2016-10-06 23:04:20 +0200 |
commit | 1d291ff2f057b3d4360d38b27c36e75eddeebb09 (patch) | |
tree | 3b6418bfe897a889e1fa7eb4d0e1a361b5caf14e /packages/gitbook-core | |
parent | 58ae96b7f6a5cd3b7c1fd1d650fcaae4686f578d (diff) | |
download | gitbook-1d291ff2f057b3d4360d38b27c36e75eddeebb09.zip gitbook-1d291ff2f057b3d4360d38b27c36e75eddeebb09.tar.gz gitbook-1d291ff2f057b3d4360d38b27c36e75eddeebb09.tar.bz2 |
Fix style of toolbar and add title to it
Diffstat (limited to 'packages/gitbook-core')
-rw-r--r-- | packages/gitbook-core/src/components/Link.js | 1 | ||||
-rw-r--r-- | packages/gitbook-core/src/models/File.js | 12 | ||||
-rw-r--r-- | packages/gitbook-core/src/models/Readme.js | 21 | ||||
-rw-r--r-- | packages/gitbook-core/src/reducers/readme.js | 20 | ||||
-rw-r--r-- | packages/gitbook-core/src/shapes/Readme.js | 11 | ||||
-rw-r--r-- | packages/gitbook-core/src/shapes/index.js | 1 |
6 files changed, 46 insertions, 20 deletions
diff --git a/packages/gitbook-core/src/components/Link.js b/packages/gitbook-core/src/components/Link.js index 145486e..65f4eb5 100644 --- a/packages/gitbook-core/src/components/Link.js +++ b/packages/gitbook-core/src/components/Link.js @@ -28,7 +28,6 @@ const Link = React.createClass({ } href = currentFile.relative(href); - return <a href={href} {...props}>{children}</a>; } }); diff --git a/packages/gitbook-core/src/models/File.js b/packages/gitbook-core/src/models/File.js index 88138c3..3ec6130 100644 --- a/packages/gitbook-core/src/models/File.js +++ b/packages/gitbook-core/src/models/File.js @@ -32,12 +32,22 @@ class File extends Record(DEFAULTS) { ); } + /** + * Return true if file is an instance of File + * @param {Mixed} file + * @return {Boolean} + */ static is(file) { return (file instanceof File); } + /** + * Create a file instance + * @param {Mixed|File} file + * @return {File} + */ static create(file) { - return file instanceof File ? + return File.is(file) ? file : new File(file); } } diff --git a/packages/gitbook-core/src/models/Readme.js b/packages/gitbook-core/src/models/Readme.js new file mode 100644 index 0000000..f275ca2 --- /dev/null +++ b/packages/gitbook-core/src/models/Readme.js @@ -0,0 +1,21 @@ +const { Record } = require('immutable'); +const File = require('./File'); + +const DEFAULTS = { + file: new File() +}; + +class Readme extends Record(DEFAULTS) { + constructor(state = {}) { + super({ + file: File.create(state.file) + }); + } + + static create(state) { + return state instanceof Readme ? + state : new Readme(state); + } +} + +module.exports = Readme; diff --git a/packages/gitbook-core/src/reducers/readme.js b/packages/gitbook-core/src/reducers/readme.js index d88f9ec..9e8656a 100644 --- a/packages/gitbook-core/src/reducers/readme.js +++ b/packages/gitbook-core/src/reducers/readme.js @@ -1,21 +1,5 @@ -const { Record } = require('immutable'); -const File = require('../models/file'); - -class ReadmeState extends Record({ - file: new File() -}) { - constructor(state = {}) { - super({ - file: new File(state.file) - }); - } - - static create(state) { - return state instanceof ReadmeState ? - state : new ReadmeState(state); - } -} +const Readme = require('../models/Readme'); module.exports = (state, action) => { - return ReadmeState.create(state); + return Readme.create(state); }; diff --git a/packages/gitbook-core/src/shapes/Readme.js b/packages/gitbook-core/src/shapes/Readme.js new file mode 100644 index 0000000..8414f05 --- /dev/null +++ b/packages/gitbook-core/src/shapes/Readme.js @@ -0,0 +1,11 @@ +const React = require('react'); + +const { + shape +} = React.PropTypes; + +const File = require('./File'); + +module.exports = shape({ + file: File.isRequired +}); diff --git a/packages/gitbook-core/src/shapes/index.js b/packages/gitbook-core/src/shapes/index.js index c372c25..b019756 100644 --- a/packages/gitbook-core/src/shapes/index.js +++ b/packages/gitbook-core/src/shapes/index.js @@ -8,6 +8,7 @@ module.exports = { Context: require('./Context'), Page: require('./Page'), File: require('./File'), + Readme: require('./Readme'), Summary: require('./Summary'), SummaryPart: require('./SummaryPart'), SummaryArticle: require('./SummaryArticle') |