Merge pull request #44 from frolfr/gschorkopf/moor-deprecations

Moor deprecations
frolfr · Aug 18, 2016 · 1b26a68 · 1b26a68
2 parents 6a74958 + e454772
commit 1b26a68
Show file tree

Hide file tree

Showing 60 changed files with 82 additions and 404 deletions.
diff --git a/README.md b/README.md
@@ -43,13 +43,6 @@ Make use of the many generators for code, try `ember help generate` for more det
 * `ember build` (development)
 * `ember build --environment production` (production)
 
-### Deploying
-
-You'll need to set up `deploy.json` and put in your app's main directory.
-
-* `ember deploy --environment production`
-* `ember deploy:activate --revision frolfr-client:REVISION_SHA  --environment production`
-
 ## Further Reading / Useful Links
 
 * [ember.js](http://emberjs.com/)

diff --git a/app/components/scorecards-table-cell.js b/app/components/scorecards-table-cell.js
@@ -15,7 +15,7 @@ var ScorecardsTableCell = Ember.Component.extend({
     return this.get('scorecard').get('turns').find(function(turn) {
       return turn.get('holeNumber') === holeNumber;
     });
-  }.property('scorecard.turns.@each', 'holeNumber')
+  }.property('scorecard.turns.[]', 'holeNumber')
 });
 
 export default ScorecardsTableCell;
