Skip to content
This repository has been archived by the owner on May 14, 2019. It is now read-only.

Adding editorconfig and re-aligning code style with Modernizr #9

Merged
merged 1 commit into from
Aug 27, 2014

Conversation

ryanseddon
Copy link
Member

Fixes #8.

Converts tabs to 2 spaces and adds editorconfig make sure you add the plugin to your favourite editor so it picks up the defaults.

@@ -2,209 +2,209 @@ var AppDispatcher = require('../dispatcher/AppDispatcher');
var EventEmitter = require('events').EventEmitter;
var merge = require('react/lib/merge');
var MetadataStore = require('./Metadata');
var Fuse = require('../../../bower_components/fuse/src/fuse');
var Fuse = require('fuse');
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't supposed to make it in but it fixes the build from being broken. Webpack couldn't resolve that path and you've added bower_components to the moduleDirectories so webpacks require resolving algorithm will check there already.

@ryanseddon ryanseddon force-pushed the issue/8/tabs_be_gone branch from 31b053f to 6c7dbcd Compare August 27, 2014 01:47
@patrickkettner
Copy link
Member

looks good, assuming the fuse stuff dosen't break it.

@ryanseddon
Copy link
Member Author

I couldn't build with the previous fuse path, had to change it to what's in this PR to work.

@patrickkettner
Copy link
Member

hmm, thats a direct revert of @joecritch's c6476f7

@ryanseddon
Copy link
Member Author

ok I'll remove that and we can discuss in another pr

@ryanseddon ryanseddon force-pushed the issue/8/tabs_be_gone branch from 6c7dbcd to 79cf1ca Compare August 27, 2014 03:30
@ryanseddon
Copy link
Member Author

Reverted now this is straight formatting only

@patrickkettner
Copy link
Member

confirmed

patrickkettner added a commit that referenced this pull request Aug 27, 2014
Adding editorconfig and re-aligning code style with Modernizr
@patrickkettner patrickkettner merged commit a505bd1 into redesign Aug 27, 2014
@patrickkettner patrickkettner deleted the issue/8/tabs_be_gone branch August 27, 2014 03:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code style
2 participants