Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Rename module.toJSON to module.serialize. Add `inflatable` flag to exclude fmids where desired. Resolves #54 and resolves #55. #56

Open
wants to merge 7 commits into from

5 participants

@georgecrawford
Collaborator

No description provided.

@coveralls

Coverage Status

Coverage remained the same when pulling 2b2b81e on toJSONFixes into 446522b on master.

docs/api.md
((13 lines not shown))
to inflate serverside rendered
views.
+\nOptions:
@rowanbeentje Owner

There seem to be a few of these \n gremlins in the docs... is something supposed to convert them to newlines?

@georgecrawford Collaborator

Fixed in adf5c1d

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
examples/express/build/build.css
@@ -1,8 +1 @@
-/*=========================================================================
- Module Apple
- ========================================================================== */
-.module-apple {
- padding: 14px; }
-
-.module-apple_title {
- font: 30px 'Helvetica'; }
+ERROR: Cannot load compass.
@rowanbeentje Owner

Hmm :)

@georgecrawford Collaborator

Fixed in b5a55db

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@matthew-andrews matthew-andrews commented on the diff
build/fruitmachine.js
@@ -547,8 +547,8 @@ module.exports = function(fm) {
this._id = options.id || util.uniqueId();
this._fmid = options.fmid || util.uniqueId('fmid');
this.tag = options.tag || this.tag || 'div';
- this.classes = this.classes || options.classes || [];
- this.helpers = this.helpers || options.helpers || [];
+ this.classes = options.classes || this.classes || [];
+ this.helpers = options.helpers || this.helpers || [];
@matthew-andrews Owner

Regression test please :trollface:

@georgecrawford Collaborator

@matthew-andrews - this change wasn't done by me, but was generated on build. So I assume someone else understands it. I have no knowledge of this part of the code.

@matthew-andrews Owner

@wilsonpage Would you object to removing the built javascript from the repo and providing a link to Browserify CDN built version of fruitmachine in the readme instead?

That way we don't ever need to worry about building before committing and tagging again.

@matthew-andrews Owner

OK. I'm on it.

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

Coverage Status

Coverage remained the same when pulling b5a55db on toJSONFixes into 446522b on master.

@coveralls

Coverage Status

Coverage remained the same when pulling adf5c1d on toJSONFixes into 446522b on master.

@matthew-andrews matthew-andrews commented on the diff
docs/templates/readme.hogan
@@ -1,4 +1,4 @@
-# {{pkg.title}} [![Build Status](https://travis-ci.org/ftlabs/fruitmachine.png?branch=master)](https://travis-ci.org/ftlabs/fruitmachine)
+# {{pkg.title}} [![Build Status](https://travis-ci.org/ftlabs/fruitmachine.png?branch=master)](https://travis-ci.org/ftlabs/fruitmachine) [![Coverage Status](https://coveralls.io/repos/ftlabs/fruitmachine/badge.png?branch=master)](https://coveralls.io/r/ftlabs/fruitmachine?branch=master) [![Dependency Status](https://gemnasium.com/ftlabs/fruitmachine.png)](https://gemnasium.com/ftlabs/fruitmachine)
@matthew-andrews Owner

I think coveralls is broken atm (causes travis to fail) - we should check this before adding the badge back again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 19, 2013
  1. Added some missing tests for toJSON

    George Crawford authored
  2. Rename module.toJSON to module.serialize, as it doesn't actually retu…

    George Crawford authored
    …rn a JSON string. Some work still to do to remove reference to the old name.
Commits on Dec 20, 2013
  1. Seems to match the current compiled README

    George Crawford authored
  2. Rename module.toJSON to module.serialize

    George Crawford authored
  3. Fix missing compass warning, delete Sass cache files

    George Crawford authored
  4. Remove newline gremlins from docs

    George Crawford authored
Something went wrong with that request. Please try again.