diff --git a/app/controllers/course-rounds.js b/app/controllers/course-rounds.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 
+// TODO: Change to just Controller
 var CourseRoundsController = Ember.ArrayController.extend({
   // Pagination
   page: 1,
@@ -16,7 +17,7 @@ var CourseRoundsController = Ember.ArrayController.extend({
     var end = this.get('page') * this.get('perPage');
 
     return this.get('filteredContent').slice(start, end);
-  }.property('filteredContent.@each', 'page', 'perPage'),
+  }.property('filteredContent.[]', 'page', 'perPage'),
 
   isPaginated: function() {
     return this.get('filteredContent').length > this.get('perPage');
@@ -47,7 +48,7 @@ var CourseRoundsController = Ember.ArrayController.extend({
     } else {
       return this.get('completedScorecards');
     }
-  }.property('arrangedContent.@each', 'includeIncompleteScorecards', 'completedScorecards.@each'),
+  }.property('arrangedContent.[]', 'includeIncompleteScorecards', 'completedScorecards.[]'),
 
   completedScorecards: function() {
     return this.get('arrangedContent').filter(function(scorecard) {

diff --git a/app/controllers/courses/index.js b/app/controllers/courses/index.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-var CoursesIndexController = Ember.ArrayController.extend({
+var CoursesIndexController = Ember.Controller.extend({
   queryParams: ["page"],
 
   pageBinding: "content.page",

diff --git a/app/controllers/courses/new.js b/app/controllers/courses/new.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-var CoursesNewController = Ember.ObjectController.extend({
+var CoursesNewController = Ember.Controller.extend({
   stateAbbreviations: ["","AK","AL","AR","AZ","CA","CO",
     "CT","DC","DE","FL","GA","GU","HI","IA","ID","IL",
     "IN","KS","KY","LA","MA","MD","ME","MH","MI","MN",

diff --git a/app/controllers/current-user.js b/app/controllers/current-user.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 
+// TODO: Update to simply 'Controller' after getting rid of janky auth
 var CurrentUserController = Ember.ObjectController.extend({
   isAuthenticated: function() {
     return this.get('model.isLoaded');

diff --git a/app/controllers/friendable-users.js b/app/controllers/friendable-users.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-var FriendableUsersController = Ember.ArrayController.extend({
+var FriendableUsersController = Ember.Controller.extend({
   selection: null,
   query: null,
 

diff --git a/app/controllers/friends.js b/app/controllers/friends.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import pagedArray from 'ember-cli-pagination/computed/paged-array';
 
-var FriendsController = Ember.ArrayController.extend({
+var FriendsController = Ember.Controller.extend({
   pagedContent: pagedArray("content", {infinite: true}),
 
   hasNextPage: function() {

diff --git a/app/controllers/password/edit.js b/app/controllers/password/edit.js
@@ -1,19 +1,20 @@
 import Ember from 'ember';
 
-var PasswordEditController = Ember.ObjectController.extend({
+var PasswordEditController = Ember.Controller.extend({
   needs: "sessions",
   showPasswordError: false,
 
   actions: {
     changePassword: function() {
       var _this = this,
           password = this.get('model'),
-          isValidPassword = this.get('password') === this.get('passwordConfirmation');
+          isValidPassword = password.get('password') === password.get('passwordConfirmation');
 
       if (isValidPassword) {
         password.save().then(function(user) {
           var email = user.get('email'),
-              password = _this.get('password');
+              password = user.get('password');
+
           _this.get('controllers.sessions').send('loginWithCredentials', email, password);
         });
       } else {

diff --git a/app/controllers/profile/settings.js b/app/controllers/profile/settings.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-var ProfileSettingsController = Ember.ObjectController.extend({
+var ProfileSettingsController = Ember.Controller.extend({
   actions: {
     saveChanges: function() {
       this.get('model').save();

diff --git a/app/controllers/public-round.js b/app/controllers/public-round.js
diff --git a/app/controllers/review/edit.js b/app/controllers/review/edit.js
diff --git a/app/controllers/reviews/index.js b/app/controllers/reviews/index.js
diff --git a/app/controllers/reviews/new.js b/app/controllers/reviews/new.js
diff --git a/app/controllers/round.js b/app/controllers/round.js
@@ -1,21 +1,5 @@
 import Ember from 'ember';
 
-var RoundController = Ember.ObjectController.extend({
-  publicRoundUrl: function () {
-    return 'http://frolfr.com/public/rounds/' + this.get('model.id');
-  }.property(),
-
-  actions: {
-    makePrivate: function() {
-      this.get('model').set('publicRecap', false);
-      this.get('model').save();
-    },
-
-    publish: function() {
-      this.get('model').set('publicRecap', true);
-      this.get('model').save();
-    }
-  }
-});
+var RoundController = Ember.Controller.extend({});
 
 export default RoundController;
diff --git a/app/controllers/round/index.js b/app/controllers/round/index.js
@@ -1,21 +1,21 @@
 import Ember from 'ember';
 
-var RoundIndexController = Ember.ObjectController.extend({
+var RoundIndexController = Ember.Controller.extend({
   columnWidth: function() {
-    var scorecardColumns = this.get('scorecards.length');
+    var scorecardColumns = this.get('model.scorecards.length');
     var scorecardColumnPercentage = 100 / scorecardColumns;
 
     return 'width: ' + scorecardColumnPercentage + '%;';
-  }.property('scorecards.length'),
+  }.property('model.scorecards.length'),
 
   holeNumbers: function() {
-    var turnsCount = this.get('scorecards.firstObject.turns.length');
+    var turnsCount = this.get('model.scorecards.firstObject.turns.length');
     var holeNumbers = new Array(turnsCount)
       .join().split(',')
       .map(function(item, index){ return ++index; });
 
     return holeNumbers;
-  }.property('scorecards.firstObject.turns.length')
+  }.property('model.scorecards.firstObject.turns.length')
 
 });
 

diff --git a/app/controllers/round/settings.js b/app/controllers/round/settings.js
@@ -22,7 +22,7 @@ export default Ember.Controller.extend({
     return friends.filter(function(friend) {
       return !player_ids.contains(friend.get("id"));
     });
-  }.property('roundPlayers.@each', 'friends.@each'),
+  }.property('roundPlayers.[]', 'friends.[]'),
 
   actions: {
     addPlayer: function() {

diff --git a/app/controllers/rounds/new.js b/app/controllers/rounds/new.js
@@ -1,17 +1,17 @@
 import Ember from 'ember';
 
-var RoundsNewController = Ember.ObjectController.extend({
+var RoundsNewController = Ember.Controller.extend({
   selectedPlayer: null,
   query: null,
   nearestCourses: false,
 
   potentialPlayers: function() {
     var friends = this.get('friends');
-    var players = this.get('players');
+    var players = this.get('model.players');
     players.forEach(function(p) { friends.removeObject(p); });
 
     return friends;
-  }.property('friends.@each', 'players.@each'),
+  }.property('friends.[]', 'model.players.[]'),
 
 
   noPlayerSelected: function() {
@@ -20,13 +20,13 @@ var RoundsNewController = Ember.ObjectController.extend({
 
   actions: {
     addPlayer: function() {
-      this.get('players').addObject(this.get('selectedPlayer'));
+      this.get('model.players').addObject(this.get('selectedPlayer'));
       this.set('selectedPlayer', null);
       this.set('query', null);
     },
 
     removePlayer: function(player) {
-      this.get('players').removeObject(player);
+      this.get('model.players').removeObject(player);
     },
 
     updateCourseInput: function(nearestCourse) {
@@ -38,7 +38,7 @@ var RoundsNewController = Ember.ObjectController.extend({
 
     createRound: function() {
       var _this = this;
-      this.set('model.course', this.get('model.course.content'));
+
       this.get('model').save().then(function(round) {
         _this.controllerFor('application').set('currentRound', round);
         _this.controllerFor('application').set('currentHole', '1');

diff --git a/app/controllers/turns.js b/app/controllers/turns.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-var TurnsController = Ember.ArrayController.extend({
+var TurnsController = Ember.Controller.extend({
   holeNumber: Ember.computed.alias('model.firstObject.holeNumber'),
 
   holePar: Ember.computed.alias('model.firstObject.par'),

diff --git a/app/controllers/users/new.js b/app/controllers/users/new.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-var UsersNewController = Ember.ObjectController.extend({
+var UsersNewController = Ember.Controller.extend({
   needs: "sessions",
 
   actions: {
@@ -9,9 +9,9 @@ var UsersNewController = Ember.ObjectController.extend({
           user = this.get('model');
 
       if (user.get('hasValidPassword')) {
-        user.save().then(function() {
-          var email = self.get('email'),
-              password = self.get('password');
+        user.save().then(function(user) {
+          var email = user.get('email'),
+              password = user.get('password');
 
           self.get('controllers.sessions').send("loginWithCredentials", email, password);
         });

diff --git a/app/helpers/display-date.js b/app/helpers/display-date.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 /* global moment */
 
-export default Ember.Handlebars.makeBoundHelper(function(value) {
+export default Ember.Helper.helper(function([value]) {
   return moment(value).format('dddd, MMM Do YYYY');
 });
diff --git a/app/helpers/display-score.js b/app/helpers/display-score.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-export default Ember.Handlebars.makeBoundHelper(function(score) {
+export default Ember.Helper.helper(function([score]) {
   if (score > 0) {
     return "+" + score;
   } else if (Math.abs(score) === 0) {

diff --git a/app/helpers/formatted-address.js b/app/helpers/formatted-address.js
diff --git a/app/helpers/ranking-from-index.js b/app/helpers/ranking-from-index.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
 
-export default Ember.Handlebars.makeBoundHelper(function(index) {
+export default Ember.Helper.helper(function([index]) {
   return index + 1 + ".";
 });
diff --git a/app/models/course.js b/app/models/course.js
@@ -12,7 +12,6 @@ var Course = DS.Model.extend({
     scorecards: DS.hasMany('scorecard', { async: true }),
     holes: DS.hasMany('hole', { async: true }),
     holeCount: DS.attr('number'),
-    reviews: DS.hasMany('review', { async: true }),
     photos: DS.hasMany('photo', {async: true}),
 
     isApproved: function() {