Skip to content

Develop #511

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
zeng407 merged 6 commits into from
Feb 14, 2026
Merged

Develop #511

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a082df
fix: update alt attributes for images to use element titles
zeng407 Feb 7, 2026
79375fa
廣告版位調整
zeng407 Feb 14, 2026
3a2c622
Apply suggestion from @Copilot
zeng407 Feb 14, 2026
80e6636
fix: ensure global access to ONEAD_pubs in ad scripts
zeng407 Feb 14, 2026
924ace8
fix: update video source URLs in ElementControllerTest and ElementSou…
zeng407 Feb 14, 2026
1ae61d6
fix: properly wrap Google Ads script inclusion in header section
zeng407 Feb 14, 2026
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
46 changes: 26 additions & 20 deletions resources/views/ads/game_onead_1_pc.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
@if(!is_skip_ad())
<div id="div-onead-nd-01"></div>
@push('scripts')
<script type="text/javascript">
var custom_call = function (params) {
if (params.hasAd) {
console.log('ND has AD')
} else {
console.log('ND AD Empty');
document.addEventListener('DOMContentLoaded', function() {
var custom_call = function (params) {
if (params.hasAd) {
console.log('ND has AD')
} else {
console.log('ND AD Empty');
}
}
}

ONEAD_TEXT = {};
ONEAD_TEXT.pub = {};
ONEAD_TEXT.pub.uid = 2000374; //媒體 uid
ONEAD_TEXT.pub.player_mode_div = "div-onead-ad";
ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-nd-01");
ONEAD_TEXT.pub.player_mode = "native-drive";
ONEAD_TEXT.pub.max_threads = 3;
ONEAD_TEXT.pub.position_id = /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent)? "5" : "0";
ONEAD_TEXT.pub.mediaOption = { landingNewPage : true }
ONEAD_TEXT.pub.queryAdCallback = custom_call
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);
</script>
ONEAD_TEXT = {};
ONEAD_TEXT.pub = {};
ONEAD_TEXT.pub.uid = 2000374; //媒體 uid
ONEAD_TEXT.pub.player_mode_div = "div-onead-ad";
ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-nd-01");
ONEAD_TEXT.pub.player_mode = "native-drive";
ONEAD_TEXT.pub.max_threads = 3;
ONEAD_TEXT.pub.position_id = /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent)? "5" : "0";
ONEAD_TEXT.pub.mediaOption = { landingNewPage : true }
ONEAD_TEXT.pub.queryAdCallback = custom_call
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);

<script src="https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js"></script>
var script = document.createElement('script');
script.src = 'https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js';
document.body.appendChild(script);
});
</script>
@push('scripts')
@endif
47 changes: 27 additions & 20 deletions resources/views/ads/home_onead_1_pc.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
@if(!is_skip_ad())
<div id = "oneadMFSDFPTag"></div>
@push('scripts')
<script type="text/javascript">
var custom_call = function (params) {
if (params.hasAd) {
console.log('MFS has AD')
} else {
console.log('MFS AD empty')
document.addEventListener('DOMContentLoaded', function() {
var custom_call = function (params) {
if (params.hasAd) {
console.log('MFS has AD')
} else {
console.log('MFS AD empty')
}
}
}
var _ONEAD = {};
_ONEAD.pub = {};
_ONEAD.pub.slotobj = document.getElementById("oneadMFSDFPTag");
_ONEAD.pub.slots = ["div-onead-ad"];
_ONEAD.pub.uid = "2000374";
_ONEAD.pub.external_url = "https://onead.onevision.com.tw/";
_ONEAD.pub.player_mode_div = "div-onead-ad";
_ONEAD.pub.player_mode = "mobile-fullscreen";
_ONEAD.pub.google_view_click = "%%CLICK_URL_UNESC%%";
_ONEAD.pub.google_view_pixel = "";
_ONEAD.pub.queryAdCallback = custom_call
var ONEAD_pubs = ONEAD_pubs || [];
ONEAD_pubs.push(_ONEAD);
var _ONEAD = {};
_ONEAD.pub = {};
_ONEAD.pub.slotobj = document.getElementById("oneadMFSDFPTag");
_ONEAD.pub.slots = ["div-onead-ad"];
_ONEAD.pub.uid = "2000374";
_ONEAD.pub.external_url = "https://onead.onevision.com.tw/";
_ONEAD.pub.player_mode_div = "div-onead-ad";
_ONEAD.pub.player_mode = "mobile-fullscreen";
_ONEAD.pub.google_view_click = "%%CLICK_URL_UNESC%%";
_ONEAD.pub.google_view_pixel = "";
_ONEAD.pub.queryAdCallback = custom_call
var ONEAD_pubs = ONEAD_pubs || [];
ONEAD_pubs.push(_ONEAD);

var script = document.createElement('script');
script.src = 'https://ad-specs.guoshipartners.com/static/js/onead-lib.min.js';
document.body.appendChild(script);
});
</script>
<script type="text/javascript" src = "https://ad-specs.guoshipartners.com/static/js/onead-lib.min.js"></script>
@endpush
@endif
43 changes: 25 additions & 18 deletions resources/views/ads/home_onead_2_pc.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
@if(!is_skip_ad())
<div id="div-onead-nd-01"></div>
@push('scripts')
<script type="text/javascript">
var custom_call = function (params) {
if (params.hasAd) {
console.log('ND has AD')
} else {
console.log('ND AD Empty');
document.addEventListener('DOMContentLoaded', function() {
var custom_call = function (params) {
if (params.hasAd) {
console.log('ND has AD')
} else {
console.log('ND AD Empty');
}
}
}
ONEAD_TEXT = {};
ONEAD_TEXT.pub = {};
ONEAD_TEXT.pub.uid = "2000374";
ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-nd-01");
ONEAD_TEXT.pub.player_mode = "native-drive";
ONEAD_TEXT.pub.player_mode_div = "div-onead-ad";
ONEAD_TEXT.pub.max_threads = 3;
ONEAD_TEXT.pub.position_id = /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent)? "5" : "0";
ONEAD_TEXT.pub.queryAdCallback = custom_call;
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);
ONEAD_TEXT = {};
ONEAD_TEXT.pub = {};
ONEAD_TEXT.pub.uid = "2000374";
ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-nd-01");
ONEAD_TEXT.pub.player_mode = "native-drive";
ONEAD_TEXT.pub.player_mode_div = "div-onead-ad";
ONEAD_TEXT.pub.max_threads = 3;
ONEAD_TEXT.pub.position_id = /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent)? "5" : "0";
ONEAD_TEXT.pub.queryAdCallback = custom_call;
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);

