paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint: Require space after // in JS comments.

Browse Source
This commit is contained in:
Tim Abbott
2016-06-09 13:44:24 -07:00
parent a09b950097
commit eba0d6339f
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/composebox_typeahead.js
View File

@@ -263,7 +263,7 @@ exports.content_typeahead_selected = function (item) {
var rest = pieces[1]; var rest = pieces[1];
if (this.completing === 'emoji') { if (this.completing === 'emoji') {
//leading and trailing spaces are required for emoji, except if it begins a message. // leading and trailing spaces are required for emoji, except if it begins a message.
if (beginning.lastIndexOf(":") === 0 || beginning.charAt(beginning.lastIndexOf(":") - 1) === " ") { if (beginning.lastIndexOf(":") === 0 || beginning.charAt(beginning.lastIndexOf(":") - 1) === " ") {
beginning = beginning.replace(/:\S+$/, "") + ":" + item.emoji_name + ": "; beginning = beginning.replace(/:\S+$/, "") + ":" + item.emoji_name + ": ";
} else { } else {

4
static/js/message_edit.js
View File

@@ -3,7 +3,7 @@ var exports = {};
var currently_editing_messages = {}; var currently_editing_messages = {};
//returns true if the edit task should end. // Returns true if the edit task should end.
exports.save = function (row, from_topic_edited_only) { exports.save = function (row, from_topic_edited_only) {
var msg_list = current_msg_list; var msg_list = current_msg_list;
var message_id; var message_id;
@@ -79,7 +79,7 @@ function handle_edit_keydown(from_topic_edited_only, e) {
message_edit.end(row); message_edit.end(row);
} }
} else if (e.target.id === "message_edit_topic" && code === 13) { } else if (e.target.id === "message_edit_topic" && code === 13) {
//hitting enter in topic field isn't so great. // Hitting enter in topic field isn't so great.
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
} }

2
static/js/typeahead_helper.js
View File

@@ -143,7 +143,7 @@ exports.sort_recipients = function (matches, query) {
}; };
exports.sort_emojis = function (matches, query) { exports.sort_emojis = function (matches, query) {
//TODO: sort by category in v2 // TODO: sort by category in v2
var results = prefix_sort(query, matches, function (x) { return x.emoji_name; }); var results = prefix_sort(query, matches, function (x) { return x.emoji_name; });
return results.matches.concat(results.rest); return results.matches.concat(results.rest);
}; };

2
tools/lint-all
View File

@@ -145,6 +145,8 @@ js_rules = [
# This rule is constructed with + to avoid triggering on itself # This rule is constructed with + to avoid triggering on itself
{'pattern': " =" + '[^ =>~"]', {'pattern': " =" + '[^ =>~"]',
'description': 'Missing whitespace after "="'}, 'description': 'Missing whitespace after "="'},
{'pattern': '^[ ]*//[A-Za-z0-9]',
'description': 'Missing space after // in comment'},
{'pattern': 'else{$', {'pattern': 'else{$',
'description': 'Missing space between else and {'}, 'description': 'Missing space between else and {'},
] + whitespace_rules ] + whitespace_rules