KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-07-27 20:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some weird hashlinks, bugging with the onepage haxing

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-01 22:11:00 +01:00
parent 0b4821ca06
commit b4eac8626c
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.php
+2 -2
View File
@@ -140,7 +140,7 @@
</div>
<div id="help" class="modal">
<div class="modal-header-fixed">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
<div class="modal-content">
<h4>So you need help?</h4>
@@ -154,7 +154,7 @@
</div>
<div id="embed" class="modal">
<div class="modal-header-fixed">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
<div class="modal-content">
<h4>Embed code (in beta)</h4>
php/channel.php
+2 -2
View File
@@ -132,7 +132,7 @@
</div>
<div id="help" class="modal">
<div class="modal-header-fixed">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
<div class="modal-content">
<h4>So you need help?</h4>
@@ -146,7 +146,7 @@
</div>
<div id="embed" class="modal">
<div class="modal-header-fixed">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
<div class="modal-content">
<h4>Embed code (in beta)</h4>
php/nochan.php
+4 -4
View File
@@ -39,7 +39,7 @@ if(isset($_GET['chan'])){
<br>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
</div>
<div id="about" class="modal">
@@ -52,7 +52,7 @@ if(isset($_GET['chan'])){
</p>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
</div>
<div id="donation" class="modal">
@@ -66,12 +66,12 @@ if(isset($_GET['chan'])){
</p>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">I'm awesome! (Close)</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">I'm awesome! (Close)</a>
</div>
</div>
<div id="help" class="modal">
<div class="modal-header-fixed">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
<div class="modal-content">
<h4>So you need help?</h4>
php/nochan_content.php
+4 -4
View File
@@ -26,7 +26,7 @@
<br>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
</div>
<div id="about" class="modal">
@@ -39,7 +39,7 @@
</p>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
</div>
<div id="donation" class="modal">
@@ -53,12 +53,12 @@
</p>
</div>
<div class="modal-footer">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">I'm awesome! (Close)</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">I'm awesome! (Close)</a>
</div>
</div>
<div id="help" class="modal">
<div class="modal-header-fixed">
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
<div class="modal-content">
<h4>So you need help?</h4>
static/dist/embed.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/dist/frontpage.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/dist/main.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
static/js/nochan.js
+4 -1
View File
@@ -241,7 +241,7 @@ var Nochan = {
window.onpopstate = function(e){
var url_split = window.location.href.split("/");
if(url_split[3] != "" && (url_split[3].substring(0,1) != "#" || url_split[3] == "#!")){
if(url_split[3] != "" && (url_split[3].substring(0,1) != "#")){
Nochan.to_channel(url_split[3], true);
}
}
@@ -259,7 +259,10 @@ function initfp(){
$("#channel-load").css("display", "none");
//Materialize.toast("<a href='/remote' style='color:white;'>Try out our new feature, remote!</a>", 8000)
if(window.location.hash == "#donation")
{
window.location.hash = "#";
$('#donation').openModal()
}
channel_list = $("#channel-list-container").html();
//window.channel_list = channel_list;