Skip to content
This repository has been archived by the owner on Jun 15, 2021. It is now read-only.

update "scribe-common" includes to include "src" #217

Merged
merged 4 commits into from
Jul 16, 2014

Conversation

TooTallNate
Copy link
Contributor

This syntax is compatible with CommonJS as well as RequireJS.

As described in: http://git.io/CGL0Lg

@TooTallNate
Copy link
Contributor Author

Added bonus: in 53bf24f I removed the src/api/element.js file since it was virtually identical to the one that scribe-common provides.

@OliverJAsh
Copy link
Contributor

@TooTallNate
Copy link
Contributor Author

@OliverJAsh Ok, updated the tests and example as well.

@hmgibson23
Copy link
Contributor

Merge conflict!

This syntax is compatible with CommonJS as well as RequireJS.

As described in: http://git.io/CGL0Lg
Now we can remove the `src/api/element.js` file since
"scribe-common" offers the exact same helper functions.
@TooTallNate
Copy link
Contributor Author

@hmgibson23 Rebased. Hopefully we can get this merged before another trivial styling commit creates a new conflict 😉

@hmgibson23
Copy link
Contributor

Great - 👍 from me. I'll just wait for @OliverJAsh to take a look and approve.

@OliverJAsh
Copy link
Contributor

@hmgibson23 Would you mind checking this PR out and making sure the tests still run? Travis builds still fail for foreign PRs.

@hmgibson23
Copy link
Contributor

All tests working in both Chrome and Firefox

@OliverJAsh
Copy link
Contributor

👍

1 similar comment
@timwardle
Copy link

+1

hmgibson23 pushed a commit that referenced this pull request Jul 16, 2014
update "scribe-common" includes to include "src"
@hmgibson23 hmgibson23 merged commit ced7ac0 into guardian:master Jul 16, 2014
@TooTallNate TooTallNate deleted the update/scribe-common-src-path branch July 16, 2014 15:47
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.

4 participants