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

polymer: slim out the styles and change the flow of initialization to avoid race conditions

Browse source
This commit is contained in:
Marcin Lulek 2016-08-29 18:16:14 +02:00
parent aa3cc71079
commit b2e98fa4ac
8 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.hgignore
View file

@ -43,6 +43,7 @@ syntax: regexp
^rhodecode/public/css/style-polymer.css$
^rhodecode/public/js/scripts.js$
^rhodecode/public/js/rhodecode-components.html$
^rhodecode/public/js/src/components/root-styles.gen.html$
^rhodecode\.db$
^rhodecode\.log$
^rhodecode_dev\.log$

20
Gruntfile.js
View file

@ -17,6 +17,16 @@ module.exports = function(grunt) {
},
},
concat: {
polymercss:{
src: [
// Base libraries
'<%= dirs.js.src %>/components/root-styles-prefix.html',
'<%= dirs.css %>/style-polymer.css',
'<%= dirs.js.src %>/components/root-styles-suffix.html'
],
dest: '<%= dirs.js.dest %>/src/components/root-styles.gen.html',
nonull: true
},
dist: {
src: [
// Base libraries
@ -133,12 +143,12 @@ module.exports = function(grunt) {
watch: {
less: {
files: ["<%= dirs.css %>/*.less"],
tasks: ["less:development", 'less:components', "vulcanize"]
files: ["<%= dirs.css %>/**/*.less"],
tasks: ["less:development", 'less:components', 'concat:polymercss', "vulcanize"]
},
js: {
files: ["<%= dirs.js.src %>/**/*.js", "<%= dirs.js.src %>/components/*.*"],
tasks: ["vulcanize", "concat:dist"]
files: ["<%= dirs.js.src %>/**/*.js", "<%= dirs.js.src %>/components/**/*.html"],
tasks: ['less:components', 'concat:polymercss', "vulcanize", "concat:dist"]
}
},
@ -173,5 +183,5 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-crisper');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.registerTask('default', ['less:production', 'less:components', 'copy','vulcanize', 'concat:dist']);
grunt.registerTask('default', ['less:production', 'less:components', 'concat:polymercss', 'copy','vulcanize', 'concat:dist']);
};

3
rhodecode/public/css/polymer.less
View file

@ -2,10 +2,7 @@
//--- IMPORTS ------------------//
@import 'helpers';
@import 'mixins';
@import 'rcicons';
@import 'fonts';
@import 'variables';
@import 'type';
@import 'buttons';
:root {

3
rhodecode/public/js/src/components/root-styles-prefix.html Normal file
View file

@ -0,0 +1,3 @@
<dom-module id="root-styles">
<template>
<style>

0
rhodecode/public/js/src/components/shared-styles-suffix.html → rhodecode/public/js/src/components/root-styles-suffix.html
View file

3
rhodecode/public/js/src/components/shared-styles-prefix.html
View file

@ -1,3 +0,0 @@
<dom-module id="shared-styles">
<template>
<style>

1
rhodecode/templates/admin/my_account/my_account_notifications.html
View file

@ -1,5 +1,4 @@
<template is="dom-bind" id="notificationsPage">
<style include="shared-styles" is="custom-style"></style>
<iron-ajax id="toggleNotifications"
method="post"
url="${url('my_account_notifications_toggle_visibility')}"

3
rhodecode/templates/base/root.html
View file

@ -60,7 +60,6 @@ c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default
}
})();
</script>
<link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}" async>
<script src="${h.asset('js/rhodecode/i18n/%s.js' % c.language, ver=c.rhodecode_version_hash)}"></script>
<script type="text/javascript">
@ -104,6 +103,8 @@ c.template_context['visual']['default_renderer'] = h.get_visual_attr(c, 'default
<![endif]-->
<script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode/routes.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)}">
<style include="shared-styles" is="custom-style"></style>
## avoide escaping the %N
<script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>