Merge remote-tracking branch 'origin/master' into merge_master

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
2017-05-24 15:02:36 -04:00
parent 8eeee5b5a4 4ffc6fc94f
commit 93aeb8cffe
10 changed files with 169 additions and 9 deletions
@@ -33,6 +33,17 @@
            {% block stylesheets %}{% endblock %}

        {% endcompress %}
+        <script>
+            function waitForJQuery(func) {
+                if (window.jQuery) {
+                    func();
+                } else {
+                    setTimeout(function() {
+                        waitForJQuery(func)
+                    }, 50);
+                }
+            }
+        </script>
    </head>
    <body>
        {% if appearance_type == 'plain' %}