Merge pull request #208 from Turbo87/ember-update

Update Ember.js

Author: alexcrichton

.editorconfig

@@ -11,23 +11,24 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.js]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.css]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [*.html]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false

.gitignore

@@ -7,7 +7,7 @@
 
 # dependencies
 /node_modules
-/bower_components/*
+/bower_components
 
 # misc
 /.sass-cache

.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,

.travis.yml

@@ -2,16 +2,29 @@ language: rust
 rust: nightly
 sudo: false
 
-before_script:
+cache:
+  directories:
+    - node_modules
+
+before_install:
+  - nvm install 0.12
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+  - "npm config set spin false"
+  - "npm install -g npm@^2"
+
+install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-  - psql -c 'create database cargo_registry_test;' -U postgres
-  - npm install -g phantomjs ember-cli
+  - npm install -g bower
   - npm install
+  - bower install
+
+before_script:
+  - psql -c 'create database cargo_registry_test;' -U postgres
 
 script:
   - cargo build
   - cargo test
-  - ember test
+  - npm test
 
 after_success:
   - travis-cargo coveralls --no-sudo

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}

Brocfile.js

@@ -17,7 +17,7 @@ which enables tweaking the UI of the site without actually having the server
 running locally. To get up and running with just the UI, run:
 
 ```
-npm run startui
+npm run start:ui
 ```
 
 This will give you a local server to browse while using the staging backend

README.md

@@ -1,9 +1,9 @@
 import ApplicationAdapter from './application';
 
 export default ApplicationAdapter.extend({
-    findQuery: function(store, type, query) {
+    query(store, type, query) {
         if (!query.reverse) {
-            return this._super(store, type, query);
+            return this._super(...arguments);
         }
         delete query.reverse;
         var crate = query.crate;

app/adapters/dependency.js

@@ -3,15 +3,19 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
+var App;
+
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 
 loadInitializers(App, config.modulePrefix);
-Ember.$.ajaxSetup({cache: false});
+Ember.$.ajaxSetup({
+  cache: false
+});
 
 export default App;

app/app.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+    classNames: ['crate', 'row']
+});

app/components/crate-row.js

@@ -1,26 +1,26 @@
 import Ember from 'ember';
 
+const { computed } = Ember;
+
 export default Ember.Component.extend({
     size: 'small',
     user: null,
     attributeBindings: ['src', 'width', 'height'],
     tagName: 'img',
 
-    width: function() {
+    width: computed('size', function() {
         if (this.get('size') === 'small') {
             return 22;
         } else if (this.get('size') === 'medium-small') {
             return 32;
         } else {
             return 85; // medium
         }
-    }.property('size'),
+    }),
 
-    height: function() {
-        return this.get('width');
-    }.property('width'),
+    height: computed.readOnly('width'),
 
-    src: function() {
+    src: computed('size', 'user', function() {
         return this.get('user.avatar') + '&s=' + this.get('width');
-    }.property('size', 'user'),
+    })
 });

app/components/user-avatar.js

@@ -1,17 +1,16 @@
 import Ember from 'ember';
 
+const { computed } = Ember;
+
 export default Ember.Component.extend({
   user: null,
   attributeBindings: ['title', 'href'],
   tagName: 'a',
 
-  title: function() {
-      return this.get('user.login');
-  }.property('user'),
-
-  'href': function() {
+  title: computed.readOnly('user.login'),
+  href: computed('user', function() {
       // TODO replace this with a link to a native crates.io profile
       // page when they exist.
       return this.get('user.url');
-  }.property('user'),
+  })
 });

app/components/user-link.js

@@ -1,49 +1,60 @@
 import Ember from 'ember';
 
+const { observer } = Ember;
+
 export default Ember.Controller.extend({
-    needs: ['search'],
+    searchController: Ember.inject.controller('search'),
 
     flashError: null,
     nextFlashError: null,
     showUserOptions: false,
-    search: Ember.computed.oneWay('controllers.search.q'),
+    search: Ember.computed.oneWay('searchController.q'),
 
-    stepFlash: function() {
+    stepFlash() {
         this.set('flashError', this.get('nextFlashError'));
         this.set('nextFlashError', null);
     },
 
-    aboutToTransition: function() {
+    aboutToTransition() {
         Ember.$(document).trigger('mousedown');
     },
 
-    resetDropdownOption: function(controller, option) {
+    // don't use this from other controllers..
+    resetDropdownOption(controller, option) {
         controller.set(option, !controller.get(option));
         if (controller.get(option)) {
-            Ember.$(document).on('mousedown.useroptions', function(e) {
+            Ember.$(document).on('mousedown.useroptions', (e) => {
                 if (Ember.$(e.target).prop('tagName') === 'INPUT') {
                     return;
                 }
-                Ember.run.later(function() {
+                Ember.run.later(() => {
                     controller.set(option, false);
                 }, 150);
                 Ember.$(document).off('mousedown.useroptions');
             });
         }
     },
 
-    currentPathChanged: function () {
+    _scrollToTop() {
         window.scrollTo(0, 0);
-    }.observes('currentPath'),
+    },
+
+    // TODO: remove observer & DOM mutation in controller..
+    currentPathChanged: observer('currentPath', function () {
+      Ember.run.scheduleOnce('afterRender', this, this._scrollToTop);
+    }),
 
     actions: {
-        search: function(query) {
+        search(q) {
             this.transitionToRoute('search', {
-              queryParams: {q: query, page: 1}
+              queryParams: {
+                q,
+                page: 1
+              }
             });
         },
 
-        toggleUserOptions: function() {
+        toggleUserOptions() {
             this.resetDropdownOption(this, 'showUserOptions');
         },
     },

app/controllers/application.js

@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default Ember.Controller.extend({
     actions: {
-        search: function(query) {
+        search(query) {
             return this.transitionToRoute('search', {queryParams: {q: query}});
         },
     },