Skip to content

Commit

Permalink
Change the cookie library
Browse files Browse the repository at this point in the history
The jQuery.cookie library is deprecated and replaced by js-cookie, so we switch them
  • Loading branch information
fnesveda committed Oct 26, 2017
1 parent a401e0c commit 4581dce
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion editor/Makefile 100644 → 100755
Expand Up @@ -25,7 +25,7 @@ adminer :
cookie :
rm -rf lib/cookie
mkdir -p lib/cookie
curl -L https://raw.githubusercontent.com/carhartl/jquery-cookie/master/src/jquery.cookie.js -o lib/cookie/jquery.cookie.js
curl -L https://www.github.com/js-cookie/js-cookie/releases/download/v2.1.4/js.cookie-2.1.4.min.js -o lib/cookie/js.cookie.min.js

dropzone :
rm -rf lib/dropzone
Expand Down
2 changes: 1 addition & 1 deletion editor/pages/content/home.php
Expand Up @@ -13,7 +13,7 @@
<script src="./lib/ace/src-min-noconflict/ext-modelist.js"></script>
<script src="./lib/ace/src-min-noconflict/ext-language_tools.js"></script>

<script src="./lib/cookie/jquery.cookie.js"></script>
<script src="./lib/cookie/js.cookie.min.js"></script>

<script src="./lib/dropzone/dropzone.min.js"></script>
<link href="./lib/dropzone/dropzone.min.css" rel="stylesheet" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion editor/pages/content/rvsn.php 100644 → 100755
Expand Up @@ -135,7 +135,7 @@ function createCommitSelectBox($commits, $boxID, $defaultCommitID = "-1") {
<script src="./lib/ace/src-min-noconflict/ext-modelist.js"></script>
<script src="./lib/ace/src-min-noconflict/ext-language_tools.js"></script>

<script src="./lib/cookie/jquery.cookie.js"></script>
<script src="./lib/cookie/js.cookie.min.js"></script>

<script src="./lib/fileDownload/jquery.fileDownload.js"></script>

Expand Down
5 changes: 2 additions & 3 deletions editor/scripts/js/home.js
Expand Up @@ -430,7 +430,7 @@ function main() {
* @function saveAceOptions
*/
window.saveAceOptions = function() {
$.cookie('ace-options', aceUserOptions, { expires: 5*365, path: '/' });
Cookies.set('ace-options', aceUserOptions, { expires: 5*365, path: '/' });
};

/**
Expand All @@ -450,8 +450,7 @@ function main() {
});

// load settings currently saved in the cookie and combine them with the default ones
$.cookie.json = true;
$.extend(aceUserOptions, $.cookie('ace-options'));
$.extend(aceUserOptions, Cookies.getJSON('ace-options'));
// save them back to the cookie
saveAceOptions();

Expand Down
3 changes: 1 addition & 2 deletions editor/scripts/js/rvsn.js 100644 → 100755
Expand Up @@ -77,8 +77,7 @@ function main() {
editor = ace.edit('editor');

// load settings currently saved in the cookie and combine them with the default ones
$.cookie.json = true;
$.extend(aceUserOptions, $.cookie('ace-options'));
$.extend(aceUserOptions, Cookies.getJSON('ace-options'));

// set editor options
editor.setOptions(aceOptions);
Expand Down

0 comments on commit 4581dce

Please sign in to comment.