Skip to content

Tweaks/may28 #63

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

Merged
julsemaan merged 3 commits into from
May 28, 2025
Merged

Tweaks/may28 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70cdaec
fix double init
julsemaan May 28, 2025
ea3a86e
make upgrade popup every 5 screens
julsemaan May 28, 2025
a05ae34
remove ad in propose upgrade
julsemaan May 28, 2025
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
12 changes: 6 additions & 6 deletions client/_propose_upgrade.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>

<div style="text-align:center">
<iframe style="border:none;width:500px;height:340px;" id="upgrade-frame-ad" src="about:blank"></iframe>
<!---<iframe style="border:none;width:500px;height:340px;" id="upgrade-frame-ad" src="about:blank"></iframe>-->
</div>

<div class="propose-upgrade-timer">
Expand All @@ -45,11 +45,11 @@ <h4>You can continue in <span id="propose-upgrade-seconds-remaining">5</span> se
</div>

{{{ concat "<scr" "ipt>" }}}
var doc = document.getElementById('upgrade-frame-ad').contentWindow.document;
doc.open();
var ads = Handlebars.compile($('#upgrade-ads').html());
doc.write(ads());
doc.close();
//var doc = document.getElementById('upgrade-frame-ad').contentWindow.document;
//doc.open();
//var ads = Handlebars.compile($('#upgrade-ads').html());
//doc.write(ads());
//doc.close();

var secondsElem = $("#propose-upgrade-seconds-remaining");
var initial = secondsElem.html();
Expand Down
2 changes: 1 addition & 1 deletion client/assets/js/Controller/Application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ ApplicationController.prototype.propose_upgrade = function() {

// If we reach the rotation count, we reset the counter + show the popup
// Otherwise, we save the current count
if(count % 3 == 0) {
if(count % 5 == 0) {
setCookie("propose-upgrade-count", 0);
new Popup({
title : i18n('Upgrade!'),
Expand Down
13 changes: 8 additions & 5 deletions client/editor-layout.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,18 @@
[% INCLUDE app.tt %]

<script>
var _gsi_loaded = false;
var _gapi_loaded = false;
function gsi_loaded(){
_gsi_loaded = true;
if(_gapi_loaded) application.controllers.google_oauth.init()
if(!_gapi_loaded) {
_gapi_loaded = true;
application.controllers.google_oauth.init();
}
}
function gapi_loaded(){
_gapi_loaded = true;
if(_gapi_loaded) application.controllers.google_oauth.init()
if(!_gapi_loaded) {
_gapi_loaded = true;
application.controllers.google_oauth.init();
}
}
</script>

Expand Down