adjusting wymeditor to properly load in production

Oleg committed Jul 08, 2011
commit 84e8938f025e0371a7c65845f7d3e767f711229f
Showing 4 changed files with 9 additions and 4 deletions
app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css +2 -2
@@ @@ -28,8 +28,8 @@ table {
width: 100%;
}
th, td {
- min-height: 20px;
- min-width: 20px;
+ height: 20px;
+ width: 20px;
border: 1px dotted #ccc;
}
app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js +4 -0
@@ @@ -4,6 +4,10 @@ var cms_wym_options = {
initSkin: false,
lang: $('meta[name="cms-locale"]').attr('content'),
+ basePath: $('meta[name="cms-js-assets-base-path"]').attr('content') + '/wymeditor/',
+ wymPath: 'disabled',
+ jQueryPath: 'disabled',
+
updateSelector: 'form',
updateEvent: 'submit',
app/views/layouts/cms_admin/_head.html.erb +1 -0
@@ @@ -5,6 +5,7 @@
<meta name="cms-admin-path" content="<%= ComfortableMexicanSofa.config.admin_route_prefix %>" />
<meta name="cms-locale" content="<%= I18n.locale %>" />
+ <meta name="cms-js-assets-base-path" content="<%= ComfortableMexicanSofa.asset_pipeline_enabled?? '/assets' : '/public/javascripts' %>/comfortable_mexican_sofa"/>
<% if ComfortableMexicanSofa.asset_pipeline_enabled? %>
config/environments/production.rb +2 -2
@@ @@ -12,8 +12,8 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
config.serve_static_assets = false
# Compress both stylesheets and JavaScripts
- config.assets.js_compressor = :uglifier
- config.assets.css_compressor = :scss
+ # config.assets.js_compressor = :uglifier
+ # config.assets.css_compressor = :scss
# Specifies the header that your server uses for sending files
# (comment out if your front-end server doesn't support this)