Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove url encoding from data-name attribute as we match via iteration 

(imported from commit 737418c430991414124daff41b62383284e86dc1)
This commit is contained in:
Leo Franchi 2013-03-28 17:27:48 -04:00
parent c4ed67b2d1
commit 9817ef3460
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zephyr/static/js/ui.js
View File

@ -988,7 +988,7 @@ $(function () {
$('#stream_filters li').on('click', 'a', function (e) {
var stream = $(e.target).parents('li').data('name');
narrow.by('stream', decodeURIComponent(stream), {select_first_unread: true});
narrow.by('stream', stream, {select_first_unread: true});
e.preventDefault();
});
@ -998,8 +998,7 @@ function sort_narrow_list() {
var items = $('#stream_filters li').get();
var parent = $('#stream_filters');
items.sort(function(a,b){
return decodeURIComponent($(a).attr('data-name')).localeCompare(
decodeURIComponent($(b).attr('data-name')));
return $(a).attr('data-name').localeCompare($(b).attr('data-name'));
});
parent.empty();
@ -1047,7 +1046,7 @@ exports.add_narrow_filter = function(name, type, uri) {
var swatch = $('<span/>').attr('id', "stream_sidebar_swatch_" + subs.stream_id(name))
.addClass('streamlist_swatch')
.css('background-color', subs.get_color(name)).html("&nbsp;");
list_item = $('<li>').attr('data-name', encodeURIComponent(name)).html(swatch);
list_item = $('<li>').attr('data-name', name).html(swatch);
list_item.append($('<a>').attr('href', uri)
.addClass('subscription_name')
.text(name)
@ -1064,12 +1063,11 @@ exports.get_count = function (type, name) {
};
exports.set_count = function (type, name, count) {
var encoded = encodeURIComponent(name);
var count_span = exports.get_filter_li(type, encoded).find('.count');
var count_span = exports.get_filter_li(type, name).find('.count');
var value_span = count_span.find('.value');
if (count === 0) {
return exports.clear_count(type, encoded);
return exports.clear_count(type, name);
}
count_span.show();