link-component-diff.patch

From f3aa801a7015c118cd50b2c0664485355bd21ad7 Mon Sep 17 00:00:00 2001
From: Jonathan Jackson <jonathan.jackson1@me.com>
Date: Tue, 20 Oct 2015 09:37:03 -0400
Subject: [PATCH] Inherit from LinkComponent to remove private routing API
 usage

---
 frontend/app/components/course-page-list-item.js   | 30 +---------------------
 .../app/templates/components/course-page-list.hbs  |  4 ++-
 .../app/templates/components/course-page-thumb.hbs |  4 ++-
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/frontend/app/components/course-page-list-item.js b/frontend/app/components/course-page-list-item.js
index a00225a..8d9ce90 100644
--- a/frontend/app/components/course-page-list-item.js
+++ b/frontend/app/components/course-page-list-item.js
@@ -1,8 +1,6 @@
 import Ember from 'ember';
 
-//TODO: Inherit from LinkComponent at Ember.js 2.1 and remove
-//coursePageListService.currentListItem and active function
-export default Ember.Component.extend({
+export default Ember.LinkComponent.extend({
   coursePageListService: Ember.inject.service('course-page-list'),
   tagName: 'li',
   routeName: null,
@@ -11,14 +9,12 @@ export default Ember.Component.extend({
   defaultParent: null,
   expanded: true,
   wasExpanded: null,
-  routing: Ember.inject.service('-routing'),
   attributeBindings: ['draggable'],
   draggable: Ember.computed('coursePage.course.isReviewing', function(){
     return this.get('coursePage.course.isReviewing') ? null : "true";
   }),
   classNameBindings: [
     'hover',
-    'active',
     'chapter',
     'subchapter',
     'isDragging',
@@ -32,20 +28,6 @@ export default Ember.Component.extend({
     return this.get('defaultParent.subchapter');
   }),
 
-  active: Ember.computed('coursePageListService.currentListItem', function(){
-    const course_id = this.get('coursePage.course.id');
-    const page_id = this.get('coursePage.page.id');
-    const windowPath = window.location.pathname;
-    const routeURL = new RegExp(this.get('routing').generateURL('page', [{ course_id, page_id }]));
-
-
-    if (routeURL.test(windowPath) && !this.get('coursePageListService.currentListItem')) {
-      this.set('coursePageListService.currentListItem', this);
-    }
-
-    return routeURL.test(windowPath);
-  }),
-
   mouseOver(e) {
     e.stopPropagation();
     this.set('hover', true);
@@ -55,16 +37,6 @@ export default Ember.Component.extend({
     this.set('hover', false);
   },
 
-  click(event) {
-    event.stopPropagation();
-    this.set('coursePageListService.currentListItem', this);
-
-    this.get('routing').transitionTo(
-      this.get('routeName'),
-      [this.get('page.id')]
-    );
-  },
-
   dragStart(event) {
     this.set('wasExpanded', this.get('expanded'));
     this.set('expanded', false);
diff --git a/frontend/app/templates/components/course-page-list.hbs b/frontend/app/templates/components/course-page-list.hbs
index 809b4f6..3108f71 100644
--- a/frontend/app/templates/components/course-page-list.hbs
+++ b/frontend/app/templates/components/course-page-list.hbs
@@ -1,9 +1,11 @@
 {{#each coursePages as |coursePage|}}
   {{#
     course-page-list-item
-    routeName=pageLinkName
+    pageLinkName
+    coursePage.page
     page=coursePage.page
     coursePage=coursePage
+    bubbles=false
     defaultParent=defaultParent as |component|
   }}
 
diff --git a/frontend/app/templates/components/course-page-thumb.hbs b/frontend/app/templates/components/course-page-thumb.hbs
index c4158af..9e013e4 100644
--- a/frontend/app/templates/components/course-page-thumb.hbs
+++ b/frontend/app/templates/components/course-page-thumb.hbs
@@ -1,9 +1,11 @@
 {{#each coursePages as |coursePage|}}
   {{#
     course-page-list-item
-    routeName=pageLinkName
+    pageLinkName
+    coursePage.page
     page=coursePage.page
     coursePage=coursePage
+    bubbles=false
     defaultParent=defaultParent as |component|
   }}
 
-- 
2.2.1