Merge pull request #1107 from OnsenUI/back-button-fix

Back button fix
OnsenUI · Dec 10, 2015 · bb93d7b · bb93d7b
2 parents d236ded + a84abd7
commit bb93d7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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();
         }
       });

diff --git 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) {