New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merges master into minor #1805

Closed
wants to merge 353 commits into
base: master
from

Conversation

Projects
None yet
7 participants
@justinbmeyer
Contributor

justinbmeyer commented Jul 27, 2015

For #1650 cc @daffl

@daffl

This comment has been minimized.

Show comment
Hide comment
@daffl

daffl May 27, 2015

Contributor

We used the global reference for a reason (mainly to get the AMD and standalone tests working - which they don't after this change).

Contributor

daffl commented on component/component_test.js in 42bd016 May 27, 2015

We used the global reference for a reason (mainly to get the AMD and standalone tests working - which they don't after this change).

This comment has been minimized.

Show comment
Hide comment
@matthewp

matthewp May 27, 2015

Contributor

Oh, I noticed an error in the YUI tests without this.

Contributor

matthewp replied May 27, 2015

Oh, I noticed an error in the YUI tests without this.

This comment has been minimized.

Show comment
Hide comment
@daffl

daffl May 27, 2015

Contributor

I fixed that one via e6bf709#diff-5b983ae053f29eb2987a13aaa76e31ebR10. Can I change it back to the global?

Contributor

daffl replied May 27, 2015

I fixed that one via e6bf709#diff-5b983ae053f29eb2987a13aaa76e31ebR10. Can I change it back to the global?

This comment has been minimized.

Show comment
Hide comment
@matthewp

matthewp May 28, 2015

Contributor

Yeah go ahead, I'll just be careful about pushing stuff to this branch since it's not passing yet.

Contributor

matthewp replied May 28, 2015

Yeah go ahead, I'll just be careful about pushing stuff to this branch since it's not passing yet.

daffl and others added some commits May 27, 2015

Update can-simple-dom to 0.2.7
Now you don't have to use the .default property.
Partials will work with renderers in the scope
This makes it so that a renderer in the scope can initially be `null`
(which will happen if using #references) and the partial renderer will
recompute after the renderer is in the scope.
Allow importing a template and using as partial
This enables the syntax:

```html
<can-import from="other.stache!" #other="{value}"/>

{{> other}}
```
Merge pull request #1717 from bitovi/rebase-pmo2
Virtual DOM and place-my-order functionality
Set the promise value when using can-tag
This updates can/view/import to set the `value` property on the
can-import viewModel after the promise has resolved when used with
can-tag. The reason this is needed is because when handing off control
to a can.Component there will be a new viewModel created for that
element. So we need to set the import value so that it can be used by
the can-tag (or within the template as a reference value).
Merge pull request #1723 from bitovi/import-partial
Allow importing a template and using as partial

joe-crick and others added some commits Jul 12, 2015

Change Page Title
This page works with Stache Templates. Views are not mentioned.
Remove information on can.compute
This is a better fit for the API or a more advanced article. We don't use computes in the sample application.
Reorganize the order of items
Place serialization last.
Add more examples and explanation
Add more code examples, close to the text, and more explanation.
Add more code examples
Add example closer to relevant text
Minor edits
Make chapter code download more obvious.
Remove hyperlink
Remove hyperlink to PlaceMyOrder.com, which is a DoneJS site.
can.fixture section
Add a small section for can.fixture, and a UL overview of the deps section
Use NodeList.prototype.item to get a childNode
Instead of:

```js
var node = parent.childNodes[0];
```

we always need to do:

```js
var node = parent.childNodes.item(0);
```

To support the virtual DOM environment.
Allow loading in a web worker
To make it possible for can to be loaded in a Web Worker we need to set
can.global to the correct object, `self` and use it in can/util/vdom.
Merge pull request #1788 from bitovi/vdom-entities
Use NodeList.prototype.item to get a childNode
Merge pull request #1726 from bitovi/import-as
Revert "Use [.] to represent a template's viewModel"
Allow CanJS to run in a web worker.
This fixes CanJS so that it can be ran in a Web Worker context. The key
changes:

* Added a `can.isWebWorker` so that we can call `setState()` in can.route.
* can.route looks for `can.route.location` first when updating the state, because in Worker Rendering we set a can.route.location.
Merge pull request #1793 from bitovi/worker
Allow CanJS to run in a web worker.
Shim window.history when in vdom environment.
This shims window.history when operating in a vdom environment so that
can/route/pushstate will load. It's up to other libraries to provide the
functionality of pushState/replaceState.
Merge pull request #1798 from bitovi/shim-history
Shim window.history when in vdom environment.

@justinbmeyer justinbmeyer added this to the 2.3.0 milestone Jul 27, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment