u/ewong/rhodecode-enterprise-ce-fork Commit - r880:36b5db0c

frontend: ensure polyfills are loaded as early as possible

ergo -

r880:36b5db0c default

parent child

rhodecode/public/js/src/components/rhodecode-app/rhodecode-app.js

0 +6 -3

                 attached: function () {
                     ccLog.debug('rhodeCodeApp created');
                     $.Topic('/notifications').subscribe(this.handleNotifications.bind(this));
+                    $.Topic('/connection_controller/subscribe').subscribe(
+                        this.subscribeToChannelTopic.bind(this));
+                    // this event can be used to coordinate plugins to do their
+                    // initialization before channelstream is kicked off
+                    $.Topic('/__MAIN_APP__').publish({});
                     for (var i = 0; i < alertMessagePayloads.length; i++) {
                         $.Topic('/notifications').publish(alertMessagePayloads[i]);
                     }
-                    $.Topic('/connection_controller/subscribe').subscribe(
-                        this.subscribeToChannelTopic.bind(this));
                     this.kickoffChannelstreamPlugin();
                 },
                         channels.push(addChannels[i]);
                     }
                     if (window.CHANNELSTREAM_SETTINGS && CHANNELSTREAM_SETTINGS.enabled){
-                        var channelstreamConnection = this.$['channelstream-connection'];
+                        var channelstreamConnection = this.getChannelStreamConnection();
                         channelstreamConnection.connectUrl = CHANNELSTREAM_URLS.connect;
                         channelstreamConnection.subscribeUrl = CHANNELSTREAM_URLS.subscribe;
                         channelstreamConnection.websocketUrl = CHANNELSTREAM_URLS.ws + '/ws';

rhodecode/public/js/topics_list.txt

0 +1 0

+            /__MAIN_APP__ - launched when rhodecode-app element is attached to DOM
             /plugins/__REGISTER__ - launched after the onDomReady() code from rhodecode.js is executed
             /ui/plugins/code/anchor_focus - launched when rc starts to scroll on load to anchor on PR/Codeview
             /ui/plugins/code/comment_form_built - launched when injectInlineForm() is executed and the form object is created

rhodecode/templates/base/root.html

0 +3 -10

             %>
             <html xmlns="http://www.w3.org/1999/xhtml">
                 <head>
+                    <script src="${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.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" />
                     <%def name="robots()">
                                         && 'content' in document.createElement('template')
                                 );
                                 if (!webComponentsSupported) {
-                                    var e = document.createElement('script');
-                                    e.async = true;
-                                    e.src = '${h.asset('js/vendors/webcomponentsjs/webcomponents-lite.min.js', ver=c.rhodecode_version_hash)}';
-                                    document.head.appendChild(e);
                                 } else {
                                     onload();
                                 }
                         <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()|n}; </script>
                         <script language="javascript" type="text/javascript" src="${h.asset('js/scripts.js', ver=c.rhodecode_version_hash)}"></script>
-                        <script>
-                            var e = document.createElement('script');
-                            e.src = '${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}';
-                            document.head.appendChild(e);
-                        </script>
-                        <link rel="import" href="${h.asset('js/rhodecode-components.html', ver=c.rhodecode_version_hash)}">
                         ## avoide escaping the %N
                         <script>CodeMirror.modeURL = "${h.asset('') + 'js/mode/%N/%N.js?ver='+c.rhodecode_version_hash}";</script>
+                        <script language="javascript" type="text/javascript" src="${h.asset('js/rhodecode-components.js', ver=c.rhodecode_version_hash)}"></script>
                         ## JAVASCRIPT EXTRA - optionally inject some extra JS for specificed templates

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages