Commit 82505d84 authored by Curtis Adam's avatar Curtis Adam

Attempt to fix the arsnova iframes on iOS

parent 26eeaacb
......@@ -8,10 +8,6 @@
<template name="arsnovaAppModal">
<div class="modal" id="arsnovaAppModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
{{#if isArsnovaAppModalActive}}
<iframe src="https://arsnova.eu/mobile/">
</iframe>
{{/if}}
</div>
</div>
</template>
......@@ -12,15 +12,12 @@ Session.setDefault('arsnovaAppModalActive', false);
Template.cardSidebarItemArsnovaApp.events({
"click .showArsnovaApp": function () {
Session.set('arsnovaAppModalActive', true);
$('#arsnovaAppModal').modal('show');
}
});
Template.cardSidebarItemArsnovaApp.onCreated(function () {
if ($(window).width() >= 768) {
Session.set('arsnovaAppModalActive', true);
}
Session.set('arsnovaAppModalActive', false);
});
Template.cardSidebarItemArsnovaApp.onDestroyed(function () {
......@@ -41,11 +38,9 @@ Template.arsnovaAppModal.onRendered(function () {
$('#arsnovaAppModal').on('shown.bs.modal', function () {
$('.showArsnovaApp').attr('src', '/img/button/arsnova_app_pressed.png');
$('.showArsnovaApp').addClass('pressed');
if (!Session.get('arsnovaAppModalActive')) {
Session.set('arsnovaAppModalActive', true);
$('#arsnovaAppModal .modal-dialog').html('<iframe id="arsnovaApp" width="600px" height="800px" frameborder="0" src="https://arsnova.eu" sandbox="allow-scripts allow-same-origin"></iframe>');
}
});
});
Template.arsnovaAppModal.helpers({
isArsnovaAppModalActive: function () {
return Session.get('arsnovaAppModalActive');
}
});
......@@ -8,10 +8,6 @@
<template name="arsnovaClickModal">
<div class="modal" id="arsnovaClickModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
{{#if isArsnovaClickActive}}
<iframe src="https://arsnova.click">
</iframe>
{{/if}}
</div>
</div>
</template>
......@@ -12,15 +12,12 @@ Session.setDefault('arsnovaClickModalActive', false);
Template.cardSidebarItemArsnovaClick.events({
"click .showArsnovaClick": function () {
Session.set('arsnovaClickModalActive', true);
$('#arsnovaClickModal').modal('show');
}
});
Template.cardSidebarItemArsnovaClick.onCreated(function () {
if ($(window).width() >= 768) {
Session.set('arsnovaClickModalActive', true);
}
Session.set('arsnovaClickModalActive', false);
});
Template.cardSidebarItemArsnovaClick.onDestroyed(function () {
......@@ -41,11 +38,9 @@ Template.arsnovaClickModal.onRendered(function () {
$('#arsnovaClickModal').on('shown.bs.modal', function () {
$('.showArsnovaClick').attr('src', '/img/button/arsnova_click_pressed.png');
$('.showArsnovaClick').addClass('pressed');
if (!Session.get('arsnovaClickModalActive')) {
Session.set('arsnovaClickModalActive', true);
$('#arsnovaClickModal .modal-dialog').html('<iframe id="arsnovaClick" width="600px" height="800px" frameborder="0" src="https://arsnova.click"></iframe>');
}
});
});
Template.arsnovaClickModal.helpers({
isArsnovaClickActive: function () {
return Session.get('arsnovaClickModalActive');
}
});
......@@ -958,9 +958,8 @@ th {
}
}
#arsnovaAppModal iframe, #arsnovaClickModal iframe {
width: 600px;
height: 800px;
border: 0;
box-shadow: $default_box_shadow !important;
#arsnovaAppModal, #arsnovaClickModal {
iframe {
box-shadow: $default_box_shadow !important;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment