fanforce-app-factory 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -82,7 +82,6 @@ class SprocketsCompiler
|
|
|
82
82
|
def self.setup(base_dir)
|
|
83
83
|
sprockets = ::Sprockets::Environment.new(base_dir)
|
|
84
84
|
|
|
85
|
-
sprockets.append_path 'assets'
|
|
86
85
|
sprockets.append_path 'assets/img'
|
|
87
86
|
sprockets.append_path 'assets/js'
|
|
88
87
|
sprockets.append_path 'assets/css'
|
|
@@ -91,12 +90,13 @@ class SprocketsCompiler
|
|
|
91
90
|
sprockets.append_path 'assets/_js'
|
|
92
91
|
sprockets.append_path 'assets/_css'
|
|
93
92
|
sprockets.append_path 'assets/_lib'
|
|
93
|
+
sprockets.append_path 'assets'
|
|
94
94
|
|
|
95
|
-
default_assets_dir = File.dirname(
|
|
96
|
-
sprockets.append_path default_assets_dir + '/
|
|
97
|
-
sprockets.append_path default_assets_dir + '/
|
|
98
|
-
sprockets.append_path default_assets_dir + '/
|
|
99
|
-
sprockets.append_path default_assets_dir + '/
|
|
95
|
+
default_assets_dir = File.dirname(File.expand_path(__FILE__)) + '/../assets'
|
|
96
|
+
sprockets.append_path default_assets_dir + '/img'
|
|
97
|
+
sprockets.append_path default_assets_dir + '/js'
|
|
98
|
+
sprockets.append_path default_assets_dir + '/css'
|
|
99
|
+
sprockets.append_path default_assets_dir + '/lib'
|
|
100
100
|
|
|
101
101
|
if ENV['RACK_ENV'] != 'development'
|
|
102
102
|
require 'yui/compressor'
|
|
@@ -30,7 +30,7 @@ module Sprockets
|
|
|
30
30
|
paths << path_without_extensions.join("index#{extensions.join}").to_s
|
|
31
31
|
end
|
|
32
32
|
|
|
33
|
-
if paths[0] !~ /\/assets\/(js|css|img)\// and paths[0] =~ /^(\/?[^\/]+)(\/.+)$/
|
|
33
|
+
if paths[0] !~ /\/assets\/_?(js|css|img)\// and paths[0] =~ /^(\/?[^\/]+)(\/.+)$/
|
|
34
34
|
paths << $1 + '/assets/css' +$2
|
|
35
35
|
paths << $1 + '/assets/js' +$2
|
|
36
36
|
paths << $1 + '/assets/img' +$2
|