Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: tabindex was not set on the category chooser when creating a topic.

This commit is contained in:
Robin Ward 2014-09-04 13:50:32 -04:00
parent 742e2b1fa9
commit 52e25c9272
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/templates/composer.js.handlebars
View File

@ -16,7 +16,7 @@
{{#if canEdit}} {{#if canEdit}}
{{#if showEditReason}} {{#if showEditReason}}
<div class="edit-reason-input"> <div class="edit-reason-input">
{{text-field value=editReason tabindex="5" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}} {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
</div> </div>
{{else}} {{else}}
<a {{action displayEditReason}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a> <a {{action displayEditReason}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a>
@ -44,7 +44,7 @@
{{#unless model.privateMessage}} {{#unless model.privateMessage}}
<div class="category-input"> <div class="category-input">
{{category-chooser valueAttribute="id" value=model.categoryId scopedCategoryId=scopedCategoryId}} {{category-chooser valueAttribute="id" value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
{{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}} {{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}}
</div> </div>
{{#if model.archetype.hasOptions}} {{#if model.archetype.hasOptions}}
@ -59,7 +59,7 @@
<div class='textarea-wrapper'> <div class='textarea-wrapper'>
<div class='wmd-button-bar' id='wmd-button-bar'></div> <div class='wmd-button-bar' id='wmd-button-bar'></div>
<div id='wmd-preview-scroller'></div> <div id='wmd-preview-scroller'></div>
{{composer-text-area tabindex="3" value=model.reply}} {{composer-text-area tabindex="4" value=model.reply}}
{{popupInputTip validation=view.replyValidation shownAt=view.showReplyTip}} {{popupInputTip validation=view.replyValidation shownAt=view.showReplyTip}}
</div> </div>
<!-- keep the classes here in sync with post.js.handlebars --> <!-- keep the classes here in sync with post.js.handlebars -->
@ -81,8 +81,8 @@
{{#if currentUser}} {{#if currentUser}}
<div class='submit-panel'> <div class='submit-panel'>
<button {{action save}} tabindex="4" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n composer.title}}">{{model.saveText}}</button> <button {{action save}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n composer.title}}">{{model.saveText}}</button>
<a href='#' {{action cancel}} class='cancel' tabindex="4">{{i18n cancel}}</a> <a href='#' {{action cancel}} class='cancel' tabindex="6">{{i18n cancel}}</a>
</div> </div>
{{/if}} {{/if}}

5
app/assets/javascripts/discourse/views/combo-box.js.es6
View File

@ -8,6 +8,7 @@
**/ **/
export default Discourse.View.extend({ export default Discourse.View.extend({
tagName: 'select', tagName: 'select',
attributeBindings: ['tabindex'],
classNames: ['combobox'], classNames: ['combobox'],
valueAttribute: 'id', valueAttribute: 'id',
@ -74,8 +75,8 @@ export default Discourse.View.extend({
}, },
willClearRender: function() { willClearRender: function() {
var chosenId = "s2id_" + this.$().attr('id'); var elementId = "s2id_" + this.$().attr('id');
Ember.$("#" + chosenId).remove(); Ember.$("#" + elementId).remove();
} }
}); });