plain_speech_balloon 0.0.5 → 0.0.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -10,6 +10,4 @@
10
10
  // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
11
11
  // GO AFTER THE REQUIRES BELOW.
12
12
  //
13
- //= require jquery
14
- //= require jquery_ujs
15
13
  //= require_tree .
@@ -1,7 +1,7 @@
1
1
 
2
2
  <div class="field">
3
3
  <%= f.label :content %><br />
4
- <%= f.number_field :content, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:content) %>
4
+ <%= f.text_area :content, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:content) %>
5
5
  </div>
6
6
 
7
7
  <%= f.hidden_field :x, :id => speech.field_tag_id(:x), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :x, :tree => speech.field_tree(:x) %>
@@ -36,13 +36,16 @@ module PlainSpeechBalloon
36
36
  self.speech_balloon || @new_speech_balloon
37
37
  end
38
38
 
39
+ def parsed_settings
40
+ @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
41
+ end
42
+
39
43
  def supply_default
40
- parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
41
- s = parsed_settings['all']['balloon']
44
+ s = self.parsed_settings['all']['balloon']
42
45
  self.x = 0
43
46
  self.y = 0
44
- self.width = parsed_settings['speech_balloon']['default_width']
45
- self.height = parsed_settings['speech_balloon']['default_height']
47
+ self.width = self.parsed_settings['speech_balloon']['default_width']
48
+ self.height = self.parsed_settings['speech_balloon']['default_height']
46
49
  self.r = 0
47
50
  end
48
51
 
@@ -55,8 +58,7 @@ module PlainSpeechBalloon
55
58
  end
56
59
 
57
60
  def select_system_picture
58
- parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
59
- s = parsed_settings['all']['balloon']
61
+ s = self.parsed_settings['all']['balloon']
60
62
  self.system_picture_id = s['system_picture_id']
61
63
  self.system_picture_id
62
64
  end
@@ -1,3 +1,3 @@
1
1
  module PlainSpeechBalloon
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: plain_speech_balloon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-01 00:00:00.000000000 Z
12
+ date: 2013-07-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -51,12 +51,7 @@ extensions: []
51
51
  extra_rdoc_files: []
52
52
  files:
53
53
  - app/assets/javascripts/plain_speech_balloon/application.js
54
- - app/assets/javascripts/plain_speech_balloon/balloon.js
55
- - app/assets/javascripts/plain_speech_balloon/balloons.js
56
- - app/assets/javascripts/plain_speech_balloon/speech.js
57
- - app/assets/javascripts/plain_speech_balloon/speeches.js
58
- - app/assets/javascripts/plain_speech_balloon/speech_balloon.js
59
- - app/assets/javascripts/plain_speech_balloon/speech_balloons.js
54
+ - app/assets/javascripts/plain_speech_balloon/balloons.js.coffee
60
55
  - app/assets/stylesheets/plain_speech_balloon/application.css
61
56
  - app/assets/stylesheets/plain_speech_balloon/balloon.css
62
57
  - app/assets/stylesheets/plain_speech_balloon/balloons.css
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.
@@ -1,2 +0,0 @@
1
- // Place all the behaviors and hooks related to the matching controller here.
2
- // All this logic will automatically be available in application.js.