##// END OF EJS Templates
Merged r4094 from trunk....
Eric Davis -
r4039:b35bc6d93c97
parent child
Show More
@@ -109,11 +109,11 module Engines::RailsExtensions::AssetHelpers
109 # Returns the publicly-addressable relative URI for the given asset, type and plugin
109 # Returns the publicly-addressable relative URI for the given asset, type and plugin
110 def self.plugin_asset_path(plugin_name, type, asset)
110 def self.plugin_asset_path(plugin_name, type, asset)
111 raise "No plugin called '#{plugin_name}' - please use the full name of a loaded plugin." if Engines.plugins[plugin_name].nil?
111 raise "No plugin called '#{plugin_name}' - please use the full name of a loaded plugin." if Engines.plugins[plugin_name].nil?
112 "/#{Engines.plugins[plugin_name].public_asset_directory}/#{type}/#{asset}"
112 "#{ActionController::Base.relative_url_root}/#{Engines.plugins[plugin_name].public_asset_directory}/#{type}/#{asset}"
113 end
113 end
114
114
115 end
115 end
116
116
117 module ::ActionView::Helpers::AssetTagHelper #:nodoc:
117 module ::ActionView::Helpers::AssetTagHelper #:nodoc:
118 include Engines::RailsExtensions::AssetHelpers
118 include Engines::RailsExtensions::AssetHelpers
119 end No newline at end of file
119 end
General Comments 0
You need to be logged in to leave comments. Login now