Skip to content

Commit

Permalink
wooo
Browse files Browse the repository at this point in the history
  • Loading branch information
gpoitch committed Aug 14, 2014
1 parent ac7b1f0 commit c74e6a2
Show file tree
Hide file tree
Showing 17 changed files with 586 additions and 2,653 deletions.
38 changes: 27 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,35 @@
lib-cov
lcov.info
*.seed
# Logs
logs
*.log
*.csv
*.dat
*.out
*.pid
*.gz

# Runtime data
pids
logs
results
build
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Commenting this out is preferred by some people, see
# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules
bower_components

# Users Environment Variables
.lock-wscript

# OS
.DS_Store

# Builds
export.sh
4 changes: 3 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,7 @@
// These options pre-define global variables specific
// to your app that hang off `window`.

"predef": []
"predef": [
"define" // amd loader
]
}
10 changes: 3 additions & 7 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,20 +66,16 @@ <h3>Keyboard shortcuts:</h3>
</div>
</div>

<!-- Include if you want image embeds to upload to Amazon S3 -->
<script src="../ext/xhr-file-uploader.js"></script>
<!-- Include JS Module Loader -->
<!-- Include ContentKit JS -->
<script src="../ext/loader.js"></script>
<!-- Include Editor JS (content-kit-editor.js) -->
<script src="../dist/content-kit-editor.js"></script>
<script>window.ContentKit = require('content-kit')['default'];</script>

<script>
// Load the ContentKit Module
window.ContentKit = require('content-kit')['default'];

// Initializes a new Editor
var editor = new ContentKit.Editor('.editor', {
imageServiceUrl: 'http://localhost:5000/upload',
embedServiceUrl: 'http://localhost:5000/embed',
compiler: new ContentKit.Compiler({
includeTypeNames: true // outputs type names for easier debugging
})
Expand Down
Loading

0 comments on commit c74e6a2

Please sign in to comment.