Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
5e34057
Initial setup of Monaco build process
bennothommo Dec 13, 2022
3e322f9
Delete workshop theme
bennothommo Dec 13, 2022
b570cc2
Initial compilation and setup of Monaco
bennothommo Dec 13, 2022
ebd0b3c
Further work on Monaco Editor support
bennothommo Dec 13, 2022
7f3d723
Ignore Monaco dev module chunks
bennothommo Dec 13, 2022
8f16865
Add configuration for indent guides and bracket colors
bennothommo Dec 13, 2022
aae1307
WIP preferences page update
bennothommo Dec 13, 2022
83e4bf5
WIP preferences - add code minimap config, fix preview
bennothommo Dec 13, 2022
d0d2142
Add preferences page UI js to build process
bennothommo Dec 14, 2022
9c37aae
Code cleanup, commenting and changing to US spelling
bennothommo Dec 14, 2022
4cc0e64
Add word wrap, font size and tab size preferences
bennothommo Dec 14, 2022
d613773
Add rest of preferences, add bracket color and color picker preferences
bennothommo Dec 14, 2022
de77d63
Drop unneeded line
bennothommo Dec 14, 2022
a4a61b3
WIP themes
bennothommo Dec 14, 2022
0678c3d
WIP themes
bennothommo Dec 14, 2022
6c3fa79
Add ability to preview multiple languages in code editor settings, ad…
bennothommo Dec 15, 2022
45f87e7
Add all available themes (only cut Crimson Editor)
bennothommo Dec 15, 2022
83d40f6
Merge branch 'wip/monaco-editor' of github.com:wintercms/winter into …
bennothommo Dec 15, 2022
448df5d
Increase size of code editor preview
bennothommo Dec 15, 2022
0b44c31
Add listener for jQuery render to render widgets
bennothommo Dec 17, 2022
968b212
Update Mix alias for code editor
bennothommo Dec 17, 2022
51ef6e6
Add local event handler for widgets
bennothommo Dec 20, 2022
432bccf
Convert editor preview on Preference page to actual widget, add local…
bennothommo Dec 20, 2022
5b4691b
Fix "once" local events
bennothommo Dec 20, 2022
f5614b8
Optimise editor on resize and leaving/entering tab, add fullscreen
bennothommo Dec 21, 2022
d15c560
Allow ad-hoc Snowboard listeners to function even if no plugins are l…
bennothommo Dec 21, 2022
f1ac221
Fix code editor in CMS area, add ability for hidden code areas
bennothommo Dec 21, 2022
0a3d2a3
Add more reliable method of retrieving widgets based on a given element
bennothommo Dec 21, 2022
f9cc262
Add content manipulation methods in editor
bennothommo Dec 21, 2022
c4eea51
Fix component placement and PHP highlighting in CMS pages
bennothommo Dec 21, 2022
95ee826
Merge branch 'develop' into wip/monaco-editor
bennothommo Jan 19, 2023
a6d1500
Merge branch 'develop' into wip/monaco-editor
bennothommo Feb 13, 2023
557572b
Allow code editor to work without status bar
bennothommo Feb 13, 2023
b9d74a7
Add wrap capability
bennothommo Feb 13, 2023
8e140d2
WIP Markdown Editor rewrite
bennothommo Feb 13, 2023
f97fcb5
Recompile assets
bennothommo Feb 13, 2023
1623f3c
Return selections after editor modification, small tweaks
bennothommo Feb 13, 2023
4ee21ba
Merge remote-tracking branch 'origin/develop' into wip/monaco-editor
bennothommo Feb 20, 2023
5a85172
WIP input tracking in Markdown Editor
bennothommo Mar 4, 2023
c7aceef
Merge branch 'develop' into wip/monaco-editor
bennothommo May 1, 2023
59432f4
Remove call to Theme::getActiveTheme()
bennothommo May 1, 2023
e337006
Adding formatting wrap/unwrap. Add preview.
bennothommo May 1, 2023
da26b55
WIP add Italic format, improve configuration
bennothommo May 3, 2023
0657457
Merge branch 'develop' into wip/monaco-editor
bennothommo May 4, 2023
f811640
Allow Stripe Loader to be disabled by Snowboard requests
bennothommo May 4, 2023
a6ba63f
WIP config options
bennothommo May 4, 2023
369265b
WIP keybindings
bennothommo May 6, 2023
730b716
Fix multiple backspace issue
bennothommo May 9, 2023
b140449
Merge branch 'develop' into wip/monaco-editor
bennothommo Jun 17, 2023
f8218bd
Merge branch 'develop' into wip/monaco-editor
bennothommo Aug 2, 2023
18db19b
Merge branch 'develop' into wip/monaco-editor
bennothommo Dec 31, 2023
e66e433
After building Monaco bundle, remove inline Codicon font calls
bennothommo Dec 31, 2023
09bd7fc
Update bundle, fix Italic detection in Markdown editor
bennothommo Dec 31, 2023
fdb60d4
Use in-bult VS theme for Markdown editor
bennothommo Jan 1, 2024
1ed3b33
Only allow Markdown editor actions to fire if enabled
bennothommo Jan 1, 2024
4c5be78
Allow selection of in-built Monaco themes
bennothommo Jan 1, 2024
fc6c6cd
Fix resize issues with code editor
bennothommo Jan 3, 2024
3ba08c2
Allow editor to start from a certain line
bennothommo Jan 3, 2024
c6c253c
Round to nearest pixel
bennothommo Jan 3, 2024
8fc63fc
Merge branch 'develop' into wip/monaco-editor
bennothommo Aug 2, 2024
b381e82
Prevent misclicking of outside elements when selecting code inside ed…
bennothommo Aug 2, 2024
636e891
Fix reselection of text after changing bold status
bennothommo Aug 2, 2024
d326aef
WIP fixing reselection of text after bold/italitc toggle
bennothommo Aug 13, 2024
bbb2775
Merge branch 'develop' into wip/monaco-editor
bennothommo May 5, 2025
6b4383a
Code quality fixes, discard repeated package registrations
bennothommo May 5, 2025
9f2278f
Merge branch 'develop' into wip/monaco-editor
bennothommo May 5, 2025
5e5fe05
Merge branch 'develop' into wip/monaco-editor
bennothommo May 5, 2025
188ebb5
Add ability to modify CMS component templates inside Monaco
bennothommo May 5, 2025
d255e5f
Fix exception on AJAX requests made by widgets when template form is …
bennothommo May 6, 2025
c115dac
Remove old token expansion functionality
bennothommo May 6, 2025
bcb66a8
Update modules/backend/models/Preference.php
bennothommo May 12, 2025
471c2fe
Merge branch 'develop' into wip/monaco-editor
LukeTowers Dec 29, 2025
5bc3633
Fix issue with closing full screen mode on page with markdown editor …
LukeTowers Dec 29, 2025
35a37d9
Add support for JSON themes
LukeTowers Dec 31, 2025
4c5ce67
Darken the one dark pro theme background for readability
LukeTowers Dec 31, 2025
cc5cb68
Use asset URL for codeeditor assets
LukeTowers Dec 31, 2025
536c274
Improve removal of inline codicon font-face
LukeTowers Dec 31, 2025
164d8ea
Restore original ace-backed codeeditor for RichEditor to use
LukeTowers Dec 31, 2025
0a18ddb
Cleanup
LukeTowers Dec 31, 2025
1ccd5a2
Deconflict ace-codeeditor from monaco codeeditor
LukeTowers Dec 31, 2025
70ddb83
Discard changes to modules/backend/formwidgets/markdowneditor/assets/…
LukeTowers Dec 31, 2025
1881d3d
Discard changes to modules/backend/formwidgets/markdowneditor/partial…
LukeTowers Dec 31, 2025
18af3ee
Discard changes to themes/demo/pages/ajax.htm
LukeTowers Dec 31, 2025
d154867
Restore Ace Editor for MarkdownEditor
LukeTowers Dec 31, 2025
adc5340
Move asset bundle registration to the boot() method
LukeTowers Dec 31, 2025
a799004
Fix styling issue with tab collapse icon on fancy layouts
LukeTowers Dec 31, 2025
7d889d0
Improve codeeditor bundle loading
LukeTowers Dec 31, 2025
71a2601
Tidying
LukeTowers Jan 1, 2026
062218b
Add asset_url link tag to backend layouts to make Snowboard.url().ass…
LukeTowers Jan 1, 2026
04e437a
Improve monaco asset loading to support cross origin asset URLs and r…
LukeTowers Jan 1, 2026
8b3391a
Improve backwards compatibility for the codeeditor
LukeTowers Jan 1, 2026
b6cc244
Add setMarkers and setDecorations helper to the CodeEditor Snowboard …
LukeTowers Jan 1, 2026
10c0d59
Compile assets
LukeTowers Jan 1, 2026
3ebf35c
ONE FREAKING COMMA AND THE WORLD BLOWS UP
LukeTowers Jan 1, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions modules/backend/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Backend\Models\UserRole;
use Exception;
use Illuminate\Support\Facades\Event;
use System\Classes\Asset\PackageManager;
use System\Classes\CombineAssets;
use System\Classes\MailManager;
use System\Classes\SettingsManager;
Expand All @@ -31,7 +32,6 @@ public function register()

$this->registerConsole();
$this->registerMailer();
$this->registerAssetBundles();
$this->registerBackendPermissions();
$this->registerBackendUserEvents();

Expand All @@ -53,6 +53,7 @@ public function register()
*/
public function boot()
{
$this->registerAssetBundles();
parent::boot('backend');
}

Expand Down Expand Up @@ -90,13 +91,12 @@ protected function registerAssetBundles()
$combiner->registerBundle('~/modules/backend/assets/less/winter.less');
$combiner->registerBundle('~/modules/backend/assets/js/winter.js');
$combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/assets/vendor/ace-codeeditor/build.js');
$combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js');
$combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/less/mediamanager.less');
$combiner->registerBundle('~/modules/backend/widgets/reportcontainer/assets/less/reportcontainer.less');
$combiner->registerBundle('~/modules/backend/widgets/table/assets/less/table.less');
$combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less');
$combiner->registerBundle('~/modules/backend/formwidgets/repeater/assets/less/repeater.less');
$combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/js/build.js');
$combiner->registerBundle('~/modules/backend/formwidgets/fileupload/assets/less/fileupload.less');
$combiner->registerBundle('~/modules/backend/formwidgets/nestedform/assets/less/nestedform.less');
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js');
Expand All @@ -111,6 +111,10 @@ protected function registerAssetBundles()
$combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js');
}
});

