From 1809ce2cacb67a2014d60bbb559469d0b154e3aa Mon Sep 17 00:00:00 2001 From: Andy Joslin Date: Wed, 9 Apr 2014 15:16:45 -0600 Subject: [PATCH] style(ionRefresher): pulling-text, refreshing-text default to ' ' Fixes #1052. --- js/ext/angular/src/directive/ionicContent.js | 6 +++--- js/ext/angular/test/directive/ionicRefresher.unit.js | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index 50aa10cb76..e9799fc4b4 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -220,9 +220,9 @@ function($timeout, $controller, $ionicBind) { '
' + '
' + '' + - '
' + + '
' + '' + - '
' + + '
' + '
' + '
', compile: function($element, $attrs) { @@ -362,7 +362,7 @@ function($timeout, $controller, $ionicBind) { //Check bounds on start, after scrollView is fully rendered setTimeout(checkBounds); scrollCtrl.$element.on('scroll', checkBounds); - + function checkInfiniteBounds() { if (infiniteScrollCtrl.isLoading) return; diff --git a/js/ext/angular/test/directive/ionicRefresher.unit.js b/js/ext/angular/test/directive/ionicRefresher.unit.js index 9c14abd07c..32f6260d80 100644 --- a/js/ext/angular/test/directive/ionicRefresher.unit.js +++ b/js/ext/angular/test/directive/ionicRefresher.unit.js @@ -86,9 +86,13 @@ describe('ionRefresher directive', function() { expect(el[0].querySelector('.icon.icon-refreshing.monkey-icon')).toBeTruthy(); }); - it('should have no text by default', function() { + it('should have   pulling-text by default', function() { var el = setup(); - expect(el.text().trim()).toBe(''); + expect(el[0].querySelector('.text-pulling').innerHTML).toBe(' '); + }); + it('should have   refreshing-text by default', function() { + var el = setup(); + expect(el[0].querySelector('.text-refreshing').innerHTML).toBe(' '); }); it('should allow pullingText', function() { var el = setup('pulling-text="{{2+2}} some text"');