Merge pull request galetahub#83 from silviorelli/master

Fixes "Browse server" feature if asset pipeline is disabled
glebtv · Feb 3, 2012 · 4bad5fe · 4bad5fe
2 parents 00f9b9f + 78bc415
commit 4bad5fe
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/views/layouts/ckeditor/application.html.erb b/app/views/layouts/ckeditor/application.html.erb
@@ -7,8 +7,15 @@
 	<%= tag(:meta, :name => "ckeditor-path", :content => Ckeditor.relative_path) %>
   <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
 
-  <%= stylesheet_link_tag "ckeditor/application" %>
-  <%= javascript_include_tag "ckeditor/application" %>
+  <% if Rails.application.config.assets.enabled %>
+      <%= stylesheet_link_tag "ckeditor/application" %>
+      <%= javascript_include_tag "ckeditor/application" %>
+  <% else %>
+     <link href="/javascripts/ckeditor/filebrowser/stylesheets/uploader.css" type="text/css" rel="stylesheet">
+      <% ["jquery.js", "jquery.tmpl.js", "fileuploader.js", "rails.js", "application.js"].each do |js| %>
+          <script src="/javascripts/ckeditor/filebrowser/javascripts/<%= js %>" type="text/javascript"></script>
+      <% end %>
+  <% end %>
 
   <script type="text/javascript">
     var CKEditorFuncNum = $.QueryString["CKEditorFuncNum"];