Skip to content

Commit

Permalink
Release 1.19.2 (#630)
Browse files Browse the repository at this point in the history
* Add reference to docker troubleshooting wiki in `CONTRIBUTING.md` (#625)

  - Add reference to docker troubleshooting wiki in contributing documentation

  - Update CONTRIBUTING.md

* Add listeners to close infowindow when another is opened (#628)

* CONTRIBUTING.md: Docker for Windows requirements

-  Docker Desktop for Window requires Windows 10 64-bit,
   "Professional" or "Enterprise" editions.

* Update dependencies June 2020 (#629)

  - dependencies: Bump geocoder, websocket-extensions

  - Gemfile.lock: Update rack to 2.2.3

Co-authored-by: Pierce Bala <[email protected]>
  • Loading branch information
DeeDeeG and piercebb authored Jul 8, 2020
1 parent 50dcc64 commit 6f80471
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 9 deletions.
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
https://help.github.com/articles/fork-a-repo/

### 2 Install Docker.
- **Windows 10:** https://store.docker.com/editions/community/docker-ce-desktop-windows
- **Windows 10 (Pro/Enterprise, 64-bit):** https://store.docker.com/editions/community/docker-ce-desktop-windows
- **macOS El Capitan 10.11 and newer:** https://store.docker.com/editions/community/docker-ce-desktop-mac

_(Older Mac or Windows PC? See [instructions for Docker Toolbox](https://github.com/RefugeRestrooms/refugerestrooms/wiki/How-to-use-Docker-Toolbox-with-Refuge-Restrooms).)_
_(Other Mac or Windows OS? See [instructions for Docker Toolbox](https://github.com/RefugeRestrooms/refugerestrooms/wiki/How-to-use-Docker-Toolbox-with-Refuge-Restrooms).)_

_(Running Linux? See [instructions for Docker CE on Linux](https://github.com/RefugeRestrooms/refugerestrooms/wiki/How-to-use-Docker-CE-on-Linux-with-Refuge-Restrooms).)_

Trouble with docker? The [Troubleshooting Docker wiki](https://github.com/RefugeRestrooms/refugerestrooms/wiki/Troubleshooting-Docker) outlines solutions for common errors.

### 3 Build the Docker Containers
Build the containers from any [terminal](https://github.com/RefugeRestrooms/refugerestrooms/wiki/What-is-a-Terminal-(or-%22Terminal-Emulator%22)%3F-How-do-I-run-text-based-commands-on-my-computer%3F) program with:
```
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem 'bugsnag'
gem 'coffee-rails', '~> 4.2'
gem 'country_select'
gem 'devise', '~> 4.6'
gem 'geocoder', '~> 1.2.1'
gem 'geocoder', '~> 1.6.1'
gem 'grape', '~> 1.3.0'
gem 'grape-swagger'
gem 'grape-kaminari'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ GEM
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
geocoder (1.2.14)
geocoder (1.6.3)
globalid (0.4.2)
activesupport (>= 4.2.0)
grape (1.3.1)
Expand Down Expand Up @@ -250,7 +250,7 @@ GEM
public_suffix (4.0.3)
puma (4.3.5)
nio4r (~> 2.0)
rack (2.2.2)
rack (2.2.3)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cors (1.1.1)
Expand Down Expand Up @@ -393,7 +393,7 @@ DEPENDENCIES
devise (~> 4.6)
dotenv-rails (~> 2.2.1)
factory_bot_rails (~> 4.8.2)
geocoder (~> 1.2.1)
geocoder (~> 1.6.1)
grape (~> 1.3.0)
grape-kaminari
grape-swagger
Expand Down
13 changes: 13 additions & 0 deletions app/javascript/packs/lib/maps.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const circleMarkerImage = "<%= helpers.image_path('marker-circle.png') %>";
const showMarkerImage = "<%= helpers.image_path('show-icon.png') %>";
let map;
let lastOpenedInfoWindow;
function initMap(x, y, image, draggable, callback){
image = typeof image !== 'undefined' ? image : currentLocationImage;
Expand Down Expand Up @@ -81,8 +82,20 @@ function placeMarker(lat, lng, content, number){
});

marker.addListener('click', function() {
closeLastOpenedInfoWindow();
infoWindow.open(map, marker);
lastOpenedInfoWindow = infoWindow;
});

google.maps.event.addListener(map, 'click', function(event) {
infoWindow.close();
});
}

function closeLastOpenedInfoWindow() {
if (lastOpenedInfoWindow) {
lastOpenedInfoWindow.close();
}
}

function generateContent(data){
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9211,9 +9211,9 @@ websocket-driver@>=0.5.1:
websocket-extensions ">=0.1.1"

websocket-extensions@>=0.1.1:
version "0.1.3"
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
version "0.1.4"
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==

[email protected]:
version "2.0.3"
Expand Down

0 comments on commit 6f80471

Please sign in to comment.