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

fix unescaped string 

improve tab "active" detection for categories
This commit is contained in:
Sam 2013-06-15 15:45:22 +10:00
parent 06b7085287
commit ce82d18df5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/commits.js.handlebars
View File

@ -13,9 +13,9 @@
</div> </div>
<div class="right"> <div class="right">
<span class="commit-message"><a {{bindAttr href="commitUrl"}} target="_blank">{{ commit.message }}</a></span><br/> <span class="commit-message"><a {{bindAttr href="commitUrl"}} target="_blank">{{ commit.message }}</a></span><br/>
<span class="commit-meta">{{i18n admin.commits.by}} <span class="committer-name">{{ commit.author.name }}</span> - <span class="commit-time">{{ timeAgo }}</span></span> <span class="commit-meta">{{i18n admin.commits.by}} <span class="committer-name">{{ commit.author.name }}</span> - <span class="commit-time">{{{ timeAgo }}}</span></span>
</div> </div>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
</div> </div>

2
app/assets/javascripts/discourse/models/nav_item.js
View File

@ -74,8 +74,6 @@ Discourse.NavItem.reopenClass({
filters: split.splice(1) filters: split.splice(1)
}; };
// if (countSummary && countSummary[name]) opts.count = countSummary[name];
return Discourse.NavItem.create(opts); return Discourse.NavItem.create(opts);
} }

2
app/assets/javascripts/discourse/views/nav_item_view.js
View File

@ -24,7 +24,7 @@ Discourse.NavItemView = Discourse.View.extend({
}.property("content.filter"), }.property("content.filter"),
isActive: function() { isActive: function() {
if (this.get("content.name").replace(' ','-') === this.get("controller.filterMode")) return "active"; if (this.get("content.name").toLowerCase().replace(' ','-') === this.get("controller.filterMode")) return "active";
return ""; return "";
}.property("content.name", "controller.filterMode"), }.property("content.name", "controller.filterMode"),