Skip to content
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

Jump to bottom

Restores modal to original size #18

Merged
merged 1 commit into from
Oct 1, 2018
Merged

Restores modal to original size #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion app/javascript/packs/brave_rewards_banner.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ export default class BraveRewardsBanner extends React.Component {
this.updateWindowDimensions = this.updateWindowDimensions.bind(this);
}

componentDidMount(){
componentWillMount(){
this.modalize();
}

componentDidMount(){
this.fetchSiteBanner();
document.getElementsByClassName('brave-rewards-banner-control-bar-save-button')[0].addEventListener("click", this.handleSave);
window.addEventListener('resize', this.updateWindowDimensions);
Expand All @@ -62,6 +65,9 @@ export default class BraveRewardsBanner extends React.Component {
}

close(){
document.getElementsByClassName("modal-panel")[0].style.maxWidth = '40rem';
document.getElementsByClassName("modal-panel")[0].style.padding = '2rem 2rem';
document.getElementsByClassName("modal-panel--content")[0].style.padding = '1rem 1rem 0 1rem';
document.getElementsByClassName("modal-panel--close js-deny")[0].click();
}

Expand Down
13 changes: 4 additions & 9 deletions app/javascript/packs/brave_rewards_banner_container.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ export default class BraveRewardsBannerContainer extends React.Component {

this.state = {
mode: 'Edit',
isIntro: true,
isIntro: false,
}

this.setMode = this.setMode.bind(this)
}

componentDidMount(){
componentWillMount(){
this.modalize();
}

Expand Down Expand Up @@ -116,14 +116,9 @@ export default class BraveRewardsBannerContainer extends React.Component {

export function renderBraveRewardsBannerContainer(headline, intro) {

let props = {
headline: headline,
intro: intro
}

ReactDOM.render(
<BraveRewardsBannerContainer {...props}/>,
document.getElementById("react-container").parentElement.parentElement
<BraveRewardsBannerContainer/>,
document.getElementById("rewards-banner-container").parentElement.parentElement
)
}

Expand Down
15 changes: 10 additions & 5 deletions app/javascript/publishers/home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,16 @@ document.addEventListener('DOMContentLoaded', function() {
}, false);

instantDonationButton.addEventListener("click", function(event) {
document.getElementsByClassName('container')[0].style.padding = 0;
document.getElementsByClassName('container')[0].style.width = '840px';
let headline = document.getElementsByClassName('translations')[0].getAttribute('headline')
let intro = document.getElementsByClassName('translations')[0].getAttribute('intro')
renderBraveRewardsBannerContainer(headline, intro);

document.getElementById("open-banner-button").onclick = function() {
renderBraveRewardsBannerContainer();
};

document.getElementsByClassName("modal-panel--close js-deny")[0].onclick = function(e) {
document.getElementsByClassName("modal-panel")[0].style.maxWidth = '40rem';
document.getElementsByClassName("modal-panel")[0].style.padding = '2rem 2rem';
document.getElementsByClassName("modal-panel--content")[0].style.padding = '1rem 1rem 0 1rem';
};
}, false);

updateContactForm.addEventListener('submit', function(event) {
Expand Down
15 changes: 11 additions & 4 deletions app/views/publishers/_instant_donation_modal.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
.instant-donation-container id="instant-donation-container"
.container id=current_publisher.id
.translations headline=t(".headline") intro=t(".intro")
.react-container id="react-container"
.modal id="rewards_banner_intro_modal" role="dialog" tabindex="-1"
.modal-dialog
.modal-header id="instant-donation-modal-selection"
center
= image_tag "icn-donation-jar@1x.png", id: 'icn-donation-jar'
h2.modal-title = t ".headline"
p = t ".intro"
= link_to(t(".continue"), "#", class: 'btn btn-primary', id: "open-banner-button")
center
.modal-header style="display: none;" id="rewards-banner-container"
= hidden_field_tag 'publisher_id', current_publisher.id