OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe685d1
01bd644
)
m
author
yasushiito
<yas@pen-chan.jp>
Sun, 17 Nov 2013 05:47:42 +0000
(14:47 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Sun, 17 Nov 2013 05:47:42 +0000
(14:47 +0900)
1
2
app/models/speech_balloon.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/models/speech_balloon.rb
index
8aabc7a
,
e58d0b7
..
8c6423f
---
1
/
app/models/speech_balloon.rb
---
2
/
app/models/speech_balloon.rb
+++ b/
app/models/speech_balloon.rb
@@@
-72,7
-72,11
+72,11
@@@
class SpeechBalloon < ActiveRecord::Bas
self.panel.visible? roles
end
- def new_sballoon
+ def symbol_option
+ self.speech_balloon_template.symbol_option
+ end
+
+ def new_balloon
@new_balloon
end