Skip to content
This repository was archived by the owner on Sep 24, 2025. It is now read-only.

Commit 1721838

Browse files
author
platipusica
committed
Monaco 7.0.70
1 parent 48ee96e commit 1721838

File tree

117 files changed

+50727
-64805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+50727
-64805
lines changed

‎builder/admin.sqlite‎

11 KB
Binary file not shown.

‎builder/builder.sqlite‎

0 Bytes
Binary file not shown.

‎builder/index.html‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<span id="error-info" class="text-danger fs-5 fw-bold"></span>
8383
</div>
8484
<div>
85-
<button type="button" id="ace-btn" class="btn btn-secondary"><i class="bi bi-search"></i> ace_shortcuts<small class="muted">&nbsp;[Alt+U]</small></button>
85+
<button type="button" id="monaco-btn" class="btn btn-secondary"><i class="bi bi-search"></i> monaco_shortcuts<small class="muted">&nbsp;[Alt+U]</small></button>
8686
<button type="button" id="find-btn" class="btn btn-secondary"><i class="bi bi-search"></i> find_in_task<small class="muted">&nbsp;[Alt+F]</small></button>
8787
<button type="button" id="ok-btn" class="btn btn-primary"><i class="icon-ok"></i> OK<small class="muted">&nbsp;[Ctrl+S]</small></button>
8888
</div>
@@ -520,8 +520,45 @@ <h5 class="text-center">Parameters</h5>
520520
<script src="jam/js/bootstrap-datepicker.js"></script>
521521
<script src="jam/js/jquery.maskedinput.js"></script>
522522
<script type="module" src="jam/js/jam.js"></script>
523-
<script src="jam/js/ace/ace.js"></script>
523+
<!-- <script src="jam/js/ace/ace.js"></script> -->
524+
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.44.0/min/vs/loader.min.js"></script>
525+
<script>
526+
require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.44.0/min/vs' } });
527+
528+
// Preload Monaco
529+
require(['vs/editor/editor.main'], function () {
530+
window.monacoReady = true;
531+
});
532+
</script> -->
533+
<!-- Load the AMD loader -->
534+
<script src="/jam/js/min/vs/loader.js"></script>
535+
536+
<script>
537+
(function() {
538+
// Wait until loader.js has defined 'require'
539+
function waitForRequire(callback) {
540+
if (typeof require === 'function') {
541+
callback();
542+
} else {
543+
setTimeout(function() { waitForRequire(callback); }, 50);
544+
}
545+
}
546+
547+
waitForRequire(function() {
548+
// Configure the paths for Monaco
549+
require.config({ paths: { vs: '/jam/js/min/vs' } });
524550

551+
// Load the main editor module
552+
require(['vs/editor/editor.main'], function() {
553+
window.monacoReady = true;
554+
// console.log('Monaco editor is ready!');
555+
556+
557+
});
558+
});
559+
})();
560+
</script>
561+
525562
<script>
526563
$(document).ready(function(){
527564
task.load();

‎builder/jam_files/admin/builder.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
LOOKUP_LISTS = {
2626
'f_theme': consts.THEMES,
27+
'f_ace_theme': consts.ACE_THEMES,
2728
'f_db_type': consts.DB_TYPE,
2829
'f_data_type': consts.FIELD_TYPES,
2930
'f_alignment': consts.ALIGNMENT,

‎builder/jam_files/admin/builder_structure.info‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎builder/jam_files/html/builder.html‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<span id="error-info" class="text-danger fs-5 fw-bold"></span>
8383
</div>
8484
<div>
85-
<button type="button" id="ace-btn" class="btn btn-secondary"><i class="bi bi-search"></i> ace_shortcuts<small class="muted">&nbsp;[Alt+U]</small></button>
85+
<button type="button" id="monaco-btn" class="btn btn-secondary"><i class="bi bi-search"></i> monaco_shortcuts<small class="muted">&nbsp;[Alt+U]</small></button>
8686
<button type="button" id="find-btn" class="btn btn-secondary"><i class="bi bi-search"></i> find_in_task<small class="muted">&nbsp;[Alt+F]</small></button>
8787
<button type="button" id="ok-btn" class="btn btn-primary"><i class="icon-ok"></i> OK<small class="muted">&nbsp;[Ctrl+S]</small></button>
8888
</div>
@@ -520,8 +520,45 @@ <h5 class="text-center">Parameters</h5>
520520
<script src="jam/js/bootstrap-datepicker.js"></script>
521521
<script src="jam/js/jquery.maskedinput.js"></script>
522522
<script type="module" src="jam/js/jam.js"></script>
523-
<script src="jam/js/ace/ace.js"></script>
523+
<!-- <script src="jam/js/ace/ace.js"></script> -->
524+
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.44.0/min/vs/loader.min.js"></script>
525+
<script>
526+
require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.44.0/min/vs' } });
527+
528+
// Preload Monaco
529+
require(['vs/editor/editor.main'], function () {
530+
window.monacoReady = true;
531+
});
532+
</script> -->
533+
<!-- Load the AMD loader -->
534+
<script src="/jam/js/min/vs/loader.js"></script>
535+
536+
<script>
537+
(function() {
538+
// Wait until loader.js has defined 'require'
539+
function waitForRequire(callback) {
540+
if (typeof require === 'function') {
541+
callback();
542+
} else {
543+
setTimeout(function() { waitForRequire(callback); }, 50);
544+
}
545+
}
546+
547+
waitForRequire(function() {
548+
// Configure the paths for Monaco
549+
require.config({ paths: { vs: '/jam/js/min/vs' } });
524550

551+
// Load the main editor module
552+
require(['vs/editor/editor.main'], function() {
553+
window.monacoReady = true;
554+
// console.log('Monaco editor is ready!');
555+
556+
557+
});
558+
});
559+
})();
560+
</script>
561+
525562
<script>
526563
$(document).ready(function(){
527564
task.ID = 0; task.load();

0 commit comments

Comments
 (0)