codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'categories'

Browse source
This commit is contained in:
Neil Lalonde 2013-04-03 17:50:42 -04:00
commit 68e9a727b8
4 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/discourse/views/combobox_view.js
View file

@ -42,6 +42,18 @@ Discourse.ComboboxView = Discourse.View.extend({
_this = this; _this = this;
$elem = this.$(); $elem = this.$();
$elem.chosen({ template: this.template, disable_search_threshold: 5 }); $elem.chosen({ template: this.template, disable_search_threshold: 5 });
if (this.overrideWidths) {
// The Chosen plugin hard-codes the widths in style attrs. :<
$elem.chosen().next().removeAttr("style");
$elem.chosen().next().find('.chzn-drop').removeAttr("style");
$elem.chosen().next().find('.chzn-search input').removeAttr("style");
}
if (this.classNames && this.classNames.length > 0) {
// Apply the classes to Chosen's dropdown div too:
this.classNames.each( function(c) {
$elem.chosen().next().addClass(c);
});
}
$elem.change(function(e) { $elem.change(function(e) {
_this.set('value', $(e.target).val()); _this.set('value', $(e.target).val());
}); });

8
app/assets/javascripts/discourse/views/combobox_view_category.js
View file

@ -8,6 +8,8 @@
**/ **/
Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({ Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({
none: 'category.none', none: 'category.none',
classNames: ['combobox category-combobox'],
overrideWidths: true,
dataAttributes: ['color', 'text_color', 'description'], dataAttributes: ['color', 'text_color', 'description'],
valueBinding: Ember.Binding.oneWay('source'), valueBinding: Ember.Binding.oneWay('source'),
@ -15,11 +17,11 @@ Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({
if (!templateData.color) return text; if (!templateData.color) return text;
var result = "<span class='badge-category' style='background-color: #" + templateData.color + '; color: #' + var result = "<span class='badge-category' style='background-color: #" + templateData.color + '; color: #' +
templateData.text_color + ";' "; templateData.text_color + ";' >" + text + "</span>";
if (templateData.description && templateData.description !== 'null') { if (templateData.description && templateData.description !== 'null') {
result += "title=\"" + templateData.description + "\" "; result += '<div class="category-desc">' + templateData.description + '</div>';
} }
return result + ">" + text + "</span>"; return result;
} }
}); });

5
app/assets/javascripts/external/chosen.jquery.js vendored
View file

@ -592,6 +592,10 @@ Copyright (c) 2011 by Harvest
this.result_clear_highlight(); this.result_clear_highlight();
this.result_highlight = el; this.result_highlight = el;
this.result_highlight.addClass("highlighted"); this.result_highlight.addClass("highlighted");
/*
The following code causes jumpy behaviour while scrolling, and I don't see what problem it solves:
maxHeight = parseInt(this.search_results.css("maxHeight"), 10); maxHeight = parseInt(this.search_results.css("maxHeight"), 10);
visible_top = this.search_results.scrollTop(); visible_top = this.search_results.scrollTop();
visible_bottom = maxHeight + visible_top; visible_bottom = maxHeight + visible_top;
@ -602,6 +606,7 @@ Copyright (c) 2011 by Harvest
} else if (high_top < visible_top) { } else if (high_top < visible_top) {
return this.search_results.scrollTop(high_top); return this.search_results.scrollTop(high_top);
} }
*/
} }
}; };

23
app/assets/stylesheets/application/compose.css.scss
View file

@ -230,6 +230,7 @@
min-width: 1280px; min-width: 1280px;
.form-element { .form-element {
.chzn-container { .chzn-container {
width: 400px;
margin-top: 6px; margin-top: 6px;
a { a {
padding-top: 4px; padding-top: 4px;
@ -239,6 +240,28 @@
margin-top: 4px; margin-top: 4px;
} }
} }
.category-combobox {
.category-desc {
margin: 8px 8px 0px 8px;
font-size: 12px;
}
width: 430px;
@include medium-width { width: 285px; }
@include small-width { width: 220px; }
.chzn-drop {
left: -9000px;
width: 428px;
@include medium-width { width: 283px; }
@include small-width { width: 218px; }
}
.chzn-search input {
width: 398px;
@include medium-width { width: 253px; }
@include small-width { width: 188px; }
}
}
} }
#reply-title { #reply-title {
margin-right: 10px; margin-right: 10px;