Skip to content

O
officejs
Commit b38a48a0 authored by Tristan Cavelier's avatar Tristan Cavelier Committed by Sebastien Robin
Browse files
Options

Updating SJCL

parent 26de76ef
Expand all Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 8 deletions
OfficeJS/index.html
View file @ b38a48a0
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script type="text/javascript" src="src/localorcookiestorage.js"></script> <script type="text/javascript" src="src/localorcookiestorage.js"></script>
<script type="text/javascript" src="src/jio.js"></script> <script type="text/javascript" src="src/jio.js"></script>
<script type="text/javascript" src="lib/base64/base64.js"></script> <script type="text/javascript" src="lib/base64/base64.js"></script>
<script type="text/javascript" src="lib/sjcl/sjcl.js"></script> <script type="text/javascript" src="lib/sjcl/sjcl.min.js"></script>
<script type="text/javascript" src="src/jio.storage.js"></script> <script type="text/javascript" src="src/jio.storage.js"></script>
</head> </head>
<body> <body>
......
OfficeJS/test/jiotests.js
View file @ b38a48a0
...@@ -1053,11 +1053,12 @@ test ('Document Load' , function () { ...@@ -1053,11 +1053,12 @@ test ('Document Load' , function () {
{ID:'jiotests'}); {ID:'jiotests'});
o.f = function (result) { o.f = function (result) {
if (result.status === 'done') { if (result.status === 'done') {
deepEqual (result.return_value,{name:'testload', deepEqual (result.return_value,
{name:'testload',
content:'contentoftest', content:'contentoftest',
last_modified:500, last_modified:500,
creation_date:500} creation_date:500},
,'load ok'); 'load ok');
} else { } else {
ok (false ,'cannot load'); ok (false ,'cannot load');
} }
...@@ -1176,7 +1177,7 @@ if (window.requirejs) { ...@@ -1176,7 +1177,7 @@ if (window.requirejs) {
Base64: '../js/base64.requirejs_module', Base64: '../js/base64.requirejs_module',
JIODummyStorages: '../src/jio.dummystorages', JIODummyStorages: '../src/jio.dummystorages',
JIOStorages: '../src/jio.storage', JIOStorages: '../src/jio.storage',
SJCLAPI:'../lib/sjcl/sjcl', SJCLAPI:'../lib/sjcl/sjcl.min',
SJCL:'../js/sjcl.requirejs_module' SJCL:'../js/sjcl.requirejs_module'
} }
}); });
......
OfficeJS/test/jiotests_withoutrequirejs.html
View file @ b38a48a0
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</script> </script>
<script type="text/javascript" src="../src/jio.js"></script> <script type="text/javascript" src="../src/jio.js"></script>
<script type="text/javascript" src="../lib/base64/base64.js"></script> <script type="text/javascript" src="../lib/base64/base64.js"></script>
<script type="text/javascript" src="../lib/sjcl/sjcl.js"></script> <script type="text/javascript" src="../lib/sjcl/sjcl.min.js"></script>
<script type="text/javascript" src="../src/jio.dummystorages.js"></script> <script type="text/javascript" src="../src/jio.dummystorages.js"></script>
<script type="text/javascript" src="../src/jio.storage.js"></script> <script type="text/javascript" src="../src/jio.storage.js"></script>
<script type="text/javascript" src="jiotests.js"></script> <script type="text/javascript" src="jiotests.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7