Skip to content

Commit

Permalink
Fixes #3431: Old JQuery version delivered
Browse files Browse the repository at this point in the history
  • Loading branch information
Bola Ahmed Buari authored and thorsteneckel committed May 25, 2021
1 parent d85ce75 commit a1187c2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/app/views/channel/chat.jst.eco
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@

<h3><%- @T('Requirements') %></h3>
<p><%- @T("Zammad Chat requires jQuery. If you don't already use it on your website include it like this:") %></p>
<pre><code class="language-html js-code">&lt;script src="https://code.jquery.com/jquery-2.1.4.min.js"&gt;&lt;/script&gt;</code></pre>
<pre><code class="language-html js-code">&lt;script src="https://code.jquery.com/jquery-3.6.0.min.js"&gt;&lt;/script&gt;</code></pre>

<h3><%- @T('Automatically show chat') %> (<%- @T('default') %>)</h3>
<p><%- @T('The chat will show up once the connection to the server got established and if there is someone online to chat with.') %></p>
Expand Down
2 changes: 1 addition & 1 deletion public/assets/chat/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,7 @@
</table>
</div>

<script src="jquery-2.1.4.min.js"></script>
<script src="jquery-3.6.0.min.js"></script>
<!--
<script src="node_modules/sass.js/dist/sass.js"></script>
-->
Expand Down
4 changes: 0 additions & 4 deletions public/assets/chat/jquery-2.1.4.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions public/assets/chat/jquery-3.6.0.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/assets/chat/znuny.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</table>
</div>

<script src="jquery-2.1.4.min.js"></script>
<script src="jquery-3.6.0.min.js"></script>
<script src="chat.js"></script>
<script>
function getSearchParameters() {
Expand Down
2 changes: 1 addition & 1 deletion public/assets/chat/znuny_open_by_button.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</table>
</div>

<script src="jquery-2.1.4.min.js"></script>
<script src="jquery-3.6.0.min.js"></script>
<script src="chat.js"></script>
<script>
function getSearchParameters() {
Expand Down

0 comments on commit a1187c2

Please sign in to comment.