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

DEV: Remove unnecessary `getURL("/")` (#21103) 

Our `ajax()` prepends the protocol/host/subfolder path.
This commit is contained in:
Jarek Radosz 2023-04-15 14:34:25 +02:00 committed by GitHub
parent b8cf79895e
commit dd98ecb7d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/adapters/topic-list.js
View File

@ -1,11 +1,10 @@
import PreloadStore from "discourse/lib/preload-store"; import PreloadStore from "discourse/lib/preload-store";
import RestAdapter from "discourse/adapters/rest"; import RestAdapter from "discourse/adapters/rest";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import getURL from "discourse-common/lib/get-url";
export function finderFor(filter, params) { export function finderFor(filter, params) {
return function () { return function () {
let url = getURL("/") + filter + ".json"; let url = `/${filter}.json`;
if (params) { if (params) {
const urlSearchParams = new URLSearchParams(); const urlSearchParams = new URLSearchParams();
@ -22,6 +21,7 @@ export function finderFor(filter, params) {
url += `?${queryString}`; url += `?${queryString}`;
} }
} }
return ajax(url); return ajax(url);
}; };
} }

5
app/assets/javascripts/discourse/app/models/topic-list.js
View File

@ -5,7 +5,6 @@ import Session from "discourse/models/session";
import User from "discourse/models/user"; import User from "discourse/models/user";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { getOwner } from "discourse-common/lib/get-owner"; import { getOwner } from "discourse-common/lib/get-owner";
import getURL from "discourse-common/lib/get-url";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import { notEmpty } from "@ember/object/computed"; import { notEmpty } from "@ember/object/computed";
@ -123,9 +122,7 @@ const TopicList = RestModel.extend({
this.topics.filter((topic) => topic_ids.includes(topic.id)) this.topics.filter((topic) => topic_ids.includes(topic.id))
); );
const url = `${getURL("/")}${this.filter}.json?topic_ids=${topic_ids.join( const url = `/${this.filter}.json?topic_ids=${topic_ids.join(",")}`;
","
)}`;
return ajax({ url, data: this.params }).then((result) => { return ajax({ url, data: this.params }).then((result) => {
let i = 0; let i = 0;

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

@ -26,7 +26,7 @@ import { applyModelTransformations } from "discourse/lib/model-transformers";
export function loadTopicView(topic, args) { export function loadTopicView(topic, args) {
const data = deepMerge({}, args); const data = deepMerge({}, args);
const url = `${getURL("/t/")}${topic.id}`; const url = `/t/${topic.id}`;
const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json"; const jsonUrl = (data.nearPost ? `${url}/${data.nearPost}` : url) + ".json";
delete data.nearPost; delete data.nearPost;

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

@ -10,7 +10,6 @@ import { defaultHomepage } from "discourse/lib/utilities";
import { hash } from "rsvp"; import { hash } from "rsvp";
import { next } from "@ember/runloop"; import { next } from "@ember/runloop";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
import getURL from "discourse-common/lib/get-url";
import Session from "discourse/models/session"; import Session from "discourse/models/session";
const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, { const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
@ -57,7 +56,7 @@ const DiscoveryCategoriesRoute = DiscourseRoute.extend(OpenComposer, {
this.topics.filter((topic) => topic_ids.includes(topic.id)) this.topics.filter((topic) => topic_ids.includes(topic.id))
); );
const url = `${getURL("/")}latest.json?topic_ids=${topic_ids.join(",")}`; const url = `/latest.json?topic_ids=${topic_ids.join(",")}`;
return ajax({ url, data: this.params }).then((result) => { return ajax({ url, data: this.params }).then((result) => {
const topicIds = new Set(); const topicIds = new Set();