KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

bumped jquery up

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-12 22:00:49 +01:00
parent f87527c7c0
commit dba60cd866
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/js/channel.js
View File

@@ -79,7 +79,7 @@ var Channel = {
} else {
//$("#help").remove();
$("#embed").remove();
$(".help-button-footer").remove();
//$(".help-button-footer").remove();
$(".embed-button-footer").remove();
$(".tabs").remove();
}

8
server/public/assets/js/list.js
View File

@@ -257,13 +257,7 @@ var List = {
List.check_error_videos(i + 1);
}
}).error(function (xhr, errorType, exception) {
Helper.log(["Emtpy-checker error at " + full_playlist[i].id + " " + full_playlist[i].title]);
socket.emit("error_video", {channel: chan.toLowerCase(), id: full_playlist[i].id, title: full_playlist[i].title});
if(full_playlist.length > i + 1 && window.location.pathname != "/") {
List.check_error_videos(i + 1);
}
});
})
},
dynamicContentPageJumpTo: function(page) {

6
server/public/layouts/client/main.handlebars
View File

@@ -36,7 +36,7 @@
<link rel="stylesheet" href="/assets/css/jquery-ui.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css">
<link rel="stylesheet" type="text/css" href="/assets/css/{{stylesheet}}" title="Default" />
<script type="text/javascript" src="https://code.jquery.com/jquery-2.2.4.min.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.slim.js"></script>
<script type="text/javascript" src="/assets/dist/lib/jquery-ui.min.js"></script>
@@ -45,7 +45,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js"></script>
<script type="text/javascript" src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
<script type="text/javascript">
<script async type="text/javascript">
if(window.location.hostname != "localhost") {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -64,7 +64,6 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/aes.js"></script>
<script async type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script>
{{/if}}
<script type="text/javascript" src="/assets/dist/{{javascript_file}}"></script>
</head>
<body class="noselect">
{{{body}}}
@@ -85,5 +84,6 @@
{{> footer}}
<textarea class="copy_video_id" style="display:none;"></textarea>
{{/if}}
<script async type="text/javascript" src="/assets/dist/{{javascript_file}}"></script>
</body>
</html>