Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-13 22:41:32 -05:00
Code Issues Activity

Merge pull request #4872 from jaswilli/autofocus

Browse source 
Do not add autofocus attribute unless set to focus
This commit is contained in:
Hannah Wolfe 2015-01-31 19:03:12 +00:00
commit 950f9c29b3
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/client/components/gh-trim-focus-input.js
View file

@ -5,16 +5,20 @@ var TrimFocusInput = Ember.TextField.extend({
attributeBindings: ['autofocus'],
autofocus: Ember.computed(function () {
return (device.ios()) ? false : 'autofocus';
if (this.get('focus')) {
return (device.ios()) ? false : 'autofocus';
}
return false;
}),
setFocus: function () {
didInsertElement: function () {
// This fix is required until Mobile Safari has reliable
// autofocus, select() or focus() support
if (this.focus && !device.ios()) {
if (this.get('focus') && !device.ios()) {
this.$().val(this.$().val()).focus();
}
}.on('didInsertElement'),
},
focusOut: function () {
var text = this.$().val();

22
core/test/client/unit/components/gh-trim-focus-input_test.js
View file

@ -15,4 +15,26 @@ describeComponent('gh-trim-focus-input', function () {
component.$().focusout();
expect(component.$().val()).to.equal('some random stuff');
});
it('does not have the autofocus attribute if not set to focus', function () {
var component = this.subject({
value: 'some text',
focus: false
});
this.render();
expect(component.$().attr('autofocus')).to.not.be.ok;
});
it('has the autofocus attribute if set to focus', function () {
var component = this.subject({
value: 'some text',
focus: true
});
this.render();
expect(component.$().attr('autofocus')).to.be.ok;
});
});