From 32210183be026e1541bf097599ed64dd598a84ce Mon Sep 17 00:00:00 2001
From: Dioni Zhong <dioni.zhong@ocado.com>
Date: Tue, 4 May 2021 17:05:11 +0100
Subject: [PATCH 1/2] fix: update jquery.cookie to js.cookie

---
 game/static/game/js/event.js                  | 14 -------------
 .../js/foundation/vendor/jquery.cookie.js     |  8 --------
 .../js/foundation/vendor/js.cookie.min.js     |  3 +++
 game/static/game/js/game.js                   |  6 +++---
 game/static/game/js/saving.js                 | 20 +++++++++----------
 game/templates/game/base.html                 |  2 +-
 game/templates/game/basenonav.html            |  2 +-
 game/templates/game/level_moderation.html     |  2 +-
 8 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100644 game/static/game/js/foundation/vendor/jquery.cookie.js
 create mode 100644 game/static/game/js/foundation/vendor/js.cookie.min.js

diff --git a/game/static/game/js/event.js b/game/static/game/js/event.js
index 686ecfe73..2a3b76bc6 100644
--- a/game/static/game/js/event.js
+++ b/game/static/game/js/event.js
@@ -41,20 +41,6 @@ var ocargo = ocargo || {};
 
 ocargo.Event = function() {};
 
-ocargo.Event.prototype.sendEvent = function(eventType, details) {
-  //var csrftoken = $.cookie('csrftoken');
-  //$.ajax({
-  //   url: '/reports/event',
-  //   type: 'POST',
-  //   async: true,
-  //   dataType: 'json',
-  //   beforeSend: function(xhr, settings) {
-  //     xhr.setRequestHeader("X-CSRFToken", csrftoken);
-  //   },
-  //   data: JSON.stringify({ app: "RapidRouter", eventType: eventType, details: details }),
-  // });
-};
-
 $(document).ready(function() {
   ocargo.event = new ocargo.Event();
 });
