temp

www/common/onlyoffice/inner.js

@@ -55,6 +55,7 @@ define([
 
     var CHECKPOINT_INTERVAL = 50;
     var DISPLAY_RESTORE_BUTTON = false;
+    var NEW_VERSION = 2;
 
     var debug = function (x) {
         if (!window.CP_DEV_MODE) { return; }
@@ -79,7 +80,8 @@ define([
         var content = {
             hashes: {},
             ids: {},
-            mediasSources: {}
+            mediasSources: {},
+            version: NEW_VERSION
         };
         var oldHashes = {};
         var oldIds = {};
@@ -270,11 +272,21 @@ define([
             };
             oldHashes = JSON.parse(JSON.stringify(content.hashes));
             content.saveLock = undefined;
+            // If this is a migration, set the new version
+            if (APP.migrate) {
+                delete content.migration;
+                content.version = NEW_VERSION;
+            }
             APP.onLocal();
             APP.realtime.onSettle(function () {
                 fixSheets();
                 UI.log(Messages.saved);
                 APP.realtime.onSettle(function () {
+                    if (APP.migrate) {
+                        UI.alert("RELOAD", function () { // XXX
+                            common.gotoURL();
+                        });
+                    }
                     if (ev.callback) {
                         return void ev.callback();
                     }
@@ -313,6 +325,7 @@ define([
             APP.FM.handleFile(blob, data);
         };
         var makeCheckpoint = function (force) {
+            if (!common.isLoggedIn()) { return; }
             var locked = content.saveLock;
             if (!locked || !isUserOnline(locked) || force) {
                 content.saveLock = myOOId;
@@ -520,6 +533,11 @@ define([
                 type: "documentOpen",
                 data: {"type":"open","status":"ok","data":{"Editor.bin":obj.openCmd.url}}
             });
+            if (APP.migrate && !readOnly) {
+                setTimeout(function () {
+                    makeCheckpoint(true);
+                }, 1000);
+            }
             // Update current index
             var last = ooChannel.queue.pop();
             if (last) { ooChannel.lastHash = last.hash; }
@@ -696,7 +714,7 @@ define([
         var startOO = function (blob, file) {
             if (APP.ooconfig) { return void console.error('already started'); }
             var url = URL.createObjectURL(blob);
-            var lock = readOnly;// || !common.isLoggedIn();
+            var lock = readOnly || APP.migrate;
 
             // Config
             APP.ooconfig = {
@@ -1360,7 +1378,7 @@ define([
             });
             $rightside.append($forget);
 
-            var helpMenu = common.createHelpMenu(['beta', 'oo']);
+            var helpMenu = APP.helpMenu = common.createHelpMenu(['beta', 'oo']);
             $('#cp-app-oo-editor').prepend(common.getBurnAfterReadingWarning());
             $('#cp-app-oo-editor').prepend(helpMenu.menu);
             toolbar.$drawer.append(helpMenu.button);
@@ -1402,6 +1420,28 @@ define([
                 Title.updateTitle(Title.defaultTitle);
             }
 
+            var version = '';
+            // Old version detected: use the old OO and start the migration if we can
+            if (content && !content.version) {
+                version = 'v1/';
+                APP.migrate = true;
+                // Registedred users can start the migration
+                if (common.isLoggedIn()) {
+                    content.migration = true;
+                    APP.onLocal();
+                } else {
+                    var msg = h('div.alert.alert-warning.cp-burn-after-reading', "PEZPEZPEZ"); // XXX
+                    $(APP.helpMenu).after(h);
+                    readOnly = true;
+                }
+            }
+
+            var s = h('script', {
+                type:'text/javascript',
+                src: '/common/onlyoffice/'+version+'web-apps/apps/api/documents/api.js'
+            });
+            $('#cp-app-oo-editor').append(s);
+
             if (metadataMgr.getPrivateData().burnAfterReading && content && content.channel) {
                 sframeChan.event('EV_BURN_PAD', content.channel);
             }
@@ -1423,6 +1463,7 @@ define([
             });
         };
 
+        var reloadPopup = false;
         config.onRemote = function () {
             if (initializing) { return; }
             var userDoc = APP.realtime.getUserDoc();
@@ -1430,6 +1471,9 @@ define([
             if (json.metadata) {
                 metadataMgr.updateMetadata(json.metadata);
             }
+
+            var wasMigrating = content.migration;
+
             content = json.content;
             if (content.hashes) {
                 var latest = getLastCp(true);
@@ -1451,6 +1495,15 @@ define([
                 handleNewLocks(oldLocks, content.locks);
                 oldLocks = JSON.parse(JSON.stringify(content.locks));
             }
+            if (content.migration) {
+                setEditable(false);
+            }
+            if (wasMigrating && !content.migration && !reloadPopup) {
+                reloadPopup = true;
+                UI.alert("RELOAD pewpew", function () { // XXX
+                    common.gotoURL();
+                });
+            }
             pinImages();
         };
 

www/common/onlyoffice/v1/AllFonts.js

@@ -0,0 +1,115 @@
+window["__fonts_files"] = [
+"RobotoCondensed-BoldItalic.ttf",
+"UbuntuMono-RI.ttf",
+"Ubuntu-L.ttf",
+"UbuntuMono-B.ttf",
+"calibri.ttf",
+"DejaVuSansMono.ttf",
+"Ubuntu-LI.ttf",
+"Ubuntu-C.ttf",
+"SymbolNeu.ttf",
+"arial.ttf",
+"Caladea-BoldItalic.ttf",
+"Ubuntu-RI.ttf",
+"Carlito-BoldItalic.ttf",
+"Roboto-Italic.ttf",
+"Ubuntu-B.ttf",
+"DejaVuSans.ttf",
+"Cousine-Bold.ttf",
+"Arimo-BoldItalic.ttf",
+"NotoMono-Regular.ttf",
+"Ubuntu-R.ttf",
+"Roboto-BoldItalic.ttf",
+"DroidSerif-Regular.ttf",
+"calibrii.ttf",
+"NotoSans-BoldItalic.ttf",
+"UbuntuMono-BI.ttf",
+"Caladea-Italic.ttf",
+"NotoSerif-BoldItalic.ttf",
+"Arimo-Bold.ttf",
+"DroidSans.ttf",
+"DejaVuSansMono-Bold.ttf",
+"opens___.ttf",
+"Cousine-BoldItalic.ttf",
+"RobotoCondensed-Italic.ttf",
+"NotoSerif-Regular.ttf",
+"Tinos-BoldItalic.ttf",
+"Arimo-Italic.ttf",
+"DroidSerif-BoldItalic.ttf",
+"NotoSansUI-Italic.ttf",
+"Roboto-LightItalic.ttf",
+"ariali.ttf",
+"arialbd.ttf",
+"Cousine-Italic.ttf",
+"Caladea-Regular.ttf",
+"DejaVuSerif.ttf",
+"Carlito-Regular.ttf",
+"Roboto-Regular.ttf",
+"DroidSerif-Bold.ttf",
+"Arimo-Regular.ttf",
+"Ubuntu-M.ttf",
+"Tinos-Bold.ttf",
+"NotoSerif-Italic.ttf",
+"Ubuntu-MI.ttf",
+"NotoSerif-Bold.ttf",
+"Tinos-Regular.ttf",
+"RobotoCondensed-Bold.ttf",
+"DejaVuSans-Bold.ttf",
+"calibriz.ttf",
+"Roboto-Light.ttf",
+"DroidSerif-Italic.ttf",
+"Carlito-Italic.ttf",
+"NotoSansUI-BoldItalic.ttf",
+"Roboto-Bold.ttf",
+"Tinos-Italic.ttf",
+"Symbola717.ttf",
+"Cousine-Regular.ttf",
+"DroidSansMono.ttf",
+"NotoSans-Bold.ttf",
+"UbuntuMono-R.ttf",
+"NotoSansUI-Regular.ttf",
+"DroidSans-Bold.ttf",
+"Ubuntu-BI.ttf",
+"calibrib.ttf",
+"arialbi.ttf",
+"NotoSans-Italic.ttf",
+"NotoSansUI-Bold.ttf",
+"DejaVuSerif-Bold.ttf",
+"Carlito-Bold.ttf",
+"RobotoCondensed-Regular.ttf",
+"NotoSans-Regular.ttf",
+"Roboto-ThinItalic.ttf",
+"Caladea-Bold.ttf",
+"Roboto-Thin.ttf"
+];
+
+window["__fonts_infos"] = [
+["Arial",9,0,39,0,40,0,72,0],
+["Arimo",47,0,35,0,27,0,17,0],
+["Caladea",42,0,25,0,80,0,10,0],
+["Calibri",4,0,22,0,71,0,56,0],
+["Carlito",44,0,59,0,76,0,12,0],
+["Cousine",64,0,41,0,16,0,31,0],
+["DejaVu Sans",15,0,-1,-1,55,0,-1,-1],
+["DejaVu Sans Mono",5,0,-1,-1,29,0,-1,-1],
+["DejaVu Serif",43,0,-1,-1,75,0,-1,-1],
+["Droid Sans",28,0,-1,-1,69,0,-1,-1],
+["Droid Sans Mono",65,0,-1,-1,-1,-1,-1,-1],
+["Droid Serif",21,0,58,0,46,0,36,0],
+["Noto Mono",18,0,-1,-1,-1,-1,-1,-1],
+["Noto Sans",78,0,73,0,66,0,23,0],
+["Noto Sans UI",68,0,37,0,74,0,60,0],
+["Noto Serif",33,0,50,0,52,0,26,0],
+["OpenSymbol",30,0,-1,-1,-1,-1,-1,-1],
+["Roboto",81,0,79,0,61,0,20,0],
+["Roboto Condensed",77,0,32,0,54,0,0,0],
+["Symbol Neu",8,0,-1,-1,-1,-1,-1,-1],
+["Symbola",63,0,-1,-1,-1,-1,-1,-1],
+["Tinos",53,0,62,0,49,0,34,0],
+["Ubuntu",19,0,11,0,14,0,70,0],
+["Ubuntu Condensed",7,0,-1,-1,-1,-1,-1,-1],
+["Ubuntu Light",2,0,6,0,48,0,51,0],
+["Ubuntu Mono",67,0,1,0,3,0,24,0]
+];
+
+window["g_fonts_selection_bin"] = "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
Line truncated

www/common/onlyoffice/v1/plugins.json

@@ -0,0 +1 @@
+{}

www/sheet/inner.html

@@ -12,7 +12,7 @@
     <div id="cp-app-oo-container">
         <div id="cp-app-oo-editor">
             <div id="cp-app-oo-placeholder"></div>
-            <script type="text/javascript" src="/common/onlyoffice/web-apps/apps/api/documents/api.js"></script>
+            <!--<script type="text/javascript" src="/common/onlyoffice/web-apps/apps/api/documents/api.js"></script>-->
         </div>
     </div>
 </body>