Merge branch 'master' of github.com:yapplabs/ember-modal-dialog

yapplabs · Jul 11, 2016 · ebf34d6 · ebf34d6
2 parents d8ce9ed + 65e2ec1
commit ebf34d6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,26 @@
 # Change Log
 
-## [0.8.4](https://github.com/yapplabs/ember-modal-dialog/tree/0.8.4) (2016-05-11)
-[Full Changelog](https://github.com/yapplabs/ember-modal-dialog/compare/v0.8.3...0.8.4)
+## [0.8.6](https://github.com/yapplabs/ember-modal-dialog/tree/0.8.6) (2016-07-05)
+[Full Changelog](https://github.com/yapplabs/ember-modal-dialog/compare/v0.8.5...0.8.6)
+
+**Merged pull requests:**
+
+- Bump ember-cli-htmlbars to 1.0.3 [\#123](https://github.com/yapplabs/ember-modal-dialog/pull/123) ([sohara](https://github.com/sohara))
+
+## [v0.8.5](https://github.com/yapplabs/ember-modal-dialog/tree/v0.8.5) (2016-06-22)
+[Full Changelog](https://github.com/yapplabs/ember-modal-dialog/compare/v0.8.4...v0.8.5)
+
+**Closed issues:**
+
+- Problem with subclassing [\#131](https://github.com/yapplabs/ember-modal-dialog/issues/131)
+- Doesn't work with custom fonts [\#17](https://github.com/yapplabs/ember-modal-dialog/issues/17)
+
+**Merged pull requests:**
+
+- Call `this.\_super.init` to avoid ember-cli deprecation [\#132](https://github.com/yapplabs/ember-modal-dialog/pull/132) ([ascot21](https://github.com/ascot21))
+
+## [v0.8.4](https://github.com/yapplabs/ember-modal-dialog/tree/v0.8.4) (2016-05-11)
+[Full Changelog](https://github.com/yapplabs/ember-modal-dialog/compare/v0.8.3...v0.8.4)
 
 **Closed issues:**
 
@@ -235,8 +254,8 @@
 
 **Merged pull requests:**
 
-- Remove orphan overlay component [\#13](https://github.com/yapplabs/ember-modal-dialog/pull/13) ([ofbriggs](https://github.com/ofbriggs))
-- Updating ember-cli version to fix build errors on windows [\#12](https://github.com/yapplabs/ember-modal-dialog/pull/12) ([ofbriggs](https://github.com/ofbriggs))
+- Remove orphan overlay component [\#13](https://github.com/yapplabs/ember-modal-dialog/pull/13) ([olivia](https://github.com/olivia))
+- Updating ember-cli version to fix build errors on windows [\#12](https://github.com/yapplabs/ember-modal-dialog/pull/12) ([olivia](https://github.com/olivia))
 - Clarify key-responder is about keyboard shortcuts [\#10](https://github.com/yapplabs/ember-modal-dialog/pull/10) ([samselikoff](https://github.com/samselikoff))
 
 ## [0.2.0](https://github.com/yapplabs/ember-modal-dialog/tree/0.2.0) (2015-04-05)

diff --git a/index.js b/index.js
@@ -9,6 +9,7 @@ module.exports = {
   name: 'ember-modal-dialog',
 
   init: function() {
+    this._super.init && this._super.init.apply(this, arguments);
     var checker = new VersionChecker(this);
     if (!checker.for('ember-cli', 'npm').isAbove('0.2.6')) {
       console.warn("Warning: ember-modal-dialog requires ember-cli >= 0.2.6 "

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-modal-dialog",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "An ember-cli addon for implementing modal dialogs",
   "directories": {
     "doc": "doc",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "ember-cli-babel": "^5.1.3",
-    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars": "1.0.3",
     "ember-cli-version-checker": "^1.1.4",
     "ember-wormhole": "^0.3.4"
   },