From 1dbdad66605e0cc16aa00fb275537b9c75c16820 Mon Sep 17 00:00:00 2001
From: Fran Dios <frankdiox@gmail.com>
Date: Thu, 10 Dec 2015 12:31:21 +0900
Subject: [PATCH 1/2] fix(ons-back-button): Closes #1104

---
 core/lib/navigator-page.es6 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/lib/navigator-page.es6 b/core/lib/navigator-page.es6
index a16f518402..d7c0c55a3a 100644
--- a/core/lib/navigator-page.es6
+++ b/core/lib/navigator-page.es6
@@ -39,6 +39,10 @@ limitations under the License.
       this.initialContent = params.initialContent;
       this.backButton = util.findChildRecursively(this.element, 'ons-back-button');
 
+      if (this.backButton) {
+        CustomElements.upgrade(this.backButton);
+      }
+
       // Block events while page is being animated to stop scrolling, pressing buttons, etc.
       this._blockEvents = (event) => {
         if (this.navigator._isPopping || this.navigator._isPushing) {

From a84abd78426e593ba168428bb0434aa8d28c2480 Mon Sep 17 00:00:00 2001
From: Fran Dios <frankdiox@gmail.com>
Date: Thu, 10 Dec 2015 12:33:04 +0900
Subject: [PATCH 2/2] style(ons-back-button): avoid eslint warning in tests

---
 core/elements/ons-back-button.spec.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/elements/ons-back-button.spec.es6 b/core/elements/ons-back-button.spec.es6
index 9416faa664..22879ee038 100644
--- a/core/elements/ons-back-button.spec.es6
+++ b/core/elements/ons-back-button.spec.es6
@@ -129,11 +129,11 @@ describe('OnsBackButtonElement', () => {
         onTransitionEnd: () => {
           let element = nav.querySelector('ons-back-button');
           element.setAttribute('on-transition-end',
-            'function() {\
+            `function() {\
               var localPromise = window.onTransitionEndCompleted;\
               window.onTransitionEndCompleted = null;\
               localPromise();\
-            }');
+            }`);
           element._onClick();
         }
       });