midas-guilded 0.1.1 → 0.1.2
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.
- data/guilded.gemspec +1 -1
- data/lib/guilded.rb +1 -1
- data/lib/guilded/rails/view_helpers.rb +7 -5
- metadata +1 -1
data/guilded.gemspec
CHANGED
data/lib/guilded.rb
CHANGED
|
@@ -71,7 +71,7 @@ require 'guilded/rails/active_record/human_attribute_override'
|
|
|
71
71
|
# <%= g_load_alerter :skin => 'blueish', :id => 'load_alerter' %>
|
|
72
72
|
#
|
|
73
73
|
module Guilded
|
|
74
|
-
VERSION = '0.1.
|
|
74
|
+
VERSION = '0.1.2'
|
|
75
75
|
end
|
|
76
76
|
|
|
77
77
|
ActionView::Base.send( :include, Guilded::Rails::ViewHelpers ) if defined?( ActionView )
|
|
@@ -35,16 +35,17 @@ module Guilded
|
|
|
35
35
|
# Utilizes the js_include_tag helper from Rails.
|
|
36
36
|
#
|
|
37
37
|
def g_javascript_include_tag( *sources )
|
|
38
|
-
|
|
38
|
+
g = Guilded::Guilder.instance
|
|
39
|
+
#@combined_js_srcs = Array.new if @combined_js_srcs.nil?
|
|
39
40
|
defaults = nil
|
|
40
41
|
if sources.include?( :defaults )
|
|
41
42
|
defaults = ActionView::Helpers::AssetTagHelper::JAVASCRIPT_DEFAULT_SOURCES
|
|
42
43
|
sources.delete( :defaults )
|
|
43
44
|
end
|
|
44
45
|
if defaults
|
|
45
|
-
|
|
46
|
+
g.combined_js_srcs.push( *(sources << defaults) )
|
|
46
47
|
else
|
|
47
|
-
|
|
48
|
+
g.combined_js_srcs.push( *sources )
|
|
48
49
|
end
|
|
49
50
|
''
|
|
50
51
|
end
|
|
@@ -61,8 +62,9 @@ module Guilded
|
|
|
61
62
|
# resets, etc and not override any guilded components styles.
|
|
62
63
|
#
|
|
63
64
|
def g_stylesheet_link_tag( *sources )
|
|
64
|
-
|
|
65
|
-
|
|
65
|
+
g = Guilded::Guilder.instance
|
|
66
|
+
#@combined_css_srcs = Array.new if @combined_css_srcs.nil?
|
|
67
|
+
g.combined_css_srcs.push( sources )
|
|
66
68
|
''
|
|
67
69
|
end
|
|
68
70
|
|