Skip to content

Commit

Permalink
Merge 35e4042 into ac02dcd
Browse files Browse the repository at this point in the history
  • Loading branch information
notmessenger committed Apr 16, 2018
2 parents ac02dcd + 35e4042 commit 43c995e
Show file tree
Hide file tree
Showing 7 changed files with 846 additions and 991 deletions.
File renamed without changes
File renamed without changes
11 changes: 11 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@

'use strict'

const {setSvgConfiguration} = require('ember-frost-core/utils/frost-icon-svg')

module.exports = {
name: 'ember-frost-navigation',

included: function () {
this.app = this._findHost.call(this) // eslint-disable-line no-useless-call

// Set ember-cli-svgstore options so that consuming applications don't have to
setSvgConfiguration.call(this, 'frost-nav')

this._super.included.apply(this, arguments)
},

/* eslint-disable complexity */
init: function () {
this.options = this.options || {}
Expand Down
1,719 changes: 831 additions & 888 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"ember-cli-uglify": "^1.2.0",
"ember-code-snippet": "1.7.0",
"ember-export-application-global": "^1.0.5",
"ember-frost-notifier": "^8.0.0",
"ember-frost-popover": "^9.0.0",
"ember-frost-notifier": "^9.0.0",
"ember-frost-popover": "^10.0.0",
"ember-frost-test": "^4.0.1",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
Expand All @@ -74,18 +74,16 @@
"ember-cli-babel": "^5.1.7",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-sass": "7.1.1",
"ember-cli-svgstore": "github:ciena-blueplanet/ember-cli-svgstore#977df1cf58ae43b1d98a591573c3e06947744321",
"ember-computed-decorators": "0.3.0",
"ember-frost-core": "^7.0.0",
"ember-frost-core": "^8.0.0",
"ember-hook": "1.4.2",
"ember-prop-types": "^7.0.2",
"liquid-fire": "0.27.2"
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"ember-frost-icon-pack": {
"name": "frost-nav"
},
"pr-bumper": {
"coverage": 60
}
Expand Down
23 changes: 0 additions & 23 deletions tests/dummy/svgs/sample.svg

This file was deleted.

74 changes: 0 additions & 74 deletions tests/dummy/svgs/user.svg

This file was deleted.

0 comments on commit 43c995e

Please sign in to comment.