Guard against viewportListeners being undefined

.jscsrc

@@ -1,3 +1,4 @@
 {
-  "preset": "ember-suave"
+  "preset": "ember-suave",
+  "disallowConstOutsideModuleScope": false
 }

.npmignore

@@ -1,15 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
 ember-cli-build.js
-Brocfile.js
 testem.json

.travis.yml

@@ -1,10 +1,7 @@
 ---
 language: node_js
 node_js:
-- "4.1.2"
-
-sudo: required
-dist: trusty
+- "stable"
 
 addons:
   apt:

addon/mixins/in-viewport.js

@@ -28,7 +28,8 @@ export default Mixin.create({
     this._super(...arguments);
     const options = merge({
       viewportUseRAF: canUseRAF(),
-      viewportEntered: false
+      viewportEntered: false,
+      viewportListeners: []
     }, this._buildOptions());
 
     setProperties(this, options);

bower.json

@@ -1,15 +1,9 @@
 {
   "name": "ember-in-viewport",
   "dependencies": {
-    "ember": "1.13.12",
-    "ember-cli-shims": "0.0.6",
-    "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit": "0.4.20",
-    "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "~0.1.20",
-    "jquery": "1.11.3",
-    "loader.js": "ember-cli/loader.js#3.4.0",
-    "qunit": "1.21.0"
+    "ember": "~2.3.1",
+    "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0"
   }
 }

config/ember-try.js

@@ -3,33 +3,41 @@ module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: { }
+      bower: {
+        dependencies: { }
+      }
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
-      },
-      resolutions: {
-        'ember': 'release'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
       }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
-      },
-      resolutions: {
-        'ember': 'beta'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
       }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
-      },
-      resolutions: {
-        'ember': 'canary'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
       }
     }
   ]

ember-cli-build.js

@@ -8,7 +8,7 @@ module.exports = function(defaults) {
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file

package.json

@@ -19,23 +19,26 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
-    "ember-cli": "1.13.15",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.3.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars": "^1.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sri": "^1.2.0",
+    "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
-    "ember-suave": "1.2.3",
-    "ember-try": "~0.0.8"
+    "ember-load-initializers": "^0.5.0",
+    "ember-resolver": "^2.0.3",
+    "ember-suave": "2.0.0",
+    "ember-try": "^0.1.2",
+    "loader.js": "^4.0.0"
   },
   "keywords": [
     "ember-addon",

tests/dummy/app/app.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;

tests/dummy/app/index.html

@@ -7,19 +7,19 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
+    {{content-for "head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
 
-    {{content-for 'head-footer'}}
+    {{content-for "head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
+    {{content-for "body"}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
 
-    {{content-for 'body-footer'}}
+    {{content-for "body-footer"}}
   </body>
 </html>

tests/dummy/app/resolver.js

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

tests/helpers/resolver.js

@@ -1,15 +1,11 @@
-import Resolver from 'ember/resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
 const resolver = Resolver.create();
-const {
-  modulePrefix,
-  podModulePrefix
-} = config;
 
 resolver.namespace = {
-  modulePrefix,
-  podModulePrefix
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix
 };
 
 export default resolver;

tests/index.html

@@ -7,28 +7,28 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
-    <script src="testem.js" integrity=""></script>
     <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>

tests/unit/initializers/viewport-config-test.js

@@ -2,13 +2,14 @@ import Ember from 'ember';
 import { initialize } from '../../../initializers/viewport-config';
 import { module, test } from 'qunit';
 
-const { keys } = Ember;
+const { run } = Ember;
+const { keys } = Object;
 
 let container, application;
 
 module('ViewportConfigInitializer', {
   beforeEach() {
-    Ember.run(function() {
+    run(function() {
       application = Ember.Application.create();
       container = application.__container__;
       application.deferReadiness();
@@ -19,7 +20,7 @@ module('ViewportConfigInitializer', {
 test('it has a viewportConfig object', function(assert) {
   initialize(container, application);
 
-  const viewportConfig     = container.lookup('config:in-viewport');
+  const viewportConfig = container.lookup('config:in-viewport');
   const viewportConfigKeys = keys(viewportConfig);
 
   assert.ok(viewportConfig);