Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
52e9c74
Move navigation rendering to template
angusmcleod Oct 20, 2023
fc9128e
Bump version
angusmcleod Oct 20, 2023
769a0e1
Merge in main
merefield Nov 7, 2023
cfbf2e0
Category map fixed?
merefield Nov 7, 2023
ad37b24
working
merefield Nov 7, 2023
7c88956
wip
merefield Nov 8, 2023
aedc048
kind of working but lots to do
merefield Nov 9, 2023
c34bec8
continued wip
merefield Nov 9, 2023
56b2542
improvements on transitions, bug fixes
merefield Nov 10, 2023
032bd2b
properly remove previous markers
merefield Nov 10, 2023
edd017d
wip
merefield Nov 10, 2023
2819af3
more wip
merefield Nov 10, 2023
bfb4e9a
add users map support to glimmer component
merefield Nov 10, 2023
50b6c1d
user profile location wip
merefield Nov 11, 2023
e4dcb62
user profile map working
merefield Nov 11, 2023
5230782
restore working map filter, fix user card presentation
merefield Nov 11, 2023
79a42bd
fix users map
merefield Nov 11, 2023
8b9be69
remove unnecesary connector
merefield Nov 11, 2023
66f533f
cleanup
merefield Nov 11, 2023
fe4e826
convert hamburger link update to sidebar api and rename
merefield Nov 11, 2023
08ce61b
fix height of user map
merefield Nov 11, 2023
0c2e53b
linting
merefield Nov 11, 2023
09b9d14
fix autocomplete of user location preference
merefield Nov 12, 2023
b1f4825
linting
merefield Nov 12, 2023
d3157bd
linting
merefield Nov 12, 2023
59f26c5
fix tests
merefield Nov 12, 2023
07a261f
remove unused widgets
merefield Nov 12, 2023
7c11206
add search capability wip
merefield Nov 13, 2023
57301a9
fix topic map
merefield Nov 13, 2023
fbc4905
refine search
merefield Nov 13, 2023
3af8485
linting
merefield Nov 13, 2023
17a5e2d
bump patch
merefield Nov 13, 2023
452779d
remove map search widget
merefield Nov 13, 2023
ae13bb2
Add a compatibility file
merefield Nov 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1.999: ee6a34482cc35006a11dc4acb338ee7c998c5774
4 changes: 2 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ RSpec/DescribeClass:

AllCops:
Exclude:
- '**/gems/**/*'
- '**/vendor/**/*'
- "**/gems/**/*"
- "**/vendor/**/*"
10 changes: 2 additions & 8 deletions assets/javascripts/discourse/components/location-selector.js.es6
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from "../lib/location-utilities";
import { observes } from "discourse-common/utils/decorators";
import TextField from "discourse/components/text-field";
import { findRawTemplate } from "discourse-common/lib/raw-templates";

export default TextField.extend({
autocorrect: false,
Expand All @@ -22,17 +23,10 @@ export default TextField.extend({
val = location;
}

window.__DISCOURSE_RAW_TEMPLATES = requirejs(
"discourse-common/lib/raw-templates"
).__DISCOURSE_RAW_TEMPLATES;

let template =
window.__DISCOURSE_RAW_TEMPLATES["javascripts/location-autocomplete"];

$(self.element)
.val(val)
.autocomplete({
template,
template: findRawTemplate("javascripts/location-autocomplete"),
single: true,
updateData: false,

Expand Down
102 changes: 102 additions & 0 deletions assets/javascripts/discourse/components/locations-map.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<div
{{did-insert this.setup}}
{{did-update this.setup @category}}
id="locations-map"
class="locations-map {{if this.expanded 'expanded'}}"
>
{{#if this.showExpand}}
<button
class="widget-button btn btn-map map-expand"
type="button"
{{on "click" this.toggleExpand}}
>{{d-icon this.mapToggle}}</button>
{{/if}}
<button
class="widget-button btn btn-map map-attribution"
type="button"
{{on "click" this.toggleAttribution}}
>{{d-icon "info"}}</button>
{{#if this.showEditButton}}
<button
class="widget-button btn btn-map category-edit"
type="button"
{{on "click" this.editCategory}}
>{{d-icon "wrench"}}</button>
{{/if}}
<div class="map-search">
{{#if this.isMultipleLocations}}
<input
type="text"
value={{this.searchFilter}}
{{on "input" this.filterLocations}}
/>
<span class="search-filter-type">
<span>
<label for="name">
<input
type="radio"
id="name"
name="filter_type"
value="name"
{{on "input" this.changeFilterType}}
checked="checked"
/>
{{i18n "map.search.name"}}
</label>
</span>
{{#if this.isUserListType}}
<span>
<label for="username">
<input
type="radio"
id="username"
name="filter_type"
value="username"
{{on "input" this.changeFilterType}}
/>
{{i18n "map.search.username"}}
</label>
</span>
{{/if}}
{{#if this.isTopicListType}}
<span>
<label for="address">
<input
type="radio"
id="address"
name="filter_type"
value="address"
{{on "input" this.changeFilterType}}
/>
{{i18n "map.search.address"}}
</label>
</span>
<span>
<label for="street">
<input
type="radio"
id="street"
name="filter_type"
value="street"
{{on "input" this.changeFilterType}}
/>
{{i18n "map.search.street"}}
</label>
</span>
<span>
<label for="city">
<input
type="radio"
id="city"
name="filter_type"
value="city"
{{on "input" this.changeFilterType}}
/>
{{i18n "map.search.city"}}
</label>
</span>
{{/if}}
</span>
{{/if}}
</div>
</div>
Loading