midas-guilded 0.1.1 → 0.1.2

Sign up to get free protection for your applications and to get access to all the features.
data/guilded.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{guilded}
5
- s.version = "0.1.1"
5
+ s.version = "0.1.2"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["C. Jason Harrelson (midas)"]
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.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
- @combined_js_srcs = Array.new if @combined_js_srcs.nil?
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
- @combined_js_srcs.push( *(sources << defaults) )
46
+ g.combined_js_srcs.push( *(sources << defaults) )
46
47
  else
47
- @combined_js_srcs.push( *sources )
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
- @combined_css_srcs = Array.new if @combined_css_srcs.nil?
65
- @combined_css_srcs.push( sources )
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
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: midas-guilded
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - C. Jason Harrelson (midas)