Merge pull request #797 from rust-lang/cleanup

Cleanup

Author: locks

app/components/google-jsapi.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    tagName: '',
+
+    didInsertElement() {
+        Ember.$.getScript('https://www.google.com/jsapi', function() {
+            window.google.load('visualization', '1.0', {
+                packages: ['corechart'],
+                callback() {
+                    window.googleChartsLoaded = true;
+                    Ember.$(document).trigger('googleChartsLoaded');
+                }
+            });
+        });
+    }
+});

app/controllers/category/index.js

@@ -11,6 +11,9 @@ export default Ember.Controller.extend(PaginationMixin, {
 
     totalItems: computed.readOnly('model.meta.total'),
 
+    categoryController: Ember.inject.controller('category'),
+    category: computed.alias('categoryController.model'),
+
     currentSortBy: computed('sort', function() {
         return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
     }),

app/controllers/crate/reverse-dependencies.js

@@ -8,5 +8,8 @@ export default Ember.Controller.extend(PaginationMixin, {
     page: '1',
     per_page: 10,
 
+    crateController: Ember.inject.controller('crate'),
+    category: computed.alias('crateController.model'),
+
     totalItems: computed.readOnly('model.meta.total'),
 });

app/initializers/google.js

@@ -1,8 +1,9 @@
+export function initialize(application) {
+    application.inject('controller', 'session', 'service:session');
+    application.inject('route', 'session', 'service:session');
+}
+
 export default {
     name: 'app.session',
-
-    initialize(application) {
-        application.inject('controller', 'session', 'service:session');
-        application.inject('route', 'session', 'service:session');
-    }
+    initialize
 };

app/initializers/session.js

@@ -7,12 +7,7 @@ export default Ember.Route.extend({
     },
 
     model(params) {
-        params.category = this.modelFor('category').id;
+        params.category = this.paramsFor('category').category_id;
         return this.store.query('crate', params);
-    },
-
-    setupController(controller, model) {
-        controller.set('category', this.modelFor('category'));
-        this._super(controller, model);
-    },
+    }
 });

app/routes/category/index.js

@@ -10,10 +10,5 @@ export default Ember.Route.extend({
         params.crate = this.modelFor('crate');
 
         return this.store.query('dependency', params);
-    },
-
-    setupController(controller, model) {
-        controller.set('crate', this.modelFor('crate'));
-        this._super(controller, model);
-    },
+    }
 });

app/routes/crate/reverse-dependencies.js

@@ -16,6 +16,7 @@ export default Ember.Route.extend({
 
     model(params) {
         const { team_id } = params;
+
         return this.store.find('team', team_id).then(
             (team) => {
                 params.team_id = team.get('id');

app/routes/crate/versions.js

@@ -5,14 +5,8 @@ export default Ember.Route.extend({
         page: { refreshModel: true },
         sort: { refreshModel: true },
     },
-    data: {},
-
-    setupController(controller, model) {
-        this._super(controller, model);
 
-        controller.set('fetchingFeed', true);
-        controller.set('crates', this.get('data.crates'));
-    },
+    data: {},
 
     model(params) {
         const { user_id } = params;
@@ -34,4 +28,11 @@ export default Ember.Route.extend({
             }
         );
     },
+
+    setupController(controller, model) {
+        this._super(controller, model);
+
+        controller.set('fetchingFeed', true);
+        controller.set('crates', this.get('data.crates'));
+    },
 });

app/routes/team.js

@@ -1,4 +1,5 @@
 {{title "Cargo: packages for Rust" separator=' - ' prepend=true}}
+{{google-jsapi}}
 
 <a href='https://github.com/rust-lang/crates.io' class='fork-me'>
   <img src='/assets/forkme.png'/>

app/routes/user.js

@@ -1,17 +1,17 @@
 <div class='all-versions-back'>
-    {{#link-to 'crate' crate}}&#11013; Back to Main Page{{/link-to}}
+    {{#link-to 'crate' model}}&#11013; Back to Main Page{{/link-to}}
 </div>
 
 <div class='info'>
     <span class='small'>
-        All <span class='num'>{{ model.length }}</span>
-        versions of <span class='num'>{{ crate.name }}</span> since
-        {{moment-format crate.created_at 'LL'}}
+        All <span class='num'>{{ model.versions.length }}</span>
+        versions of <span class='num'>{{ model.name }}</span> since
+        {{moment-format model.created_at 'LL'}}
     </span>
 </div>
 
 <div id='crate-all-versions' class='white-rows'>
-    {{#each model as |version|}}
+    {{#each model.versions as |version|}}
         <div class='row'>
             <div>
                 {{#link-to 'crate.version' version.num}}{{ version.num }}{{/link-to}}