Fix existing tab-based whitespace in the codebase.

(imported from commit 3bd8f51d1bb303455597d238af47b1b5541aed04)
This commit is contained in:
Tim Abbott
2015-09-19 23:01:55 -07:00
parent 176e3f4a54
commit eff0d31dcd
5 changed files with 33 additions and 33 deletions

View File

@@ -39,9 +39,9 @@ def loc_to_abs_offset(loc_str):
# result = XLogFileSize * xlogid1 + xrecoff1 # result = XLogFileSize * xlogid1 + xrecoff1
# #
# xlog_internal.h says: # xlog_internal.h says:
# #define XLogSegSize ((uint32) XLOG_SEG_SIZE) # #define XLogSegSize ((uint32) XLOG_SEG_SIZE)
# #define XLogSegsPerFile (((uint32) 0xffffffff) / XLogSegSize) # #define XLogSegsPerFile (((uint32) 0xffffffff) / XLogSegSize)
# #define XLogFileSize (XLogSegsPerFile * XLogSegSize) # #define XLogFileSize (XLogSegsPerFile * XLogSegSize)
# #
# Since XLOG_SEG_SIZE is normally 16MB, XLogFileSize comes out to 0xFF000000 # Since XLOG_SEG_SIZE is normally 16MB, XLogFileSize comes out to 0xFF000000
return 0xFF000000 * int(xlog_file, 16) + int(file_offset, 16) return 0xFF000000 * int(xlog_file, 16) + int(file_offset, 16)

View File

