Commit 6251179c authored by Cory Forsyth's avatar Cory Forsyth

Update to Ember 1.5.0-beta.4, updates ember-data also

  * ember 1.5.0-beta.4
  * ember-data 1.0.0-beta.7
  * jquery 2.1.0
  * All tests pass: http://monosnap.com/image/Li8mF3s891Zkoo76yV46BbAqFjs77O
parent a0940ac1
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
"todomvc-common": "~0.1.4", "todomvc-common": "~0.1.4",
"jquery": "~2.1.0", "jquery": "~2.1.0",
"handlebars": "~1.3.0", "handlebars": "~1.3.0",
"ember": "~1.3.1", "ember": "~1.5.0",
"ember-data": "1.0.0-beta.6", "ember-data": "1.0.0-beta.7",
"ember-localstorage-adapter": "latest" "ember-localstorage-adapter": "latest"
} }
} }
...@@ -57,11 +57,15 @@ ...@@ -57,11 +57,15 @@
<a href="http://github.com/tomdale">Tom Dale</a>, <a href="http://github.com/tomdale">Tom Dale</a>,
<a href="http://github.com/addyosmani">Addy Osmani</a> <a href="http://github.com/addyosmani">Addy Osmani</a>
</p> </p>
<p>
Updated by
<a href="http://github.com/bantic">Cory Forsyth</a>
</p>
<p>Part of <a href="http://todomvc.com">TodoMVC</a></p> <p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
</footer> </footer>
</script> </script>
<script src="bower_components/todomvc-common/base.js"></script> <script src="bower_components/todomvc-common/base.js"></script>
<script src="bower_components/jquery/jquery.js"></script> <script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/handlebars/handlebars.js"></script> <script src="bower_components/handlebars/handlebars.js"></script>
<script src="bower_components/ember/ember.js"></script> <script src="bower_components/ember/ember.js"></script>
<script src="bower_components/ember-data/ember-data.js"></script> <script src="bower_components/ember-data/ember-data.js"></script>
......
/*global Todos, Ember */ /*global Ember */
(function () { (function () {
'use strict'; 'use strict';
Ember.Handlebars.helper('pluralize', function (singular, count) { Ember.Handlebars.helper('pluralize', function (singular, count) {
/* From Ember-Data */ /* From Ember-Data */
var inflector = new Ember.Inflector(Ember.Inflector.defaultRules); var inflector = Ember.Inflector.inflector;
return count === 1 ? singular : inflector.pluralize(singular); return count === 1 ? singular : inflector.pluralize(singular);
}); });
......
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