Home Explore Help
Sign In
SMusatov
/
zammad
mirror of https://github.com/zammad/zammad.git
1
0
Fork 0
Files
Browse Source

Moved to defer attribute for js include script.

Martin Edenhofer 11 years ago
parent
3c552ce458
commit
66b4f2d2db
3 changed files with 10 additions and 6 deletions
Split View Show Diff Stats
  1. 5 0
      app/assets/javascripts/application.js
  2. 1 6
      app/views/init/index.html.erb
  3. 4 0
      app/views/layouts/application.html.erb

+ 5 - 0
app/assets/javascripts/application.js
View File 

@@ -71,3 +71,8 @@ jQuery.event.special.remove = {
 
     if (e.handler) e.handler();
 
   }
 
 };
 
+
 
+// start application
 
+jQuery(function(){
 
+  new App.Run();
 
+});

+ 1 - 6
app/views/init/index.html.erb
View File 

@@ -5,9 +5,4 @@
 
 </div>
 
 <div id="splash">
 
   <div class="logo">booting...</div>
 
-</div>
 
-<script type="text/javascript">
 
-  jQuery(function(){
 
-    new App.Run();
 
-  })
 
-</script>
 
+</div>

+ 4 - 0
app/views/layouts/application.html.erb
View File 

@@ -3,7 +3,11 @@
 
 <head>
 
   <title><%= Setting.get('product_name') %></title>
 
   <%= stylesheet_link_tag    "application" %>
 
+  <% if Rails.configuration.assets.debug %>
 
   <%= javascript_include_tag "application" %>
 
+  <% else %>
 
+  <%= javascript_include_tag "application", :defer => 'defer' %>
 
+  <% end %>
 
   <%= csrf_meta_tags %>
 
 </head>
 
 <body>