diff --git a/ionic/components/searchbar/searchbar.ts b/ionic/components/searchbar/searchbar.ts index 8aabaa7211..e99fbae465 100644 --- a/ionic/components/searchbar/searchbar.ts +++ b/ionic/components/searchbar/searchbar.ts @@ -42,7 +42,7 @@ import {Icon} from '../icon/icon'; '', directives: [FORM_DIRECTIVES, NgIf, NgClass, Icon] }) -export class SearchBar extends Ion { +export class Searchbar extends Ion { /** * @private */ diff --git a/ionic/components/searchbar/test/floating/e2e.ts b/ionic/components/searchbar/test/floating/e2e.ts index 681cfd92dc..80da38ae4e 100644 --- a/ionic/components/searchbar/test/floating/e2e.ts +++ b/ionic/components/searchbar/test/floating/e2e.ts @@ -1,25 +1,25 @@ it('default should focus', function() { - element(by.css('.e2eDefaultFloatingSearchBar input')).sendKeys("AA"); + element(by.css('.e2eDefaultFloatingSearchbar input')).sendKeys("AA"); }); it('custom placeholder should focus', function() { - element(by.css('.e2eCustomPlaceholderFloatingSearchBar input')).sendKeys("BB"); + element(by.css('.e2eCustomPlaceholderFloatingSearchbar input')).sendKeys("BB"); }); it('default cancel button should focus', function() { - element(by.css('.e2eDefaultCancelButtonFloatingSearchBar input')).sendKeys("CC"); + element(by.css('.e2eDefaultCancelButtonFloatingSearchbar input')).sendKeys("CC"); }); it('custom cancel button should focus', function() { - element(by.css('.e2eCustomCancelButtonFloatingSearchBar input')).sendKeys("DD"); + element(by.css('.e2eCustomCancelButtonFloatingSearchbar input')).sendKeys("DD"); }); it('custom cancel action should focus', function() { - element(by.css('.e2eCustomCancelActionFloatingSearchBar input')).sendKeys("FF"); + element(by.css('.e2eCustomCancelActionFloatingSearchbar input')).sendKeys("FF"); }); // TODO - this test will work on iOS but fail on Android // it('custom cancel action should alert', function() { -// element(by.css('.e2eCustomCancelActionFloatingSearchBar .searchbar-cancel')).click(); +// element(by.css('.e2eCustomCancelActionFloatingSearchbar .searchbar-cancel')).click(); // }); diff --git a/ionic/components/searchbar/test/floating/main.html b/ionic/components/searchbar/test/floating/main.html index da3e0c7174..eedd8d323f 100644 --- a/ionic/components/searchbar/test/floating/main.html +++ b/ionic/components/searchbar/test/floating/main.html @@ -1,18 +1,18 @@
Search - Default
- +
Search - Custom Placeholder
- +
Search - Default Cancel Button
- +
Search - Custom Cancel Button Danger
- +
Search - Custom Cancel Action
- +
Clicked custom action with input = {{customCancelAction}} diff --git a/ionic/config/directives.ts b/ionic/config/directives.ts index 6f7ae7b6f0..2eec59b01b 100644 --- a/ionic/config/directives.ts +++ b/ionic/config/directives.ts @@ -23,7 +23,7 @@ import {TextInput, TextInputElement} from '../components/text-input/text-input'; import {Label} from '../components/text-input/label'; import {Segment, SegmentButton} from '../components/segment/segment'; import {RadioGroup, RadioButton} from '../components/radio/radio'; -import {SearchBar} from '../components/searchbar/searchbar'; +import {Searchbar} from '../components/searchbar/searchbar'; import {Nav} from '../components/nav/nav'; import {NavPush, NavPop} from '../components/nav/nav-push'; import {NavRouter} from '../components/nav/nav-router'; @@ -76,7 +76,7 @@ export const IONIC_DIRECTIVES = [ Icon, // Forms - SearchBar, + Searchbar, Segment, SegmentButton, Checkbox,