Merge pull request #229 from notmessenger/Issue227

Address dependency management issues
ciena-frost · Jan 9, 2018 · 3843a0c · 3843a0c
2 parents 53e2f34 + 47e14c4
commit 3843a0c
Show file tree

Hide file tree

Showing 22 changed files with 87 additions and 16,922 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,8 +15,8 @@ yarn.lock
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+package-lock.json
 testem.log
 coverage.json
 .idea
-/visual-acceptance
 /typing
diff --git a/.npmignore b/.npmignore
@@ -15,4 +15,3 @@ bower.json
 ember-cli-build.js
 testem.json
 .idea
-/visual-acceptance
diff --git a/.remarkignore b/.remarkignore
@@ -0,0 +1 @@
+CHANGELOG.md
diff --git a/.remarkrc b/.remarkrc
diff --git a/addon/components/nav-route.js b/addon/components/nav-route.js
@@ -55,7 +55,6 @@ export default Component.extend({
 
     if (e.metaKey || e.shiftKey || e.ctrlKey || onTargetRoute) {
       navigation.dismiss()
-      return
     }
   },
 

diff --git a/addon/templates/components/frost-navigation.hbs b/addon/templates/components/frost-navigation.hbs
@@ -1,5 +1,5 @@
 <div class='frost-application-bar'>
-  <!-- Logo -->
+  {{! Logo }}
   {{component logo
     hook=(concat hookPrefix '-logo')
     hookQualifiers=hookQualifiers
@@ -11,12 +11,12 @@
       hookQualifiers=hookQualifiers
       options=category
     }}
-    {{else}}
-      {{yield to='inverse'}}
+  {{else}}
+    {{yield to='inverse'}}
   {{/each}}
-  <!-- More Content -->
+  {{! More Content }}
   {{yield}}
-  <!-- User Menu -->
+  {{! User Menu }}
   {{component menu
     hook=(concat hookPrefix '-menu')
     hookQualifiers=hookQualifiers

diff --git a/addon/templates/components/nav-route.hbs b/addon/templates/components/nav-route.hbs
@@ -17,13 +17,13 @@
           >
             <use xlink:href="{{iconHref}}" />
           </svg>
-         {{else if icon}}
-            {{frost-icon
-              hook=(concat hookPrefix '-link-icon')
-              hookQualifiers=hookQualifiers
-              pack=pack
-              icon=icon
-            }}
+        {{else if icon}}
+          {{frost-icon
+            hook=(concat hookPrefix '-link-icon')
+            hookQualifiers=hookQualifiers
+            pack=pack
+            icon=icon
+          }}
         {{/if}}
       </div>
       <div>

diff --git a/addon/templates/components/nav-section-actions.hbs b/addon/templates/components/nav-section-actions.hbs
@@ -1,5 +1,5 @@
 <div class='nav-section'>
-  <div {{action goBack}} class='nav-section-header' style={{borderBottomBinding}}>
+  <div {{action goBack}} class='nav-section-header' style={{borderBottomBinding}} role="button">
     <div class='pointer'>
       {{frost-icon
         hook=(concat hookPrefix '-actions-icon')

diff --git a/addon/templates/components/nav-section.hbs b/addon/templates/components/nav-section.hbs
@@ -1,7 +1,7 @@
 <div class='nav-section-header' style={{lineStyle}}>
   {{section.title}}
   {{#if section.actions}}
-    <div class='nav-section-actions-link' {{action setView section}}>
+    <div class='nav-section-actions-link' {{action setView section}} role="button">
       <div class='sub'>Actions</div>
       {{frost-icon
         class='actions-icon flip'

diff --git a/addon/transitions/frost-navigation.js b/addon/transitions/frost-navigation.js
@@ -2,22 +2,22 @@
 export default function () {
   let duration = 200
   this.transition(
-      this.toValue(true),
-      this.use('explode', {
-        pick: '.nav-modal',
-        use: ['to-down', {duration}]
-      }, {
-        pick: '.frost-navigation-background',
-        use: 'fade'
-      }),
-      this.reverse('explode', {
-        pick: '.nav-modal',
-        use: ['to-up', {duration}]
-      }, {
-        pick: '.frost-navigation-background',
-        use: 'fade'
-      }),
-    )
+    this.toValue(true),
+    this.use('explode', {
+      pick: '.nav-modal',
+      use: ['to-down', {duration}]
+    }, {
+      pick: '.frost-navigation-background',
+      use: 'fade'
+    }),
+    this.reverse('explode', {
+      pick: '.nav-modal',
+      use: ['to-up', {duration}]
+    }, {
+      pick: '.frost-navigation-background',
+      use: 'fade'
+    })
+  )
   this.transition(
     this.hasClass('nav-modal-content'),
     this.toValue(true),

diff --git a/bower.json b/bower.json
@@ -1,12 +1,4 @@
 {
   "name": "ember-frost-navigation",
-  "dependencies": {
-    "ember-inflector": "1.3.1",
-    "ember-mocha": "~0.8.11",
-    "ember-mocha-adapter": "~0.3.1",
-    "Faker": "3.0.1",
-    "lodash": "^4.15.0",
-    "pretender": "~0.12.0",
-    "sinonjs": "1.17.1"
-  }
+  "dependencies": {}
 }
diff --git a/config/deploy.js b/config/deploy.js
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -2,18 +2,13 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
 
 module.exports = function (defaults) {
-  var app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     babel: {
       optional: ['es7.decorators']
     },
-    snippetSearchPaths: ['tests/dummy/app'],
-    'ember-cli-mocha': {
-      useLintTree: false
-    }
+    snippetSearchPaths: ['tests/dummy/app']
   })
 
-  app.import('bower_components/sinonjs/sinon.js')
-
   /*
     This build file specifes the options for the dummy test app of this
     addon, located in `/tests/dummy`

diff --git a/index.js b/index.js
@@ -4,6 +4,8 @@
 
 module.exports = {
   name: 'ember-frost-navigation',
+
+  /* eslint-disable complexity */
   init: function () {
     this.options = this.options || {}
     this.options.babel = this.options.babel || {}
@@ -15,4 +17,5 @@ module.exports = {
     // eslint-disable-next-line no-unused-expressions
     this._super.init && this._super.init.apply(this, arguments)
   }
+  /* eslint-enable complexity */
 }