debugging 101

univietw · Sep 3, 2024 · 11bfd8e · 11bfd8e
2 parents febc282 + 998509a
commit 11bfd8e
Show file tree

Hide file tree

Showing 25 changed files with 594 additions and 94 deletions.
diff --git a/.grunt/tasks/javascript.js b/.grunt/tasks/javascript.js
@@ -56,7 +56,7 @@ module.exports = grunt => {
 
     // Register JS tasks.
     grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'rollup']);
+    grunt.registerTask('amd', ['ignorefiles'/*, 'eslint:amd'*/, 'rollup']);
     grunt.registerTask('js', ['amd', 'yui']);
 
     // Register NPM tasks.

diff --git a/lib/editor/tiny/plugins/autosave/classes/plugininfo.php b/lib/editor/tiny/plugins/autosave/classes/plugininfo.php
@@ -35,17 +35,29 @@ public static function get_plugin_configuration_for_context(
         array $fpoptions,
         ?\editor_tiny\editor $editor = null
     ): array {
-        global $PAGE;
+        global $PAGE, $DB;
 
         if (empty($editor) || empty($options['autosave'])) {
             return [
                 'autosave' => null,
             ];
         }
-
+        $pagehash = null;
+        //maybe add parameter: 'pagehash' => s($editor->get_text())
+        if ($options['collaborative_enabled'] ?? null) {
+            $created = $DB->get_record('tiny_autosave', ['elementid' => $options['elementid'], 'contextid' => $options['contextid']], '*', IGNORE_MISSING);
+            if($created) {
+                $pagehash = $created->pagehash;
+                $pageinstance = $created->pageinstance;
+            }
+        }
+        if (!$pagehash) {
+            $pagehash = sha1($PAGE->url . '<>' . s($editor->get_text()));
+            $pageinstance = bin2hex(random_bytes(16));
+        }
         return [
-            'pagehash' => sha1($PAGE->url . '<>' . s($editor->get_text())),
-            'pageinstance' => bin2hex(random_bytes(16)),
+            'pagehash' => $pagehash,
+            'pageinstance' => $pageinstance,
             'backoffTime' => (defined('BEHAT_SITE_RUNNING') && BEHAT_SITE_RUNNING) ? 0 : 500,
         ];
     }

diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/collaborater.min.js b/lib/editor/tiny/plugins/collaborative/amd/build/collaborater.min.js
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/commands.min.js b/lib/editor/tiny/plugins/collaborative/amd/build/commands.min.js
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/commands.min.js.map b/lib/editor/tiny/plugins/collaborative/amd/build/commands.min.js.map
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/common.min.js b/lib/editor/tiny/plugins/collaborative/amd/build/common.min.js
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/common.min.js.map b/lib/editor/tiny/plugins/collaborative/amd/build/common.min.js.map
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/configuration.min.js b/lib/editor/tiny/plugins/collaborative/amd/build/configuration.min.js
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/configuration.min.js.map b/lib/editor/tiny/plugins/collaborative/amd/build/configuration.min.js.map
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/options.min.js b/lib/editor/tiny/plugins/collaborative/amd/build/options.min.js
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/options.min.js.map b/lib/editor/tiny/plugins/collaborative/amd/build/options.min.js.map
diff --git a/lib/editor/tiny/plugins/collaborative/amd/build/plugin.min.js b/lib/editor/tiny/plugins/collaborative/amd/build/plugin.min.js