@@ -76,7 +76,7 @@ exports.setup_page = function () {
domain: page_params.domain, domain: page_params.domain,
realm_restricted_to_domain: page_params.realm_restricted_to_domain, realm_restricted_to_domain: page_params.realm_restricted_to_domain,
realm_invite_required: page_params.realm_invite_required, realm_invite_required: page_params.realm_invite_required,
realm_invite_by_admins_only: page_params.realm_invite_by_admins_only realm_invite_by_admins_only: page_params.realm_invite_by_admins_only
}; };
var admin_tab = templates.render('admin_tab', options); var admin_tab = templates.render('admin_tab', options);
$("#administration").html(admin_tab); $("#administration").html(admin_tab);
@@ -175,24 +175,24 @@ exports.setup_page = function () {
}); });
$("#id_realm_invite_required").change(function () { $("#id_realm_invite_required").change(function () {
if(this.checked) { if(this.checked) {
$("#id_realm_invite_by_admins_only").removeAttr("disabled"); $("#id_realm_invite_by_admins_only").removeAttr("disabled");
$("#id_realm_invite_by_admins_only_label").removeClass("control-label-disabled"); $("#id_realm_invite_by_admins_only_label").removeClass("control-label-disabled");
} else { } else {
$("#id_realm_invite_by_admins_only").attr("disabled", true); $("#id_realm_invite_by_admins_only").attr("disabled", true);
$("#id_realm_invite_by_admins_only_label").addClass("control-label-disabled"); $("#id_realm_invite_by_admins_only_label").addClass("control-label-disabled");
} }
}); });
$(".administration").on("submit", "form.admin-realm", function (e) { $(".administration").on("submit", "form.admin-realm", function (e) {
var name_status = $("#admin-realm-name-status").expectOne(); var name_status = $("#admin-realm-name-status").expectOne();
var restricted_to_domain_status = $("#admin-realm-restricted-to-domain-status").expectOne(); var restricted_to_domain_status = $("#admin-realm-restricted-to-domain-status").expectOne();
var invite_required_status = $("#admin-realm-invite-required-status").expectOne(); var invite_required_status = $("#admin-realm-invite-required-status").expectOne();
var invite_by_admins_only_status = $("#admin-realm-invite-by-admins-only-status").expectOne(); var invite_by_admins_only_status = $("#admin-realm-invite-by-admins-only-status").expectOne();
name_status.hide(); name_status.hide();
restricted_to_domain_status.hide(); restricted_to_domain_status.hide();
invite_required_status.hide(); invite_required_status.hide();
invite_by_admins_only_status.hide(); invite_by_admins_only_status.hide();
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@@ -200,23 +200,23 @@ exports.setup_page = function () {
var new_name = $("#id_realm_name").val(); var new_name = $("#id_realm_name").val();
var new_restricted = $("#id_realm_restricted_to_domain").prop("checked"); var new_restricted = $("#id_realm_restricted_to_domain").prop("checked");
var new_invite = $("#id_realm_invite_required").prop("checked"); var new_invite = $("#id_realm_invite_required").prop("checked");
var new_invite_by_admins_only = $("#id_realm_invite_by_admins_only").prop("checked"); var new_invite_by_admins_only = $("#id_realm_invite_by_admins_only").prop("checked");
var url = "/json/realm"; var url = "/json/realm";
var data = { var data = {
name: JSON.stringify(new_name), name: JSON.stringify(new_name),
restricted_to_domain: JSON.stringify(new_restricted), restricted_to_domain: JSON.stringify(new_restricted),
invite_required: JSON.stringify(new_invite), invite_required: JSON.stringify(new_invite),
invite_by_admins_only: JSON.stringify(new_invite_by_admins_only) invite_by_admins_only: JSON.stringify(new_invite_by_admins_only)
}; };
channel.patch({ channel.patch({
url: url, url: url,
data: data, data: data,
success: function (data) { success: function (data) {
if (data.name !== undefined) { if (data.name !== undefined) {
ui.report_success("Name changed!", name_status); ui.report_success("Name changed!", name_status);
} }
if (data.restricted_to_domain !== undefined) { if (data.restricted_to_domain !== undefined) {
if (data.restricted_to_domain) { if (data.restricted_to_domain) {
ui.report_success("New users must have @" + page_params.domain + " e-mails!", restricted_to_domain_status); ui.report_success("New users must have @" + page_params.domain + " e-mails!", restricted_to_domain_status);
@@ -224,23 +224,23 @@ exports.setup_page = function () {
else { else {
ui.report_success("New users may have arbitrary e-mails!", restricted_to_domain_status); ui.report_success("New users may have arbitrary e-mails!", restricted_to_domain_status);
} }
} }
if (data.invite_required !== undefined) { if (data.invite_required !== undefined) {
if (data.invite_required) { if (data.invite_required) {
ui.report_success("New users must be invited by e-mail!", invite_required_status); ui.report_success("New users must be invited by e-mail!", invite_required_status);
} }
else { else {
ui.report_success("New users may sign up online!", invite_required_status); ui.report_success("New users may sign up online!", invite_required_status);
} }
} }
if (data.invite_by_admins_only !== undefined) { if (data.invite_by_admins_only !== undefined) {
if (data.invite_by_admins_only) { if (data.invite_by_admins_only) {
ui.report_success("New users must be invited by an admin!", invite_by_admins_only_status); ui.report_success("New users must be invited by an admin!", invite_by_admins_only_status);
} }
else { else {
ui.report_success("Any user may now invite new users!", invite_by_admins_only_status); ui.report_success("Any user may now invite new users!", invite_by_admins_only_status);
} }
} }
}, },
error: function (xhr, error) { error: function (xhr, error) {
ui.report_error("Failed!", xhr, name_status); ui.report_error("Failed!", xhr, name_status);

View File

@@ -15,11 +15,11 @@ _.each(emoji_names, function (value) {
}); });
exports.update_emojis = function update_emojis(realm_emojis) { exports.update_emojis = function update_emojis(realm_emojis) {
// Copy the default emoji list and add realm-specific emoji to it // Copy the default emoji list and add realm-specific emoji to it
exports.emojis = default_emojis.slice(0); exports.emojis = default_emojis.slice(0);
_.each(realm_emojis, function (url, name) { _.each(realm_emojis, function (url, name) {
exports.emojis.push({emoji_name:name, emoji_url: url}); exports.emojis.push({emoji_name:name, emoji_url: url});
}); });
exports.emojis_by_name = {}; exports.emojis_by_name = {};
_.each(exports.emojis, function (emoji) { _.each(exports.emojis, function (emoji) {
exports.emojis_by_name[emoji.emoji_name] = emoji.emoji_url; exports.emojis_by_name[emoji.emoji_name] = emoji.emoji_url;

View File

@@ -1,9 +1,9 @@
var ct = require('js/composebox_typeahead.js'); var ct = require('js/composebox_typeahead.js');
var people_in_realm = [{email: 'othello@zulip.com', full_name: "Othello, Moor of Venice"}, var people_in_realm = [{email: 'othello@zulip.com', full_name: "Othello, Moor of Venice"},
{email: 'cordelia@zulip.com', full_name: "Cordelia Lear"}]; {email: 'cordelia@zulip.com', full_name: "Cordelia Lear"}];
var emoji_list = [{emoji_name: "tada", emoji_url: "TBD"}, var emoji_list = [{emoji_name: "tada", emoji_url: "TBD"},
{emoji_name: "moneybags", emoji_url: "TBD"}]; {emoji_name: "moneybags", emoji_url: "TBD"}];
set_global('page_params', {people_list: people_in_realm}); set_global('page_params', {people_list: people_in_realm});
set_global('emoji', {emojis: emoji_list}); set_global('emoji', {emojis: emoji_list});
@@ -19,8 +19,8 @@ set_global('emoji', {emojis: emoji_list});
}()); }());
(function test_begins_typeahead () { (function test_begins_typeahead () {
// Stub out split_at_cursor that uses $(':focus') // Stub out split_at_cursor that uses $(':focus')
ct.split_at_cursor = function (word) { return [word, '']; }; ct.split_at_cursor = function (word) { return [word, '']; };
var begin_typehead_this = {options: {completions: {emoji: true, var begin_typehead_this = {options: {completions: {emoji: true,
mention: true}}}; mention: true}}};

View File

@@ -97,8 +97,8 @@ casper.waitUntilVisible('.edit_bot_form[data-email="1-bot@zulip.com"]', function
// 'Rome' // 'Rome'
// ); // );
casper.test.assertEqual( casper.test.assertEqual(
common.get_form_field_value(form_sel + ' [name=bot_name]'), common.get_form_field_value(form_sel + ' [name=bot_name]'),
'Bot 1' 'Bot 1'
); );
}); });