diff --git a/game/static/game/js/foundation/vendor/jquery.cookie.js b/game/static/game/js/foundation/vendor/jquery.cookie.js
deleted file mode 100644
index 9abcdeced..000000000
--- a/game/static/game/js/foundation/vendor/jquery.cookie.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.1
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
diff --git a/game/static/game/js/foundation/vendor/js.cookie.min.js b/game/static/game/js/foundation/vendor/js.cookie.min.js
new file mode 100644
index 000000000..f5f4c36c1
--- /dev/null
+++ b/game/static/game/js/foundation/vendor/js.cookie.min.js
@@ -0,0 +1,3 @@
+/*! js-cookie v2.2.1 | MIT */
+
+!function(a){var b;if("function"==typeof define&&define.amd&&(define(a),b=!0),"object"==typeof exports&&(module.exports=a(),b=!0),!b){var c=window.Cookies,d=window.Cookies=a();d.noConflict=function(){return window.Cookies=c,d}}}(function(){function a(){for(var a=0,b={};a<arguments.length;a++){var c=arguments[a];for(var d in c)b[d]=c[d]}return b}function b(a){return a.replace(/(%[0-9A-Z]{2})+/g,decodeURIComponent)}function c(d){function e(){}function f(b,c,f){if("undefined"!=typeof document){f=a({path:"/"},e.defaults,f),"number"==typeof f.expires&&(f.expires=new Date(1*new Date+864e5*f.expires)),f.expires=f.expires?f.expires.toUTCString():"";try{var g=JSON.stringify(c);/^[\{\[]/.test(g)&&(c=g)}catch(j){}c=d.write?d.write(c,b):encodeURIComponent(c+"").replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),b=encodeURIComponent(b+"").replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent).replace(/[\(\)]/g,escape);var h="";for(var i in f)f[i]&&(h+="; "+i,!0!==f[i]&&(h+="="+f[i].split(";")[0]));return document.cookie=b+"="+c+h}}function g(a,c){if("undefined"!=typeof document){for(var e={},f=document.cookie?document.cookie.split("; "):[],g=0;g<f.length;g++){var h=f[g].split("="),i=h.slice(1).join("=");c||'"'!==i.charAt(0)||(i=i.slice(1,-1));try{var j=b(h[0]);if(i=(d.read||d)(i,j)||b(i),c)try{i=JSON.parse(i)}catch(k){}if(e[j]=i,a===j)break}catch(k){}}return a?e[a]:e}}return e.set=f,e.get=function(a){return g(a,!1)},e.getJSON=function(a){return g(a,!0)},e.remove=function(b,c){f(b,"",a(c,{expires:-1}))},e.defaults={},e.withConverter=c,e}return c(function(){})});
\ No newline at end of file
diff --git a/game/static/game/js/game.js b/game/static/game/js/game.js
index e25fdcebf..728ec83e2 100644
--- a/game/static/game/js/game.js
+++ b/game/static/game/js/game.js
@@ -43,7 +43,7 @@ ocargo.Game = function () {
   this.tabs = null
   this.failures = 0
   this.currentlySelectedTab = null
-  this.isMuted = $.cookie('muted') === 'true'
+  this.isMuted = Cookies.get('muted') === 'true'
 }
 
 ocargo.Game.prototype.setup = function () {
@@ -258,7 +258,7 @@ ocargo.Game.prototype.sendAttempt = function (score) {
   ) {
     // Send out the submitted data.
     if (LEVEL_ID) {
-      var csrftoken = $.cookie('csrftoken')
+      var csrftoken = Cookies.get('csrftoken')
       $.ajax({
         url: Urls.submit_attempt(),
         type: 'POST',
@@ -1226,7 +1226,7 @@ function hasFunctionalCookiesConsent() {
 
 function setMutedCookie(mute) {
   if (hasFunctionalCookiesConsent()) {
-    $.cookie('muted', mute.toString(), { path: Urls.levels() })
+    Cookies.set('muted', mute.toString(), { path: Urls.levels() })
   }
 }
 
diff --git a/game/static/game/js/saving.js b/game/static/game/js/saving.js
index 28b6c7532..dcad32283 100644
--- a/game/static/game/js/saving.js
+++ b/game/static/game/js/saving.js
@@ -117,7 +117,7 @@ ocargo.Saving.prototype.retrieveWorkspace = function (id, callback) {
 };
 
 ocargo.Saving.prototype.deleteWorkspace = function (id, callback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     if (USER_STATUS === 'TEACHER' || USER_STATUS === 'SCHOOL_STUDENT' || USER_STATUS === 'INDEPENDENT_STUDENT') {
         $.ajax({
             url: Urls.delete_workspace(id),
@@ -145,7 +145,7 @@ ocargo.Saving.prototype.deleteWorkspace = function (id, callback) {
 };
 
 ocargo.Saving.prototype.saveWorkspace = function (workspace, id, callback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     if (USER_STATUS === 'TEACHER' || USER_STATUS === 'SCHOOL_STUDENT' || USER_STATUS === 'INDEPENDENT_STUDENT') {
         $.ajax({
             url: (id ? Urls.save_workspace(id) : Urls.save_workspace()),
@@ -187,7 +187,7 @@ ocargo.Saving.prototype.saveWorkspace = function (workspace, id, callback) {
 /****************************/
 
 ocargo.Saving.prototype._retrieveLevels = function (url, callback, errorCallback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     $.ajax({
         url: url,
         type: 'GET',
@@ -215,7 +215,7 @@ ocargo.Saving.prototype.retrieveSharedLevels = function (callback, errorCallback
 };
 
 ocargo.Saving.prototype.retrieveLevel = function (id, callback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     $.ajax({
         url: Urls.load_level_for_editor(id),
         type: 'GET',
@@ -249,7 +249,7 @@ ocargo.Saving.prototype.loadSolution = function (levelID, callback) {
 };
 
 ocargo.Saving.prototype.retrieveRandomLevel = function (data, callback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     $.ajax({
         url: Urls.generate_random_map_for_editor(),
         type: "POST",
@@ -270,12 +270,12 @@ ocargo.Saving.prototype.retrieveRandomLevel = function (data, callback) {
 };
 
 ocargo.Saving.prototype.deleteLevel = function (id, callback, errorCallback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     $.ajax({
         url: Urls.delete_level_for_editor(id),
         type: 'POST',
         dataType: 'json',
-        data: {csrfmiddlewaretoken: $.cookie('csrftoken')},
+        data: {csrfmiddlewaretoken: Cookies.get('csrftoken')},
         beforeSend: function (xhr, settings) {
             if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
                 xhr.setRequestHeader("X-CSRFToken", csrftoken);
@@ -291,7 +291,7 @@ ocargo.Saving.prototype.deleteLevel = function (id, callback, errorCallback) {
 };
 
 ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, errorCallback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     level.anonymous = anonymous;
     $.ajax({
         url: (id ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
@@ -314,7 +314,7 @@ ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, er
 };
 
 ocargo.Saving.prototype.getSharingInformation = function (levelID, callback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     $.ajax({
         url: Urls.get_sharing_information_for_editor(levelID),
         type: 'GET',
@@ -334,7 +334,7 @@ ocargo.Saving.prototype.getSharingInformation = function (levelID, callback) {
 };
 
 ocargo.Saving.prototype.shareLevel = function (levelID, recipientData, callback) {
-    csrftoken = $.cookie('csrftoken');
+    csrftoken = Cookies.get('csrftoken');
     $.ajax({
         url: Urls.share_level_for_editor(levelID),
         type: 'POST',
diff --git a/game/templates/game/base.html b/game/templates/game/base.html
index e8dd11531..c98a65c30 100644
--- a/game/templates/game/base.html
+++ b/game/templates/game/base.html
@@ -54,7 +54,7 @@ <h4>Rapid router has been created to teach the first principles of computer prog
 
 {% block scripts %}
   {{block.super}}
-  <script type='text/javascript' src='{% static 'game/js/foundation/vendor/jquery.cookie.js' %}'></script>
+  <script type='text/javascript' src='{% static 'game/js/foundation/vendor/js.cookie.min.js' %}'></script>
   <script type='text/javascript' src='{% url 'js-reverse' %}'></script>
   <script type='text/javascript' src='{% url 'rapid-router/javascript-catalog' %}'></script>
   <script type='text/javascript' src='{% static 'game/js/jquery.touchy.min.js' %}'></script>
diff --git a/game/templates/game/basenonav.html b/game/templates/game/basenonav.html
index 7f00bd83c..70e04a055 100644
--- a/game/templates/game/basenonav.html
+++ b/game/templates/game/basenonav.html
@@ -57,7 +57,7 @@ <h2 id="myModal-title" class="ocargo-modal-title"></h2>
 
 {% block scripts %}
     <script type='text/javascript' src="{% static 'game/js/svginnerhtml.js' %}"></script>
-    <script type='text/javascript' src='{% static 'game/js/foundation/vendor/jquery.cookie.js' %}'></script>
+    <script type='text/javascript' src='{% static 'game/js/foundation/vendor/js.cookie.min.js' %}'></script>
     <script type='text/javascript' src='{% static 'game/js/handlebars.runtime-v4.7.7.js' %}'></script>
     <script type='text/javascript' src='{% static 'game/js/templates.js' %}'></script>
     <script type='text/javascript' src='{% static 'game/js/button.js' %}'></script>
diff --git a/game/templates/game/level_moderation.html b/game/templates/game/level_moderation.html
index f56a79239..745c3b076 100644
--- a/game/templates/game/level_moderation.html
+++ b/game/templates/game/level_moderation.html
@@ -9,7 +9,7 @@
 <script src="{% static 'game/js/jquery.tablesorter.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'game/js/saving.js' %}"></script>
 <script type="text/javascript" src="{% static 'game/js/level_moderation.js' %}"></script>
-<script type="text/javascript" src="{% static 'game/js/foundation/vendor/jquery.cookie.js' %}"></script>
+<script type="text/javascript" src="{% static 'game/js/foundation/vendor/js.cookie.min.js' %}"></script>
 <script>
     var students = {% if students %} true {% else %} false {% endif %};
 </script>

From a6274ac3818fb338d19e916aff0857acc74cb802 Mon Sep 17 00:00:00 2001
From: Dioni Zhong <dioni.zhong@ocado.com>
Date: Wed, 5 May 2021 11:44:55 +0100
Subject: [PATCH 2/2] put back function, or the tests would time out

---
 game/static/game/js/event.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/game/static/game/js/event.js b/game/static/game/js/event.js
index 2a3b76bc6..69823af9c 100644
--- a/game/static/game/js/event.js
+++ b/game/static/game/js/event.js
@@ -41,6 +41,9 @@ var ocargo = ocargo || {};
 
 ocargo.Event = function() {};
 
+ocargo.Event.prototype.sendEvent = function(eventType, details) {
+};
+
 $(document).ready(function() {
   ocargo.event = new ocargo.Event();
 });