From 042e06111334b3aeda57cbedb8b7769fce093010 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Mon, 18 Nov 2013 22:18:38 -0600 Subject: [PATCH] Close to all tests passing --- dist/js/ionic.js | 4 +--- js/utils/events.js | 4 +--- test/js/views/tabBar.unit.js | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dist/js/ionic.js b/dist/js/ionic.js index 29730db161..176ccafe98 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -209,9 +209,7 @@ window.ionic = { // Trigger a new event trigger: function(eventType, data) { - var event = document.createEvent('Event'); - event.initEvent(eventType, true, true); - event.detail = data; + var event = new CustomEvent(eventType, { detail: data }); // Make sure to trigger the event on the given target, or dispatch it from // the window if we don't have an event target diff --git a/js/utils/events.js b/js/utils/events.js index f85ed0c00c..d7d9d6a878 100644 --- a/js/utils/events.js +++ b/js/utils/events.js @@ -16,9 +16,7 @@ // Trigger a new event trigger: function(eventType, data) { - var event = document.createEvent('Event'); - event.initEvent(eventType, true, true); - event.detail = data; + var event = new CustomEvent(eventType, { detail: data }); // Make sure to trigger the event on the given target, or dispatch it from // the window if we don't have an event target diff --git a/test/js/views/tabBar.unit.js b/test/js/views/tabBar.unit.js index afeb8120d6..128cfb2973 100644 --- a/test/js/views/tabBar.unit.js +++ b/test/js/views/tabBar.unit.js @@ -21,9 +21,9 @@ describe('TabBar view', function() { }); it('Should trim title', function() { - expect(items[0].el.innerText.trim()).toEqual(items[0].getTitle()); - expect(items[1].el.innerText.trim()).toEqual(items[1].getTitle()); - expect(items[2].el.innerText.trim()).toEqual(items[2].getTitle()); + expect(items[0].el.textContent.trim()).toEqual(items[0].getTitle()); + expect(items[1].el.textContent.trim()).toEqual(items[1].getTitle()); + expect(items[2].el.textContent.trim()).toEqual(items[2].getTitle()); }); it('Should select', function() {