engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring: moves codemirror scripts to a separate file

Browse source
This commit is contained in:
ievgenii vdovenko 2025-12-10 12:59:05 +01:00
parent 0132bba779
commit ba3a08b568
7 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -45,6 +45,8 @@ rhodecode/public/js/src/components/**/*.css
/rhodecode/public/js/rhodecode-components.js
/rhodecode/public/js/scripts.js
/rhodecode/public/js/scripts.min.js
/rhodecode/public/js/codemirror-dist.js
/rhodecode/public/js/codemirror-dist.min.js
/rhodecode/public/js/src/components/root-styles.gen.html
/rhodecode/public/js/vendors/webcomponentsjs/
/rhodecode.db

2
Gruntfile.js
View file

@ -18,5 +18,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-webpack');
grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist', 'terser:dist']);
grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist', 'terser:dist', 'concat:ext', 'uglify:ext']);
};

31
grunt_config.json
View file

@ -64,14 +64,6 @@
"<%= dirs.js.src %>/plugins/jquery.timeago.js",
"<%= dirs.js.src %>/plugins/jquery.timeago-extension.js",
"<%= dirs.js.src %>/select2/select2.js",
"<%= dirs.js.src %>/codemirror/codemirror.js",
"<%= dirs.js.src %>/codemirror/codemirror_loadmode.js",
"<%= dirs.js.src %>/codemirror/codemirror_hint.js",
"<%= dirs.js.src %>/codemirror/codemirror_overlay.js",
"<%= dirs.js.src %>/codemirror/codemirror_placeholder.js",
"<%= dirs.js.src %>/codemirror/codemirror_simplemode.js",
"<%= dirs.js.dest %>/mode/meta.js",
"<%= dirs.js.dest %>/mode/meta_ext.js",
"<%= dirs.js.src_rc %>/i18n/select2/translations.js",
"<%= dirs.js.src %>/rhodecode/utils/array.js",
"<%= dirs.js.src %>/rhodecode/utils/string.js",
@ -84,7 +76,6 @@
"<%= dirs.js.src %>/rhodecode/utils/topics.js",
"<%= dirs.js.src %>/rhodecode/init.js",
"<%= dirs.js.src %>/rhodecode/changelog.js",
"<%= dirs.js.src %>/rhodecode/codemirror.js",
"<%= dirs.js.src %>/rhodecode/comments.js",
"<%= dirs.js.src %>/rhodecode/constants.js",
"<%= dirs.js.src %>/rhodecode/files.js",
@ -104,6 +95,21 @@
],
"dest": "<%= dirs.js.dest %>/scripts.js",
"nonull": true
},
"ext": {
"src": [
"<%= dirs.js.src %>/codemirror/codemirror.js",
"<%= dirs.js.src %>/codemirror/codemirror_loadmode.js",
"<%= dirs.js.src %>/codemirror/codemirror_hint.js",
"<%= dirs.js.src %>/codemirror/codemirror_overlay.js",
"<%= dirs.js.src %>/codemirror/codemirror_placeholder.js",
"<%= dirs.js.src %>/codemirror/codemirror_simplemode.js",
"<%= dirs.js.dest %>/mode/meta.js",
"<%= dirs.js.dest %>/mode/meta_ext.js",
"<%= dirs.js.src %>/rhodecode/codemirror.js"
],
"dest": "<%= dirs.js.dest %>/codemirror-dist.js",
"nonull": true
}
},
"terser": {
@ -147,7 +153,14 @@
"files": {
"<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/scripts.js"
}
"src": "<%= dirs.js.dest %>/scripts.js",
"dest": "<%= dirs.js.dest %>/scripts.min.js"
},
"ext": {
"src": "<%= dirs.js.dest %>/codemirror-dist.js",
"dest": "<%= dirs.js.dest %>/codemirror-dist.min.js"
}
},
"less": {
"development": {

2
rhodecode/templates/base/root.mako
View file

@ -144,8 +144,6 @@ c.template_context['attachment_store'] = {
<script> var alertMessagePayloads = ${h.flash.json_alerts(request=request)|n}; </script>
## avoide escaping the %N
<script language="javascript" type="text/javascript" src="${h.asset('js/scripts.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates
${self.js_extra()}

2
rhodecode/templates/compare/compare_diff.mako
View file

@ -27,6 +27,8 @@
// set fake commitId on this commit-range page
templateContext.commit_data.commit_id = "${h.EmptyCommit().raw_id}";
</script>
<script language="javascript" type="text/javascript" src="${h.asset('js/codemirror-dist.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
<div class="box">
<div class="summary changeset">

3
rhodecode/templates/data_table/_dt_elements.mako
View file

@ -535,6 +535,9 @@ ${h.style_metatag(tag_type, tag)|n,trim}
% endif
</div>
</div>
<script language="javascript" type="text/javascript" src="${h.asset('js/codemirror-dist.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
<script type="text/javascript">
new MarkupForm('${form_id}');
</script>

3
rhodecode/templates/files/files_add.mako
View file

@ -19,6 +19,9 @@
<%def name="main()">
<script language="javascript" type="text/javascript" src="${h.asset('js/codemirror-dist.min.js', ver=c.rhodecode_version_hash)}"></script>
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
<div class="box">
<div class="edit-file-title">