var script = document.createElement('script');
script.src = 'https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js';
document.body.appendChild(script);
});
</script>
<script src="https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js"></script>
@endpush
@endif
37 changes: 22 additions & 15 deletions resources/views/ads/onead_text.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
@if(!is_skip_ad())
<div id="div-onead-draft"></div>
@push('scripts')
<script type="text/javascript">
var custom_call = function (params) {
if (params.hasAd) {
console.log('TD has AD')
} else {
console.log('TD AD Empty')
document.addEventListener('DOMContentLoaded', function() {
var custom_call = function (params) {
if (params.hasAd) {
console.log('TD has AD')
} else {
console.log('TD AD Empty')
}
}
}
ONEAD_TEXT = {};
ONEAD_TEXT.pub = {};
ONEAD_TEXT.pub.uid = "2000374";
ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-draft");
ONEAD_TEXT.pub.player_mode = "text-drive";
ONEAD_TEXT.pub.queryAdCallback = custom_call;
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);
ONEAD_TEXT = {};
ONEAD_TEXT.pub = {};
ONEAD_TEXT.pub.uid = "2000374";
ONEAD_TEXT.pub.slotobj = document.getElementById("div-onead-draft");
ONEAD_TEXT.pub.player_mode = "text-drive";
ONEAD_TEXT.pub.queryAdCallback = custom_call;
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);

var script = document.createElement('script');
script.src = 'https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js';
document.body.appendChild(script);
});
</script>
<script src="https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js"></script>
@endpush
@endif
14 changes: 10 additions & 4 deletions resources/views/ads/rank_onead_1.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@if(!is_skip_ad())
<div id="div-onead-nd-01"></div>
<script type="text/javascript">
<div id="div-onead-nd-01" data-ad-init="rank-onead-1"></div>
@push('scripts')
<script type="text/javascript">
document.addEventListener('DOMContentLoaded', function() {
var custom_call = function (params) {
if (params.hasAd) {
console.log('ND has AD')
Expand All @@ -21,7 +23,11 @@
ONEAD_TEXT.pub.queryAdCallback = custom_call
window.ONEAD_text_pubs = window.ONEAD_text_pubs || [];
ONEAD_text_pubs.push(ONEAD_TEXT);
</script>

<script src="https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js"></script>
var script = document.createElement('script');
script.src = 'https://ad-specs.guoshipartners.com/static/js/ad-serv.min.js';
document.body.appendChild(script);
});
</script>
@endpush
@endif
49 changes: 28 additions & 21 deletions resources/views/ads/rank_onead_2.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
@if(!is_skip_ad())
<div id = "oneadMFSDFPTag"></div>
<div id="oneadMFSDFPTag" data-ad-init="rank-onead-2"></div>
@push('scripts')
<script type="text/javascript">
var custom_call = function (params) {
if (params.hasAd) {
console.log('MFS has AD')
} else {
console.log('MFS AD empty')
document.addEventListener('DOMContentLoaded', function() {
var custom_call = function (params) {
if (params.hasAd) {
console.log('MFS has AD')
} else {
console.log('MFS AD empty')
}
}
}
var _ONEAD = {};
_ONEAD.pub = {};
_ONEAD.pub.slotobj = document.getElementById("oneadMFSDFPTag");
_ONEAD.pub.slots = ["div-onead-ad"];
_ONEAD.pub.uid = "2000374";
_ONEAD.pub.external_url = "https://onead.onevision.com.tw/";
_ONEAD.pub.player_mode_div = "div-onead-ad";
_ONEAD.pub.player_mode = "mobile-fullscreen";
_ONEAD.pub.google_view_click = "%%CLICK_URL_UNESC%%";
_ONEAD.pub.google_view_pixel = "";
_ONEAD.pub.queryAdCallback = custom_call
var ONEAD_pubs = ONEAD_pubs || [];
ONEAD_pubs.push(_ONEAD);
var _ONEAD = {};
_ONEAD.pub = {};
_ONEAD.pub.slotobj = document.getElementById("oneadMFSDFPTag");
_ONEAD.pub.slots = ["div-onead-ad"];
_ONEAD.pub.uid = "2000374";
_ONEAD.pub.external_url = "https://onead.onevision.com.tw/";
_ONEAD.pub.player_mode_div = "div-onead-ad";
_ONEAD.pub.player_mode = "mobile-fullscreen";
_ONEAD.pub.google_view_click = "%%CLICK_URL_UNESC%%";
_ONEAD.pub.google_view_pixel = "";
_ONEAD.pub.queryAdCallback = custom_call
var ONEAD_pubs = ONEAD_pubs || [];
ONEAD_pubs.push(_ONEAD);

var script = document.createElement('script');
script.src = 'https://ad-specs.guoshipartners.com/static/js/onead-lib.min.js';
document.body.appendChild(script);
});
</script>
<script type="text/javascript" src = "https://ad-specs.guoshipartners.com/static/js/onead-lib.min.js"></script>
@endpush
@endif
6 changes: 5 additions & 1 deletion resources/views/ads/script_load_ad.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@if (!is_skip_ad())
<script>
@push('scripts')
<script>
document.addEventListener('DOMContentLoaded', function() {
function loadAd(retryCount, intervalDelay) {
let retry = retryCount;
let interval = setInterval(() => {
Expand Down Expand Up @@ -51,5 +53,7 @@ function loadAd(retryCount, intervalDelay) {
setTimeout(() => {
loadAd(5, 200);
}, 500);
});
</script>
@endpush
@endif
11 changes: 11 additions & 0 deletions resources/views/game/rank.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@

@section('header')
<script src="https://embed.twitch.tv/embed/v1.js"></script>
<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
<script>
window.googletag = window.googletag || {cmd: []};
googletag.cmd.push(function() {
googletag.defineOutOfPageSlot('/23307026516/rank_page_top', googletag.enums.OutOfPageFormat.TOP_ANCHOR)
.addService(googletag.pubads());

googletag.pubads().enableSingleRequest();
googletag.enableServices();
});
</script>
@endsection

@section('content')
Expand Down
4 changes: 2 additions & 2 deletions resources/views/game/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ class="btn btn-outline-dark ml-1 white-space-no-wrap black-box-toggle"
<div class="comparison-media-box__content-wrapper">
<img v-if="post.element1.previewable"
@@error="onImageError(post.element1.id, post.element1.url2, $event)"
:src="post.element1.url" alt="Element 1">
:src="post.element1.url" :alt="post.element1.title">
<video v-else :src="post.element1.url + '#t=1'" muted playsinline></video>
</div>
</div>
Expand All @@ -905,7 +905,7 @@ class="btn btn-outline-dark ml-1 white-space-no-wrap black-box-toggle"
<div class="comparison-media-box__content-wrapper">
<img v-if="post.element2.previewable"
@@error="onImageError(post.element2.id, post.element2.url2, $event)"
:src="post.element2.url" alt="Element 2">
:src="post.element2.url" :alt="post.element2.title">
<video v-else :src="post.element2.url + '#t=1'" muted playsinline></video>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions resources/views/home.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@section('header')
@if (config('services.google_ad.enabled') && config('services.google_ad.home_page') && !is_skip_ad())
{{-- Ads --}}
@push('scripts')
<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js" crossorigin="anonymous"></script>
<script>
window.googletag = window.googletag || {
Expand Down Expand Up @@ -35,6 +36,7 @@
}, 30 * 1000); // 30 seconds
});
</script>
@endpush
@endif
@endsection

Expand Down Expand Up @@ -428,11 +430,13 @@
{{-- google ads --}}
<!-- /23307026516/home_ad_r1/home_ad_2 -->
<div id='div-gpt-ad-1750917306040-0' style='min-width: 160px; min-height: 600px;'>
@push('scripts')
<script>
googletag.cmd.push(function() {
googletag.display('div-gpt-ad-1750917306040-0');
});
</script>
@endpush
</div>
</div>

Expand Down
1 change: 1 addition & 0 deletions resources/views/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ class="rounded-circle" width="24" height="24" style="object-fit: cover"
</main>
</div>
@yield('footer')
@stack('scripts')
</body>

</html>
Loading