Skip to content
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

Two Fixes: Components Style, LiveScript #505

Closed
wants to merge 6 commits into from

Conversation

michael-brade
Copy link
Contributor

Hi Nate,

see the two commits for details. I thought components were supposed to load their styles, but they don't. This is now fixed. Also, I am writing my code in LiveScript, however, components didn't work without this patch.

Cheers, Michael

@enjalot
Copy link
Contributor

enjalot commented May 11, 2015

is there a reason so many of the commits in master are included in your PR? makes it very difficult to evaluate your changes.

@michael-brade
Copy link
Contributor Author

No, I have no idea why this happened. All I keep doing is

git pull upstream master
git pull
git push

But you can click on my two commits at the top to see the changes, they are very simple, just adding a few lines of code. It shouldn't have affected all the other commits.

@michael-brade michael-brade force-pushed the master branch 3 times, most recently from 3baf3b6 to 4fa6e7c Compare May 12, 2015 06:35
@michael-brade
Copy link
Contributor Author

Ok, finally fixed it with --force. The last git pull messed it up for some reason.

@minicuper
Copy link
Contributor

"Separate style files" for components doesn't fit for stylus. We've discussed the issue somewhere.

@minicuper
Copy link
Contributor

I've found. It's here - #477

@michael-brade
Copy link
Contributor Author

I see, I missed that plugin (I am using sass, btw). But if you cannot merge it, shouldn't the docs be updated then? See http://derbyjs.com/docs/derby-0.6/components/structure, it mentions Controller.prototype.style, which won't work.

- typeof null === 'object', so check for null
- put LiveScript detection into its own function
specify the style file with component.prototype.style
usage:
   MyComponent.prototype.name = 'maincomponent'
   MyComponent.prototype.components = [require('subcomponent')]

result:
   maincomponent
   maincomponent:subcomponent
@michael-brade
Copy link
Contributor Author

I close this pr since it used the master branch, which was a bad idea, and there is no way to change the branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants