From 7882a4e1f3aa60ea622a55710f1d09d3721b95b2 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Wed, 6 May 2015 21:12:58 -0700 Subject: [PATCH 01/64] update ember-app --- .editorconfig | 3 ++- .jshintrc | 16 +++++------ app/controllers/crate/index.js | 7 ++--- app/helpers/date-long.js | 1 + app/helpers/date-small.js | 1 + app/helpers/from-now.js | 1 + app/index.html | 11 +++----- app/initializers/google.js | 2 +- app/templates/application.hbs | 4 +-- app/templates/me/index.hbs | 2 +- bower.json | 26 +++++++++--------- package.json | 23 +++++++++------- public/robots.txt | 3 +-- testem.json | 2 +- tests/.jshintrc | 24 ----------------- tests/helpers/start-app.js | 18 +++++-------- tests/index.html | 35 +++++++------------------ tests/test-helper.js | 9 ------- tests/unit/helpers/date-long-test.js | 8 +++--- tests/unit/helpers/date-small-test.js | 11 ++++---- tests/unit/helpers/format-email-test.js | 2 ++ tests/unit/helpers/format-num-test.js | 2 ++ tests/unit/mixins/pagination-test.js | 6 +++-- 23 files changed, 86 insertions(+), 131 deletions(-) diff --git a/.editorconfig b/.editorconfig index 5d5dea4ccc8..47c5438403c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,6 +18,7 @@ indent_style = space indent_size = 2 [*.hbs] +insert_final_newline = false indent_style = space indent_size = 2 @@ -29,5 +30,5 @@ indent_size = 2 indent_style = space indent_size = 2 -[*.md] +[*.{diff,md}] trim_trailing_whitespace = false diff --git a/.jshintrc b/.jshintrc index 07ba69595b8..08096effaab 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,13 +1,11 @@ { - "predef": { - "document": true, - "window": true, - "-Promise": true, - "moment": true, - "google": true - }, - "browser" : true, - "boss" : true, + "predef": [ + "document", + "window", + "-Promise" + ], + "browser": true, + "boss": true, "curly": true, "debug": false, "devel": true, diff --git a/app/controllers/crate/index.js b/app/controllers/crate/index.js index 225a9a11255..c876a13e595 100644 --- a/app/controllers/crate/index.js +++ b/app/controllers/crate/index.js @@ -1,6 +1,7 @@ import Ember from 'ember'; import DS from 'ember-data'; import ajax from 'ic-ajax'; +import moment from 'moment'; var NUM_VERSIONS = 5; @@ -194,9 +195,9 @@ export default Ember.ObjectController.extend({ } else { Ember.$('.graph').show(); } - var myData = google.visualization.arrayToDataTable(data); + var myData = window.google.visualization.arrayToDataTable(data); - var fmt = new google.visualization.DateFormat({ + var fmt = new window.google.visualization.DateFormat({ pattern: 'LLL d, yyyy', }); fmt.format(myData, 0); @@ -204,7 +205,7 @@ export default Ember.ObjectController.extend({ if (!el) { return; } - var chart = new google.visualization.AreaChart(el); + var chart = new window.google.visualization.AreaChart(el); chart.draw(myData, { chartArea: {'width': '80%', 'height': '80%'}, hAxis: { diff --git a/app/helpers/date-long.js b/app/helpers/date-long.js index 4206102fdb2..f1432f2172b 100644 --- a/app/helpers/date-long.js +++ b/app/helpers/date-long.js @@ -1,4 +1,5 @@ import Ember from 'ember'; +import moment from 'moment'; function dateLong(value) { return moment(value).format('LL'); diff --git a/app/helpers/date-small.js b/app/helpers/date-small.js index 7f2c28fc011..8db1fe64da0 100644 --- a/app/helpers/date-small.js +++ b/app/helpers/date-small.js @@ -1,4 +1,5 @@ import Ember from 'ember'; +import moment from 'moment'; function dateSmall(value) { return moment(value).format('ll'); diff --git a/app/helpers/from-now.js b/app/helpers/from-now.js index 5363042ae93..c15e1feeed2 100644 --- a/app/helpers/from-now.js +++ b/app/helpers/from-now.js @@ -1,4 +1,5 @@ import Ember from 'ember'; +import moment from 'moment'; function fromNow(value) { return moment(value).fromNow(); diff --git a/app/index.html b/app/index.html index bbd93a99862..6159215d39e 100644 --- a/app/index.html +++ b/app/index.html @@ -7,7 +7,7 @@ - {{BASE_TAG}} + {{content-for 'head'}} - + {{content-for 'body-footer'}} diff --git a/app/initializers/google.js b/app/initializers/google.js index bb10ab585f8..ebdf468b08d 100644 --- a/app/initializers/google.js +++ b/app/initializers/google.js @@ -2,7 +2,7 @@ import Ember from 'ember'; export var initialize = function() { Ember.$.getScript('https://www.google.com/jsapi', function() { - google.load('visualization', '1.0', { + window.google.load('visualization', '1.0', { 'packages': ['corechart'], 'callback': function() { window.googleChartsLoaded = true; diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 3d3f1bae291..679c5741a02 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -5,10 +5,10 @@