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

DEV: User UPPER_CASE for constants

This commit is contained in:
Robin Ward 2020-05-08 15:50:55 -04:00
parent da561a430d
commit 34e5f807ec
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/edit-category-settings.js
View File

@ -2,7 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
import { empty, and } from "@ember/object/computed";
import { setting } from "discourse/lib/computed";
import { buildCategoryPanel } from "discourse/components/edit-category-panel";
import { SearchPriorities } from "discourse/lib/constants";
import { SEARCH_PRIORITIES } from "discourse/lib/constants";
import Group from "discourse/models/group";
const categorySortCriteria = [];
@ -71,7 +71,7 @@ export default buildCategoryPanel("settings", {
searchPrioritiesOptions() {
const options = [];
Object.entries(SearchPriorities).forEach(entry => {
Object.entries(SEARCH_PRIORITIES).forEach(entry => {
const [name, value] = entry;
options.push({

4
app/assets/javascripts/discourse/app/lib/constants.js
View File

@ -1,7 +1,7 @@
// DO NOT EDIT THIS FILE!!!
// Update it by running `rake javascript:update_constants`
export const SearchPriorities = {
export const SEARCH_PRIORITIES = {
ignore: 1,
very_low: 2,
low: 3,
@ -10,4 +10,4 @@ export const SearchPriorities = {
very_high: 5
};
export const SearchPhraseRegexp = '"([^"]+)"';
export const SEARCH_PHRASE_REGEXP = '"([^"]+)"';

4
app/assets/javascripts/discourse/app/lib/highlight-search.js
View File

@ -1,4 +1,4 @@
import { SearchPhraseRegexp } from "discourse/lib/constants";
import { SEARCH_PHRASE_REGEXP } from "discourse/lib/constants";
import highlightHTML from "discourse/lib/highlight-html";
export const CLASS_NAME = "search-highlight";
@ -7,7 +7,7 @@ export default function(elem, term, opts = {}) {
if (!_.isEmpty(term)) {
// special case ignore "l" which is used for magic sorting
let words = _.reject(
term.match(new RegExp(`${SearchPhraseRegexp}|[^\\s]+`, "g")),
term.match(new RegExp(`${SEARCH_PHRASE_REGEXP}|[^\\s]+`, "g")),
t => t === "l"
);

4
app/assets/javascripts/discourse/app/routes/discovery-categories.js
View File

@ -8,7 +8,7 @@ import { defaultHomepage } from "discourse/lib/utilities";
import TopicList from "discourse/models/topic-list";
import { ajax } from "discourse/lib/ajax";
import PreloadStore from "discourse/lib/preload-store";
import { SearchPriorities } from "discourse/lib/constants";
import { SEARCH_PRIORITIES } from "discourse/lib/constants";
import { hash } from "rsvp";
import Site from "discourse/models/site";
@ -145,7 +145,7 @@ export function openNewCategoryModal(context) {
allow_badges: true,
topic_featured_link_allowed: true,
custom_fields: {},
search_priority: SearchPriorities.normal
search_priority: SEARCH_PRIORITIES.normal
});
showModal("edit-category", { model }).set("selectedTab", "general");

4
lib/tasks/javascript.rake
View File

@ -17,9 +17,9 @@ task 'javascript:update_constants' => :environment do
// DO NOT EDIT THIS FILE!!!
// Update it by running `rake javascript:update_constants`
export const SearchPriorities = #{Searchable::PRIORITIES.to_json};
export const SEARCH_PRIORITIES = #{Searchable::PRIORITIES.to_json};
export const SearchPhraseRegexp = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
export const SEARCH_PHRASE_REGEXP = '#{Search::PHRASE_MATCH_REGEXP_PATTERN}';
JS
output_path = "#{Rails.root}/app/assets/javascripts/discourse/app/lib/constants.js"