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

grunt: do not use crisper

Browse source 
- fixed some polymer specific package problems
This commit is contained in:
Marcin Lulek 2018-10-25 12:28:17 +02:00
parent 68c06918fd
commit ca5f1e1b5e
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -11,5 +11,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-crisper');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.registerTask('default', ['less:production', 'less:components', 'concat:polymercss', 'copy', 'concat:dist', 'vulcanize', 'crisper']);
grunt.registerTask('default', ['less:production', 'less:components', 'concat:polymercss', 'copy', 'concat:dist', 'vulcanize']);
};

2
grunt_config.json
View file

@ -16,7 +16,7 @@
"main": {
"expand": true,
"cwd": "bower_components",
"src": "webcomponentsjs/webcomponents-lite.js",
"src": "webcomponentsjs/webcomponents*.*",
"dest": "<%= dirs.js.dest %>/vendors"
}
},

1
rhodecode/public/js/src/components/shared-components.html
View file

@ -1,5 +1,4 @@
<!-- required for stamped out templates that might use common elements -->
<link rel="import" href="rhodecode-legacy-js/rhodecode-legacy-js.html">
<link rel="import" href="../../../../../bower_components/iron-ajax/iron-ajax.html">
<link rel="import" href="shared-styles.html">
<link rel="import" href="channelstream-connection/channelstream-connection.html">

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

@ -28,7 +28,6 @@ c.template_context['default_user'] = {
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.js', ver=c.rhodecode_version_hash)}"></script>
<link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
<title>${self.title()}</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
@ -101,7 +100,8 @@ c.template_context['default_user'] = {
<script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.js', ver=c.rhodecode_version_hash)}"></script>
<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/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
<script language="javascript" type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
<link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>