Merge pull request #8 from nypublicradio/brian-legacy-cleanup

Legacy Cleanup
nypublicradio · Jan 11, 2017 · 0def215 · 0def215
2 parents 47adbf3 + db44212
commit 0def215
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 23 deletions.
diff --git a/app/channel/route.js b/app/channel/route.js
@@ -53,7 +53,8 @@ export default Route.extend(PlayParamMixin, {
     });
   },
   setupController(controller, model) {
-    let { navSlug } = this.paramsFor(`${this.routeName}.well`);
+    let { page_params = '' } = this.paramsFor(`${this.routeName}.page`);
+    let [navSlug] = page_params.split('/');
     controller.setProperties({
       channelType: this.routeName,
       navRoot: get(this, 'listingSlug'),

diff --git a/app/components/site-chrome/template.hbs b/app/components/site-chrome/template.hbs
@@ -109,23 +109,23 @@
           {{/if}}
         </li>
 
-        {{#link-to 'stream' tagName='li' href=false class="list-item list-item--nav" }}
+        {{#link-to 'stream' tagName='li' href=false class="list-item list-item--nav"}}
           {{link-to 'All Streams' 'stream' class="inherit" preventDefault=false}}
         {{/link-to}}
 
-        {{#link-to 'schedule' current-when="schedule.date" tagName='li' href="false" class="list-item list-item--nav" }}
+        {{#link-to 'schedule' current-when="schedule.date" tagName='li' href=false class="list-item list-item--nav"}}
           {{link-to 'Schedule' 'schedule' class="inherit" preventDefault=false}}
         {{/link-to}}
 
-        {{#link-to 'shows' current-when="shows show" tagName="li" href=false class="list-item list-item--nav" }}
+        {{#link-to 'shows' current-when="shows show" tagName="li" href=false class="list-item list-item--nav"}}
           {{link-to 'Shows' 'shows' class="inherit" preventDefault=false}}
         {{/link-to}}
 
-        {{#link-to 'topics' current-when='topics tag' tagName='li' href="false" class="list-item list-item--nav" }}
+        {{#link-to 'topics' current-when='topics tag' tagName='li' href=false class="list-item list-item--nav"}}
           {{link-to 'Topics' 'topics' class="inherit" preventDefault=false}}
         {{/link-to}}
 
-        {{#link-to 'discover.start' current-when="discover" tagName='li' href="false" class="list-item list-item--nav"}}
+        {{#link-to 'discover.start' current-when="discover" tagName='li' href=false class="list-item list-item--nav"}}
           {{#link-to 'discover.start' class="inherit" preventDefault=false}}
             <span class="new">NEW!</span>
             Discover
@@ -134,18 +134,18 @@
 
         {{#unless media.isLargeAndUp}}
 
-          {{#link-to 'djangorendered' 'search/' tagName='li' href=false class="list-item list-item--nav" }}
+          {{#link-to 'djangorendered' 'search/' tagName='li' href=false class="list-item list-item--nav"}}
             {{link-to 'Search' 'djangorendered' 'search/' class="inherit" preventDefault=false}}
           {{/link-to}}
 
           {{#if features.autoplayPrefs}}
-            {{#link-to 'settings' tagName='li' href=false class="list-item list-item--nav" }}
+            {{#link-to 'settings' tagName='li' href=false class="list-item list-item--nav"}}
               {{link-to 'Settings' 'settings' class="inherit" preventDefault=false}}
             {{/link-to}}
           {{/if}}
 
           {{#if session.isAuthenticated}}
-            {{#link-to 'djangorendered' 'users/me' tagName='li' href="false" class="list-item list-item--nav" }}
+            {{#link-to 'djangorendered' 'users/me' tagName='li' href=false class="list-item list-item--nav"}}
               {{link-to "My Account" 'djangorendered' 'users/me' class="inherit" preventDefault=false}}
             {{/link-to}}
 
@@ -154,7 +154,7 @@
             </li>
 
           {{else}}
-            {{#link-to 'login' tagName='li' href="false" class="list-item list-item--nav" }}
+            {{#link-to 'login' tagName='li' href=false class="list-item list-item--nav"}}
               {{link-to 'Sign In' 'login' class="inherit" preventDefault=false}}
             {{/link-to}}
 
@@ -175,21 +175,21 @@
           <ul class="list list--noborder flush alignright">
             {{!-- <div class="h5 text--heavy alignright"> --}}
             {{#if features.autoplayPrefs}}
-              {{#link-to 'settings' tagName='li' href=false class="list-item list-item--nav" }}
+              {{#link-to 'settings' tagName='li' href=false class="list-item list-item--nav"}}
                 {{link-to 'Settings' 'settings' class="inherit" preventDefault=false}}
               {{/link-to}}
             {{/if}}
 
             {{#if session.isAuthenticated}}
-              {{#link-to 'djangorendered' 'users/me' tagName='li' href="false" class="list-item list-item--nav" }}
+              {{#link-to 'djangorendered' 'users/me' tagName='li' href=false class="list-item list-item--nav"}}
                 {{link-to "My Account" 'djangorendered' 'users/me' class="inherit" preventDefault=false}}
               {{/link-to}}
 
               <li class="list-item list-item--nav">
                 <button class="btn--blank" data-test-selector="logout" {{action 'logout'}}>Sign Out</button>
               </li>
             {{else}}
-              {{#link-to 'login' tagName='li' href="false" class="list-item list-item--nav" }}
+              {{#link-to 'login' tagName='li' href=false class="list-item list-item--nav"}}
                 {{link-to "Sign In" 'login' class="inherit" preventDefault=false}}
               {{/link-to}}
             {{/if}}

diff --git a/app/instance-initializers/link-handler.js b/app/instance-initializers/link-handler.js
@@ -117,7 +117,7 @@ export default {
 
         let { routeName, params, queryParams } = router.recognize(href);
         router.transitionTo(routeName, params, queryParams);
-        preventDefault.bind(event);
+        preventDefault.bind(event)();
         return false;
       } else if (isExternal && !Ember.testing) {
         $target.attr('target', '_blank');

diff --git a/app/lib/compat-hooks.js b/app/lib/compat-hooks.js
@@ -37,14 +37,14 @@ export function beforeTeardown(/* element, page */) {
     window.googletag.destroySlots();
   }
 
-  // toggle_menu_v2.js sets classes way up on <html>, so we may need to clear them.
-  $('html')
-    .removeClass('navigation-open')
-    .removeClass('subnavigation-open');
-
   // player.js listens for a storage event with a handler defined on the wnyc object,
   // which is triggered by logic outside of Ember; unbind to avoid throwing errors
   $(window).off('unload storage');
+
+  // the whats on widget only runs on the homepage but sets up an interval that
+  // continues to run. cancel it here so it doesn't run in unsafe contexts
+  let timeoutId = get(window, 'wnyc.apis.whatsOnToday.update.updateTimeoutId');
+  clearInterval(timeoutId);
 
   // The mailchimp popup signup form is badly behaved -- it insists on
   // being the only AMD loader on the page. So here we clear it away

diff --git a/app/lib/is-js.js b/app/lib/is-js.js
@@ -2,5 +2,8 @@ export default function isJavascript(scriptTag) {
   // TODO: add a console warning if the script tag doesn't have an attribute? 
   // seems like it's required for some parts of ember consumption
   let type = scriptTag.attributes.type ? scriptTag.attributes.type.value : 'text/javascript';
-  return /(?:application|text)\/(deferred-)?javascript/i.test(type);
+  // guard against chrome-extension:// scripts
+  let badSrc = scriptTag.src && !scriptTag.src.match(/^http|^(\.)?\//);
+
+  return !badSrc && /(?:application|text)\/(deferred-)?javascript/i.test(type);
 }
diff --git a/app/routes/index.js b/app/routes/index.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import service from 'ember-service/inject';
 import PlayParamMixin from 'wnyc-web-client/mixins/play-param';
 import rsvp from 'rsvp';
+import { beforeTeardown } from 'wnyc-web-client/lib/compat-hooks';
 const { hash } = rsvp;
 const { get } = Ember;
 
@@ -24,5 +25,13 @@ export default Ember.Route.extend(PlayParamMixin, {
       page: path,
       title
     });
+  },
+
+  actions: {
+    willTransition() {
+      this._super(...arguments);
+      beforeTeardown();
+      return true;
+    }
   }
 });
diff --git a/app/services/raven.js b/app/services/raven.js
@@ -47,7 +47,10 @@ export default RavenLogger.extend({
     this._super(...arguments);
   },
 
-  captureMessage(/* message */) {
+  captureMessage(message, object) {
+    if (object.extra && object.extra.status === 404) {
+      return;
+    }
     return this._super(...arguments);
   },
 

diff --git a/app/styles/_animations.scss b/app/styles/_animations.scss
@@ -7,8 +7,7 @@ body:not(.ember-application):not([data-testing]):not(.simplified_wrapper):not(.c
 }
 
 body {
-  > #full-page-viewport-wrapper,
-  > #navigation-menu {
+  > #site {
     display: none;
   }
 }

diff --git a/tests/acceptance/viewing-show-test.js b/tests/acceptance/viewing-show-test.js
@@ -135,6 +135,36 @@ test('using a nav-link', function(assert) {
   });
 });
 
+test('visiting directly to a nav link url', function(assert) {
+  let apiResponse = server.create('api-response', {
+    id: 'shows/foo/episodes/1',
+    teaseList: server.createList('story', 10)
+  });
+  server.create('api-response', {
+    id: 'shows/foo/next-link/1',
+    teaseList: server.createList('story', 1, {title: 'Story Title'})
+  });
+
+  let show = server.create('show', {
+    id: 'shows/foo/',
+    linkroll: [
+      {navSlug: 'episodes', title: 'Episodes'},
+      {navSlug: 'next-link', title: 'Next Link'}
+    ],
+    apiResponse
+  });
+
+  server.create('django-page', {id: show.id});
+
+  djangoPage
+    .bootstrap(show)
+    .visit({id: 'shows/foo/next-link/'});
+
+  andThen(() => {
+    assert.equal(findWithAssert('nav li.is-active > a').text(), 'Next Link');
+  });
+});
+
 test('null social links should not break page', function(assert) {
   let apiResponse = server.create('api-response', {
     id: 'shows/foo/recent_stories/1',