OfficeJS updated to work with the latest version of JIO - conflict solver not implemented

38fb78da · Tristan Cavelier · 97c53972 · 38fb78da · 38fb78da · 97c53972
Commit 38fb78da authored Mar 22, 2013 by Tristan Cavelier
5 changed files
--- a/index.html
+++ b/index.html
@@ -10,13 +10,14 @@
  <script type="text/javascript" src="lib/jquery/jquery.js"></script>
  <script type="text/javascript" src="lib/jstorage/jstorage.js"></script>
  <script type="text/javascript" src="lib/renderjs/renderjs.js"></script>
+  <script type="text/javascript" src="lib/md5/md5.js"></script>
-  <script type="text/javascript" src="lib/jio/localorcookiestorage.min.js"></script>
  <script type="text/javascript" src="lib/jio/jio.min.js"></script>
-  <script type="text/javascript" src="lib/base64/base64.js"></script>
  <script type="text/javascript" src="lib/sjcl/sjcl.min.js"></script>
  <script type="text/javascript" src="lib/jsSha2/sha2.js"></script>
-  <script type="text/javascript" src="lib/jio/jio.storage.min.js"></script>
+  <script type="text/javascript" src="lib/jio/localstorage.js"></script>
+  <script type="text/javascript" src="lib/jio/indexstorage.js"></script>
+  <script type="text/javascript" src="lib/jio/revisionstorage.js"></script>
+  <script type="text/javascript" src="lib/jio/replicaterevisionstorage.js"></script>
 </head>
 <body>

--- a/lib/jio/jio.min.js
+++ b/lib/jio/jio.min.js
--- a/lib/jio/jio.storage.min.js
+++ b/lib/jio/jio.storage.min.js
--- a/lib/jio/localorcookiestorage.min.js
+++ b/lib/jio/localorcookiestorage.min.js
-/*! Local Or Cookie Storage - v0.1.0 - 2012-10-12
-* Copyright (c) 2012 Nexedi; Licensed  */
-var LocalOrCookieStorage=function(){var e=function(){var e=function(){};e.prototype={getItem:function(e){return JSON.parse(localStorage.getItem(e))},setItem:function(e,t){if(e)return localStorage.setItem(e,JSON.stringify(t))},getAll:function(){return localStorage},deleteItem:function(e){e&&delete localStorage[e]}};var t=function(){};t.prototype={getItem:function(e){var t=document.cookie.split(";"),n;for(n=0;n<t.length;n+=1){var r=t[n].substr(0,t[n].indexOf("=")),i=t[n].substr(t[n].indexOf("=")+1);r=r.replace(/^\s+|\s+$/g,"");if(r===e)return unescape(i)}return null},setItem:function(e,t){return t!==undefined?(document.cookie=e+"="+JSON.stringify(t)+";domain="+window.location.hostname+";path="+window.location.pathname,!0):!1},getAll:function(){var e={},t,n=document.cookie.split(":");for(t=0;t<n.length;t+=1){var r=n[t].substr(0,n[t].indexOf("=")),i=n[t].substr(n[t].indexOf("=")+1);r=r.replace(/^\s+|\s+$/g,""),e[r]=unescape(i)}return e},deleteItem:function(e){document.cookie=e+"=null;domain="+window.location.hostname+";path="+window.location.pathname+";expires=Thu, 01-Jan-1970 00:00:01 GMT"}};try{return localStorage.getItem?new e:new t}catch(n){return new t}};return window.requirejs?(define("LocalOrCookieStorage",[],e),undefined):e()}();
\ No newline at end of file
--- a/src/js/officejs.js
+++ b/src/js/officejs.js