Commit 0644c97e authored by Sindre Sorhus's avatar Sindre Sorhus

Merge pull request #219 from stas/master

Update ember.js version, fix dependencies.
parents c3741e0f 9d03a924
......@@ -3,8 +3,8 @@ require.config({
baseUrl: 'js/',
paths: {
jquery: '../../../assets/jquery.min',
// ember: 'http://cloud.github.com/downloads/emberjs/ember.js/ember-latest.min',
ember: 'lib/ember-latest',
ember: 'lib/ember-latest.min',
handlebars: '../../../assets/handlebars.min',
text: 'lib/require/text',
jasmine: '../../../assets/jasmine/jasmine',
jasmine_html: '../../../assets/jasmine/jasmine-html'
......@@ -18,6 +18,7 @@ define( 'app', [
'app/controllers/entries',
'app/views/application',
'jquery',
'handlebars',
'ember'
], function( Router, Store, EntriesController, ApplicationView ) {
var App = Ember.Application.create({
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment