Skip to content

Commit a154db4

Browse files
committed
Merge branch 'master' of github.com:fullstackreact/30-days-of-react
* 'master' of github.com:fullstackreact/30-days-of-react: update day 5 capitalization fix capitalization error on day 5 Update doc.mkd
2 parents 01de99b + 355a551 commit a154db4

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

day-01/doc/doc.mkd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ Although it might look a little scary, the JavaScript code is a single line that
6666

6767
Unlike many of its predecessors, React operates not directly on the browser's Document Object Model (DOM) immediately, but on a **virtual DOM**. That is, rather than manipulating the `document` in a browser after changes to our data (which can be quite slow) it resolves changes in its virtual DOM. After the virtual DOM has been updated, React intelligently determines what changes to make to the actual DOM.
6868

69-
The [React Virtual DOM](https://facebook.github.io/react/docs/dom-differences.html) exists entirely in-memory and is a representation of the web browser's DOM. Because of this, we when we write a React component, we're not writing directly to the DOM, but we're writing a virtual component that React will turn into the DOM.
69+
The [React Virtual DOM](https://facebook.github.io/react/docs/dom-differences.html) exists entirely in-memory and is a representation of the web browser's DOM. Because of this, when we write a React component, we're not writing directly to the DOM, but we're writing a virtual component that React will turn into the DOM.
7070

7171
In the next article, we'll look at what this means for us as we build our React components and jump into JSX and writing our first real components.

day-05/doc/doc.mkd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ Pretty nifty, ey? Now we can reuse the `<Header />` component with a dynamic `ti
7878

7979
We can pass in more than just strings in a component. We can pass in numbers, strings, all sorts of objects, and even functions! We'll talk more about how to define these different properties so we can build a component api later.
8080

81-
Instead of statically setting the content and date
82-
Let's take the `Content` component and set the timeline content by a data variable instead of by text. Just like we can do with HTML components, we can pass multiple `props` into a component.
81+
Instead of statically setting the content and date let's take the `Content` component and set the timeline content by a data variable instead of by text. Just like we can do with HTML components, we can pass multiple `props` into a component.
8382

8483
Recall, yesterday we defined our `Content` container like this:
8584

day-05/post.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ Pretty nifty, ey? Now we can reuse the `<Header />` component with a dynamic `ti
125125

126126
We can pass in more than just strings in a component. We can pass in numbers, strings, all sorts of objects, and even functions! We'll talk more about how to define these different properties so we can build a component api later.
127127

128-
Instead of statically setting the content and date
129-
Let's take the `Content` component and set the timeline content by a data variable instead of by text. Just like we can do with HTML components, we can pass multiple `props` into a component.
128+
Instead of statically setting the content and date let's take the `Content` component and set the timeline content by a data variable instead of by text. Just like we can do with HTML components, we can pass multiple `props` into a component.
130129

131130
Recall, yesterday we defined our `Content` container like this:
132131

0 commit comments

Comments
 (0)