PackageManager::instance()->registerCallback(function ($mix) {
$mix->registerPackage('module-backend.formwidgets.codeeditor', '~/modules/backend/formwidgets/codeeditor/assets/winter.mix.js');
});
}

/*
Expand Down
1 change: 1 addition & 0 deletions modules/backend/assets/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!vendor
3 changes: 2 additions & 1 deletion modules/backend/assets/css/winter.css
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,8 @@ body.fancy-layout .master-tabs.control-tabs>.tab-content>.tab-pane.padded-pane,
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li.active a>span.title{background-color:white}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li.active a>span.title:before,
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li.active a>span.title:after{display:block}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed .tab-collapse-icon.primary{color:white}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs .tab-collapse-icon.primary{color:#000}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed .tab-collapse-icon.primary{color:#fff}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed>div>ul.nav-tabs{background:#2da7c7}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed>div>ul.nav-tabs>li a{color:white}
.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed>div>ul.nav-tabs>li a>span.title:before,
Expand Down
72 changes: 1 addition & 71 deletions modules/backend/assets/js/preferences/preferences.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion modules/backend/assets/less/layout/fancylayout.less
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,13 @@ body.fancy-layout .master-tabs.control-tabs,
}
}

.tab-collapse-icon.primary {
color: #000000;
}

&.primary-collapsed {
.tab-collapse-icon.primary {
color: white;
color: @color-fancy-master-tabs-active-text;
}

> div > ul.nav-tabs {
Expand Down
6 changes: 6 additions & 0 deletions modules/backend/assets/ui/js/ajax/Handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default class Handler extends Snowboard.Singleton {
if (!window.jQuery) {
return;
}
delegate('render');

// Add global event for rendering in Snowboard
delegate('render');
Expand All @@ -46,6 +47,11 @@ export default class Handler extends Snowboard.Singleton {

// Add "render" event for backwards compatibility
window.jQuery(document).trigger('render');

// Add global event for rendering in Snowboard
document.addEventListener('$render', () => {
this.snowboard.globalEvent('render');
});
}

/**
Expand Down
2 changes: 1 addition & 1 deletion modules/backend/assets/ui/js/build/backend.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading