dillard
2872d70653
Live-tested against nc01 after its auto-update jumped to NC 34.0.4: - Nextcloud's global jQuery has been deprecated since NC19 and is no longer reliably present/first-loaded on NC34 (other apps like serverinfo hit the same issue). occweb's index.js and the vendored jquery.terminal (term.js) both assume a global jQuery, so ship our own copy (js/jquery.js, 3.7.1 from code.jquery.com) and load it before them in templates/index.php. Fixes a hard "jQuery is not defined" crash that left the terminal blank (black screen). - With that fixed, every ajax call started failing with HTTP 412 "CSRF check failed": core only auto-attaches the requesttoken header to requests made through ITS OWN globally-loaded jQuery, and with occweb now vendoring a separate jQuery instance that no longer happens. A global $.ajaxSetup() call turned out unreliable (another app's later jQuery load can replace window.jQuery afterwards), so each of the three ajax calls (SQL query, initial completion list, occ command execution) now sets the requesttoken header explicitly via OC.requestToken. Bump max-version to 34 - actually verified working on NC 34.0.4 now, not inherited/guessed (see the policy comment in this same file). Version bump to 0.3.5.
23 lines
733 B
PHP
23 lines
733 B
PHP
<?php
|
|
// Nextcloud's global jQuery has been deprecated since NC19 and is no longer
|
|
// reliably present on NC34+ (see e.g. serverinfo needing to bundle its own) -
|
|
// term.js (jquery.terminal) and index.js both require jQuery to be loaded
|
|
// first, so ship and load our own copy rather than relying on core.
|
|
script('occweb', 'jquery');
|
|
script('occweb', 'index');
|
|
script('occweb', 'term');
|
|
script('occweb', 'unix_formatting');
|
|
style('occweb', 'style');
|
|
?>
|
|
|
|
<div id="app" class="full-width">
|
|
<!-- <div id="app-navigation">-->
|
|
<!-- --><?php //print_unescaped($this->inc('navigation/index')); ?>
|
|
<!-- --><?php //print_unescaped($this->inc('settings/index')); ?>
|
|
<!-- </div>-->
|
|
|
|
<div id="app-content" class="full-width">
|
|
</div>
|
|
</div>
|
|
|