Skip to content

Commit

Permalink
update sweetAlert and fix scrolling after copy (#15542)
Browse files Browse the repository at this point in the history
  • Loading branch information
mcbenjemaa authored and k8s-ci-robot committed Aug 22, 2019
1 parent b7c8869 commit 63eb064
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 11 deletions.
1 change: 0 additions & 1 deletion layouts/partials/css.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<link rel="stylesheet" href="/css/case-study-styles.css">
{{- end }}
<link rel="stylesheet" href="{{ "css/jquery-ui.min.css" | relURL }}">
<link rel="stylesheet" href="{{ "css/sweetalert.min.css" | relURL }}">
<link rel="stylesheet" href="{{ "css/callouts.css" | relURL }}">
<link rel="stylesheet" href="{{ "css/custom-jekyll/tags.css" | relURL }}">
{{- if .Params.deprecated }}
Expand Down
3 changes: 2 additions & 1 deletion layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
<script src="{{ "js/jquery-3.2.1.min.js" | relURL }}"></script>
<script src="{{ "js/jquery-ui-1.12.1.min.js" | relURL }}"></script>
<script src="{{ "js/bootstrap-4.3.1.min.js" | relURL }}"></script>
<script src="{{ "js/sweetalert-1.1.3.min.js" | relURL }}"></script>
<script src="{{ "js/sweetalert-2.1.2.min.js" | relURL }}"></script>

<script src="{{ "js/script.js" | relURL }}"></script>
<script src="{{ "js/custom-jekyll/tags.js" | relURL }}"></script>
{{ with .Params.js }}{{ range (split . ",") }}<script src="{{ (trim . " ") | relURL }}"></script><!-- custom js added -->
Expand Down
5 changes: 0 additions & 5 deletions static/css/sweetalert.min.css

This file was deleted.

6 changes: 3 additions & 3 deletions static/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ function copyCode(elem){
try {
succeed = document.execCommand("copy");
} catch(e) {
sweetAlert("Oh, no...","Sorry, your browser doesn't support document.execCommand('copy'), so we can't copy this code to your clipboard.");
swal("Oh, no...","Sorry, your browser doesn't support document.execCommand('copy'), so we can't copy this code to your clipboard.");
succeed = false;
}
if (succeed) sweetAlert("Copied to clipboard: ",elem);
if (succeed) swal("Copied to clipboard: ",elem);
return succeed;
} else {
sweetAlert("Oops!",elem + " not found when trying to copy code");
swal("Oops!",elem + " not found when trying to copy code");
return false;
}
}
Expand Down
Loading

0 comments on commit 63eb064

Please sign in to comment.