Skip to content

Commit

Permalink
Merge pull request #20 from elwayman02/fix-dates
Browse files Browse the repository at this point in the history
Fix date parsing in Firefox and other browsers that aren't as flexibl…
  • Loading branch information
elwayman02 committed Aug 31, 2015
2 parents ef96996 + 618d288 commit cf26014
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ cache:

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

Expand Down
2 changes: 1 addition & 1 deletion addon/models/tumblr-post.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default DS.Model.extend({
post_url: attr('string'),
type: attr('string'),
timestamp: attr('number'),
date: attr('string'),
date: attr('date'),
format: attr('string'),
reblog_key: attr('string'),
// tags
Expand Down
1 change: 1 addition & 0 deletions addon/serializers/tumblr-post.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export default DS.RESTSerializer.extend({
normalizePayload(payload) {
if (payload.response && payload.response.posts) {
const posts = payload.response.posts.map(function (post) {
post.date = new Date().toDateString(post.date);
delete post.tags;
return post;
});
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "ember-tumblr",
"dependencies": {
"ember": "1.13.8",
"ember": "1.13.9",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "0.2.0",
"ember-data": "1.0.0-beta.18",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.9",
"ember-qunit": "0.4.10",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"jquery": "~2.1.4",
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-tumblr",
"version": "0.6.0",
"version": "0.6.1",
"description": "Ember Addon for integrating a Tumblr blog",
"directories": {
"doc": "doc",
Expand All @@ -9,8 +9,7 @@
"scripts": {
"start": "ember server",
"build": "ember build",
"test": "ember test",
"testall": "ember try:testall"
"test": "ember try:testall"
},
"repository": {
"type": "git",
Expand All @@ -27,7 +26,7 @@
"devDependencies": {
"broccoli-asset-rev": "~2.1.2",
"ember-cli": "1.13.8",
"ember-cli-app-version": "0.5.0",
"ember-cli-app-version": "1.0.0",
"ember-cli-dependency-checker": "~1.0.1",
"ember-cli-deprecation-workflow": "0.1.4",
"ember-cli-ic-ajax": "0.2.1",
Expand All @@ -48,7 +47,7 @@
],
"dependencies": {
"ember-cli-babel": "~5.1.3",
"ember-cli-htmlbars": "0.7.9"
"ember-cli-htmlbars": "1.0.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down

0 comments on commit cf26014

Please sign in to comment.