Skip to content

Fix iframe #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mbalcorta wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix iframe #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08fe242
Remove event cards and getjsonEvents function.
Mbalcorta Nov 22, 2017
a048caf
Placed Iframe initialization before Event map initialization.
Mbalcorta Nov 22, 2017
7c79760
update iframe.js
Mbalcorta Nov 22, 2017
d8428b6
Change vue to change template and target element based on href location.
Mbalcorta Nov 29, 2017
77a0d68
Remove iframe.js file.
Mbalcorta Nov 29, 2017
08070ef
Remove iframe instantiation.
Mbalcorta Nov 29, 2017
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
11 changes: 8 additions & 3 deletions src/components/EventMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ import mapboxgl from 'mapbox-gl';
mapboxgl.accessToken = 'pk.eyJ1Ijoia2VubmV0aHBlbm5pbmd0b24iLCJhIjoiY2l6bmJ3MmFiMDMzZTMzbDJtdGxkM3hveSJ9.w4iOGaL2vrIvETimSXUXsw';

export default function(store){
var isIframe = location.href.endsWith('iframe.html')
var el = isIframe ? "#event-map-iframe" : "#event-map"
var name = isIframe ? "event-map-iframe" : "#event-map"
var template = isIframe ? require('src/templates/Iframe.html') : require('src/templates/EventMap.html')

return new Vue({
el: '#event-map',
name: 'event-map',
template: require('src/templates/EventMap.html'),
el: el,
name: name,
template: template,
store,
data: {
mapRef: null,
Expand Down
265 changes: 0 additions & 265 deletions src/components/Iframe.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/initialize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import Header from 'components/Header';
import Footer from 'components/Footer';
import EventMap from 'components/EventMap';
import EventList from 'components/EventList';
import Iframe from 'components/Iframe';

// Load events data
store.dispatch('loadEvents')
Expand All @@ -24,7 +23,6 @@ store.dispatch('loadZips')
Header(store);
EventMap(store);
EventList(store);
Iframe(store);
Footer();

// Allow HMR updates
Expand Down