From 2c34143c6b868a285bc35294825f90028490d4a5 Mon Sep 17 00:00:00 2001 From: Junichi Ishikura Date: Tue, 7 Jul 2015 16:37:50 +0900 Subject: [PATCH 1/6] [#57117664] added set_volume block. --- .../javascripts/blocks/sound.js.coffee.erb | 18 ++++++++++++++++++ app/assets/javascripts/msg/en_us.js | 1 + app/assets/javascripts/msg/ja.js | 1 + .../ruby_to_block/block/sound_set_volume.rb | 15 +++++++++++++++ app/views/editor/_toolbox_default.html.haml | 4 ++++ 5 files changed, 39 insertions(+) create mode 100644 app/models/concerns/ruby_to_block/block/sound_set_volume.rb diff --git a/app/assets/javascripts/blocks/sound.js.coffee.erb b/app/assets/javascripts/blocks/sound.js.coffee.erb index ee7c4c9..6e49148 100644 --- a/app/assets/javascripts/blocks/sound.js.coffee.erb +++ b/app/assets/javascripts/blocks/sound.js.coffee.erb @@ -66,6 +66,24 @@ Blockly.Blocks['<%= n %>'] = Blockly.Ruby['<%= n %>'] = (block) -> 'stop\n' +# 音量を()%にする +<% n = "#{category}_set_volume" %> +Blockly.Blocks['<%= n %>'] = + init: ()-> + @setHelpUrl('') + @setColour(<%= color %>) + @interpolateMsg(<%= bm('.set_volume') %>, + ['VOLUME', ['Number'], Blockly.ALIGN_RIGHT] + Blockly.ALIGN_RIGHT) + @setInputsInline(true) + @setPreviousStatement(true) + @setNextStatement(true) + @setTooltip('') + +Blockly.Ruby['<%= n %>'] = (block) -> + volume = Blockly.Ruby.valueToCode(@, 'VOLUME', Blockly.Ruby.ORDER_NONE) || '100' + Blockly.Ruby.characterSetVariable_('volume', volume) + # 変数:ボリューム <% n = "#{category}_volume" %> Blockly.Blocks['<%= n %>'] = diff --git a/app/assets/javascripts/msg/en_us.js b/app/assets/javascripts/msg/en_us.js index 12c660c..12ff224 100644 --- a/app/assets/javascripts/msg/en_us.js +++ b/app/assets/javascripts/msg/en_us.js @@ -205,6 +205,7 @@ Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_RA = 'A of piano'; Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SI = 'B of piano'; Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO_2 = 'High C of piano'; Blockly.Msg.BLOCKS_SOUND_PLAY = 'play sound %1'; +Blockly.Msg.BLOCKS_SOUND_SET_VOLUME = 'set volume to %1 %'; // blocks/looks.js.coffee.erb diff --git a/app/assets/javascripts/msg/ja.js b/app/assets/javascripts/msg/ja.js index 46f928b..3dd69b3 100644 --- a/app/assets/javascripts/msg/ja.js +++ b/app/assets/javascripts/msg/ja.js @@ -209,6 +209,7 @@ Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_RA = 'ピアノのラ'; Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SI = 'ピアノのシ'; Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO_2 = 'ピアノの高いド'; Blockly.Msg.BLOCKS_SOUND_PLAY = '♪%1 の音を鳴らす'; +Blockly.Msg.BLOCKS_SOUND_SET_VOLUME = '♪音量を %1 %にする'; // blocks/looks.js.coffee.erb diff --git a/app/models/concerns/ruby_to_block/block/sound_set_volume.rb b/app/models/concerns/ruby_to_block/block/sound_set_volume.rb new file mode 100644 index 0000000..e322808 --- /dev/null +++ b/app/models/concerns/ruby_to_block/block/sound_set_volume.rb @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +module RubyToBlock + module Block + class SoundSetVolume < CharacterMethodCall + blocknize '^\s*' + CHAR_RE + 'volume\s*=\s*(\S+)\s*$', + statement: true, inline: true + + def self.process_match_data(md, context) + md2 = regexp.match(md[type]) + add_character_method_call_block(context, md2[1], new, VOLUME: md2[2]) + true + end + end + end +end diff --git a/app/views/editor/_toolbox_default.html.haml b/app/views/editor/_toolbox_default.html.haml index 5077bb0..fbdf6aa 100644 --- a/app/views/editor/_toolbox_default.html.haml +++ b/app/views/editor/_toolbox_default.html.haml @@ -272,6 +272,10 @@ -# すべての音を止める -#%block{:type => "#{category}_stop"} + -# 音量を()%にする + %block{:type => "#{category}_set_volume"} + = toolbox_number_value('VOLUME', 100) + -# 変数:ボリューム -#%block{:type => "#{category}_volume"} From c2f681dc4de4f89511599a00b8e9d5392988d066 Mon Sep 17 00:00:00 2001 From: Junichi Ishikura Date: Tue, 7 Jul 2015 16:41:51 +0900 Subject: [PATCH 2/6] [#57117664] added spec and cucumber test. --- .../blocks/sound/set_volume.feature | 81 +++++++++++++++++++ .../ruby_to_block/block/sound_spec.rb | 18 ++++- 2 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 spec/acceptance/block_mode/blocks/sound/set_volume.feature diff --git a/spec/acceptance/block_mode/blocks/sound/set_volume.feature b/spec/acceptance/block_mode/blocks/sound/set_volume.feature new file mode 100644 index 0000000..b7a03f1 --- /dev/null +++ b/spec/acceptance/block_mode/blocks/sound/set_volume.feature @@ -0,0 +1,81 @@ +# encoding: utf-8 +# language: ja +@javascript +機能: sound_set_volume - 「音量を( )%にする」ブロック + シナリオ: ブロックのみ配置する + 前提 "ブロック" タブを表示する + + もし 次のブロックを配置する: + """ + %block{:type => "sound_set_volume", :x => "0", :y => "0"} + %value{:name => "VOLUME"} + %block{:type => "math_number"} + %field{:name => "NUM"}< + 100 + """ + かつ ブロックからソースコードを生成する + + ならば テキストエディタのプログラムは "" であること + + シナリオ: キャラクターとブロックを配置する + 前提 "ブロック" タブを表示する + かつ 次のキャラクターを追加する: + | name | costumes | x | y | angle | + | car1 | car1.png | 0 | 0 | 0 | + + もし 次のブロックを配置する: + """ + %block{:type => "character_new", :x => "21", :y => "15"} + %field{:name => "NAME"}< + car1 + %statement{:name => "DO"} + %block{:type => "sound_set_volume", :x => "0", :y => "0"} + %value{:name => "VOLUME"} + %block{:type => "math_number"} + %field{:name => "NUM"}< + 100 + """ + かつ ブロックからソースコードを生成する + + ならば テキストエディタのプログラムは以下であること: + """ + require "smalruby" + + car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0) + car1.volume = 100 + + """ + + シナリオ: キャラクターとイベントとブロックを配置する + 前提 "ブロック" タブを表示する + かつ 次のキャラクターを追加する: + | name | costumes | x | y | angle | + | car1 | car1.png | 0 | 0 | 0 | + + もし 次のブロックを配置する: + """ + %block{:type => "character_new", :x => "21", :y => "15"} + %field{:name => "NAME"}< + car1 + %statement{:name => "DO"} + %block{:type => "events_on_start"} + %statement{:name => "DO"} + %block{:type => "sound_set_volume", :x => "0", :y => "0"} + %value{:name => "VOLUME"} + %block{:type => "math_number"} + %field{:name => "NUM"}< + 100 + """ + かつ ブロックからソースコードを生成する + + ならば テキストエディタのプログラムは以下であること: + """ + require "smalruby" + + car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0) + + car1.on(:start) do + self.volume = 100 + end + + """ diff --git a/spec/models/concerns/ruby_to_block/block/sound_spec.rb b/spec/models/concerns/ruby_to_block/block/sound_spec.rb index f1ec7a1..71dd31f 100644 --- a/spec/models/concerns/ruby_to_block/block/sound_spec.rb +++ b/spec/models/concerns/ruby_to_block/block/sound_spec.rb @@ -7,6 +7,7 @@ describe RubyToBlock::Block, '音ジャンル', to_blocks: true do parts = <<-EOS car1.on(:start) do + self.volume = 100 play(name: "piano_do.wav") end car1.play(name: "piano_do.wav") @@ -21,12 +22,21 @@ - - - - piano_do.wav + + + + 100 + + + + + piano_do.wav + + + + From 1bdd53e22afd40359f48380436365b1c45befedb Mon Sep 17 00:00:00 2001 From: Junichi Ishikura Date: Tue, 7 Jul 2015 16:43:41 +0900 Subject: [PATCH 3/6] [#57117660] added volume block. --- app/assets/javascripts/blocks/sound.js.coffee.erb | 2 +- app/assets/javascripts/msg/en_us.js | 1 + app/assets/javascripts/msg/ja.js | 1 + app/models/concerns/ruby_to_block/block/sound_volume.rb | 8 ++++++++ app/views/editor/_toolbox_default.html.haml | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 app/models/concerns/ruby_to_block/block/sound_volume.rb diff --git a/app/assets/javascripts/blocks/sound.js.coffee.erb b/app/assets/javascripts/blocks/sound.js.coffee.erb index 6e49148..6d687d6 100644 --- a/app/assets/javascripts/blocks/sound.js.coffee.erb +++ b/app/assets/javascripts/blocks/sound.js.coffee.erb @@ -90,7 +90,7 @@ Blockly.Blocks['<%= n %>'] = init: ()-> @setHelpUrl('') @setColour(<%= color %>) - @appendDummyInput().appendField('ボリューム') + @appendDummyInput().appendField(<%= bm(".volume") %>) @setOutput(true, 'Number') @setTooltip('') diff --git a/app/assets/javascripts/msg/en_us.js b/app/assets/javascripts/msg/en_us.js index 12ff224..a9d45f6 100644 --- a/app/assets/javascripts/msg/en_us.js +++ b/app/assets/javascripts/msg/en_us.js @@ -206,6 +206,7 @@ Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SI = 'B of piano'; Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO_2 = 'High C of piano'; Blockly.Msg.BLOCKS_SOUND_PLAY = 'play sound %1'; Blockly.Msg.BLOCKS_SOUND_SET_VOLUME = 'set volume to %1 %'; +Blockly.Msg.BLOCKS_SOUND_VOLUME = 'volume'; // blocks/looks.js.coffee.erb diff --git a/app/assets/javascripts/msg/ja.js b/app/assets/javascripts/msg/ja.js index 3dd69b3..d27e4bd 100644 --- a/app/assets/javascripts/msg/ja.js +++ b/app/assets/javascripts/msg/ja.js @@ -210,6 +210,7 @@ Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SI = 'ピアノのシ'; Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO_2 = 'ピアノの高いド'; Blockly.Msg.BLOCKS_SOUND_PLAY = '♪%1 の音を鳴らす'; Blockly.Msg.BLOCKS_SOUND_SET_VOLUME = '♪音量を %1 %にする'; +Blockly.Msg.BLOCKS_SOUND_VOLUME = '♪音量'; // blocks/looks.js.coffee.erb diff --git a/app/models/concerns/ruby_to_block/block/sound_volume.rb b/app/models/concerns/ruby_to_block/block/sound_volume.rb new file mode 100644 index 0000000..74f0148 --- /dev/null +++ b/app/models/concerns/ruby_to_block/block/sound_volume.rb @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +module RubyToBlock + module Block + class SoundVolume < Value + blocknize '^\s*volume\s*$', value: true + end + end +end diff --git a/app/views/editor/_toolbox_default.html.haml b/app/views/editor/_toolbox_default.html.haml index fbdf6aa..8bad90f 100644 --- a/app/views/editor/_toolbox_default.html.haml +++ b/app/views/editor/_toolbox_default.html.haml @@ -277,7 +277,7 @@ = toolbox_number_value('VOLUME', 100) -# 変数:ボリューム - -#%block{:type => "#{category}_volume"} + %block{:type => "#{category}_volume"} - category = 'pen' %category{:name => tt('.pen')} From ed59929623330a836a7a6307aae61714c34c1a41 Mon Sep 17 00:00:00 2001 From: Junichi Ishikura Date: Tue, 7 Jul 2015 16:44:22 +0900 Subject: [PATCH 4/6] [#57117660] added spec and cucumber test. --- .../block_mode/blocks/sound/volume.feature | 31 +++++++++++++++++++ .../ruby_to_block/block/sound_volume_spec.rb | 27 ++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 spec/acceptance/block_mode/blocks/sound/volume.feature create mode 100644 spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb diff --git a/spec/acceptance/block_mode/blocks/sound/volume.feature b/spec/acceptance/block_mode/blocks/sound/volume.feature new file mode 100644 index 0000000..e1b88f5 --- /dev/null +++ b/spec/acceptance/block_mode/blocks/sound/volume.feature @@ -0,0 +1,31 @@ +# encoding: utf-8 +# language: ja +@javascript +機能: sound_volume - 「音量」ブロック + 背景: + 前提 "ブロック" タブを表示する + + シナリオ: ブロックを配置する + もし 次のブロックを配置する: + """ + %block{:type => "sound_volume", :x => "0", :y => "0", :inline => "true"} + """ + かつ ブロックからソースコードを生成する + + ならば テキストエディタのプログラムは以下を含むこと: + """ + volume + """ + + もし 次のブロックを配置する: + """ + %block{:type => "ruby_p", :x => "0", :y => "0", :inline => "true"} + %value{:name => "ARG"} + %block{:type => "sound_volume"} + """ + かつ ブロックからソースコードを生成する + + ならば テキストエディタのプログラムは以下を含むこと: + """ + p(volume) + """ diff --git a/spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb b/spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb new file mode 100644 index 0000000..16c83de --- /dev/null +++ b/spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +require 'spec_helper' +require_relative 'shared/block_examples' + +# rubocop:disable EmptyLines, LineLength + +describe RubyToBlock::Block::Text, to_blocks: true do + parts = <<-EOS +require "smalruby" + +p(volume) + EOS + describe compact_source_code(parts) do + _parts = parts + let(:data) { _parts } + + it '結果が正しいこと' do + should eq_block_xml(<<-XML) + + + + + + XML + end + end +end From c708278cb58aea1cbe6dcf8e2aa4263566f5f5ba Mon Sep 17 00:00:00 2001 From: Junichi Ishikura Date: Fri, 10 Jul 2015 12:28:46 +0900 Subject: [PATCH 5/6] fixed spec. refactor. --- .../javascripts/blocks/sound.js.coffee.erb | 2 - .../ruby_to_block/block/sound_set_volume.rb | 5 +- .../ruby_to_block/block/sound_volume.rb | 21 ++++- .../blocks/sound/set_volume.feature | 86 +++++++++---------- .../ruby_to_block/block/sound_spec.rb | 28 ++++++ .../ruby_to_block/block/sound_volume_spec.rb | 27 ------ 6 files changed, 95 insertions(+), 74 deletions(-) delete mode 100644 spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb diff --git a/app/assets/javascripts/blocks/sound.js.coffee.erb b/app/assets/javascripts/blocks/sound.js.coffee.erb index 6d687d6..89db3eb 100644 --- a/app/assets/javascripts/blocks/sound.js.coffee.erb +++ b/app/assets/javascripts/blocks/sound.js.coffee.erb @@ -66,7 +66,6 @@ Blockly.Blocks['<%= n %>'] = Blockly.Ruby['<%= n %>'] = (block) -> 'stop\n' -# 音量を()%にする <% n = "#{category}_set_volume" %> Blockly.Blocks['<%= n %>'] = init: ()-> @@ -84,7 +83,6 @@ Blockly.Ruby['<%= n %>'] = (block) -> volume = Blockly.Ruby.valueToCode(@, 'VOLUME', Blockly.Ruby.ORDER_NONE) || '100' Blockly.Ruby.characterSetVariable_('volume', volume) -# 変数:ボリューム <% n = "#{category}_volume" %> Blockly.Blocks['<%= n %>'] = init: ()-> diff --git a/app/models/concerns/ruby_to_block/block/sound_set_volume.rb b/app/models/concerns/ruby_to_block/block/sound_set_volume.rb index e322808..739ab25 100644 --- a/app/models/concerns/ruby_to_block/block/sound_set_volume.rb +++ b/app/models/concerns/ruby_to_block/block/sound_set_volume.rb @@ -2,7 +2,10 @@ module RubyToBlock module Block class SoundSetVolume < CharacterMethodCall - blocknize '^\s*' + CHAR_RE + 'volume\s*=\s*(\S+)\s*$', + blocknize ['^\s*', + CHAR_RE, + 'volume\s*=\s*(\S+)', + '\s*$'].join(''), statement: true, inline: true def self.process_match_data(md, context) diff --git a/app/models/concerns/ruby_to_block/block/sound_volume.rb b/app/models/concerns/ruby_to_block/block/sound_volume.rb index 74f0148..dfbee1f 100644 --- a/app/models/concerns/ruby_to_block/block/sound_volume.rb +++ b/app/models/concerns/ruby_to_block/block/sound_volume.rb @@ -2,7 +2,26 @@ module RubyToBlock module Block class SoundVolume < Value - blocknize '^\s*volume\s*$', value: true + include CharacterOperation + + blocknize ['^\s*', + CHAR_RE, + 'volume', + '\s*$'].join(''), + value: true + + def self.process_match_data(md, context) + md2 = regexp.match(md[type]) + + character = get_character(context, md2[1]) + return false if context.receiver != character + + block = new + context.add_value(block) + block.character = character + + true + end end end end diff --git a/spec/acceptance/block_mode/blocks/sound/set_volume.feature b/spec/acceptance/block_mode/blocks/sound/set_volume.feature index b7a03f1..a77d42e 100644 --- a/spec/acceptance/block_mode/blocks/sound/set_volume.feature +++ b/spec/acceptance/block_mode/blocks/sound/set_volume.feature @@ -6,13 +6,13 @@ 前提 "ブロック" タブを表示する もし 次のブロックを配置する: - """ - %block{:type => "sound_set_volume", :x => "0", :y => "0"} - %value{:name => "VOLUME"} - %block{:type => "math_number"} - %field{:name => "NUM"}< - 100 - """ + """ + %block{:type => "sound_set_volume", :x => "0", :y => "0"} + %value{:name => "VOLUME"} + %block{:type => "math_number"} + %field{:name => "NUM"}< + 100 + """ かつ ブロックからソースコードを生成する ならば テキストエディタのプログラムは "" であること @@ -24,27 +24,27 @@ | car1 | car1.png | 0 | 0 | 0 | もし 次のブロックを配置する: - """ - %block{:type => "character_new", :x => "21", :y => "15"} - %field{:name => "NAME"}< - car1 - %statement{:name => "DO"} - %block{:type => "sound_set_volume", :x => "0", :y => "0"} - %value{:name => "VOLUME"} - %block{:type => "math_number"} - %field{:name => "NUM"}< - 100 - """ + """ + %block{:type => "character_new", :x => "21", :y => "15"} + %field{:name => "NAME"}< + car1 + %statement{:name => "DO"} + %block{:type => "sound_set_volume", :x => "0", :y => "0"} + %value{:name => "VOLUME"} + %block{:type => "math_number"} + %field{:name => "NUM"}< + 100 + """ かつ ブロックからソースコードを生成する ならば テキストエディタのプログラムは以下であること: - """ - require "smalruby" + """ + require "smalruby" - car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0) - car1.volume = 100 + car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0) + car1.volume = 100 - """ + """ シナリオ: キャラクターとイベントとブロックを配置する 前提 "ブロック" タブを表示する @@ -53,29 +53,29 @@ | car1 | car1.png | 0 | 0 | 0 | もし 次のブロックを配置する: - """ - %block{:type => "character_new", :x => "21", :y => "15"} - %field{:name => "NAME"}< - car1 - %statement{:name => "DO"} - %block{:type => "events_on_start"} - %statement{:name => "DO"} - %block{:type => "sound_set_volume", :x => "0", :y => "0"} - %value{:name => "VOLUME"} - %block{:type => "math_number"} - %field{:name => "NUM"}< - 100 - """ + """ + %block{:type => "character_new", :x => "21", :y => "15"} + %field{:name => "NAME"}< + car1 + %statement{:name => "DO"} + %block{:type => "events_on_start"} + %statement{:name => "DO"} + %block{:type => "sound_set_volume", :x => "0", :y => "0"} + %value{:name => "VOLUME"} + %block{:type => "math_number"} + %field{:name => "NUM"}< + 100 + """ かつ ブロックからソースコードを生成する ならば テキストエディタのプログラムは以下であること: - """ - require "smalruby" + """ + require "smalruby" - car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0) + car1 = Character.new(costume: "costume1:car1.png", x: 0, y: 0, angle: 0) - car1.on(:start) do - self.volume = 100 - end + car1.on(:start) do + self.volume = 100 + end - """ + """ diff --git a/spec/models/concerns/ruby_to_block/block/sound_spec.rb b/spec/models/concerns/ruby_to_block/block/sound_spec.rb index 71dd31f..9afe346 100644 --- a/spec/models/concerns/ruby_to_block/block/sound_spec.rb +++ b/spec/models/concerns/ruby_to_block/block/sound_spec.rb @@ -9,8 +9,11 @@ car1.on(:start) do self.volume = 100 play(name: "piano_do.wav") + p(volume) end car1.play(name: "piano_do.wav") +car1.volume = 100 +p(car1.volume) EOS describe compact_source_code(parts), character_new_data: true do _parts = parts @@ -35,6 +38,13 @@ piano_do.wav + + + + + + + @@ -46,6 +56,24 @@ piano_do.wav + + + + + 100 + + + + + + + car1.volume + + + + + + diff --git a/spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb b/spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb deleted file mode 100644 index 16c83de..0000000 --- a/spec/models/concerns/ruby_to_block/block/sound_volume_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -require 'spec_helper' -require_relative 'shared/block_examples' - -# rubocop:disable EmptyLines, LineLength - -describe RubyToBlock::Block::Text, to_blocks: true do - parts = <<-EOS -require "smalruby" - -p(volume) - EOS - describe compact_source_code(parts) do - _parts = parts - let(:data) { _parts } - - it '結果が正しいこと' do - should eq_block_xml(<<-XML) - - - - - - XML - end - end -end From 51e8242c10ea615d3d157c1d00e940daeb692dbf Mon Sep 17 00:00:00 2001 From: Junichi Ishikura Date: Fri, 10 Jul 2015 18:29:15 +0900 Subject: [PATCH 6/6] removed comments. --- app/views/editor/_toolbox_default.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/editor/_toolbox_default.html.haml b/app/views/editor/_toolbox_default.html.haml index 8bad90f..0868fee 100644 --- a/app/views/editor/_toolbox_default.html.haml +++ b/app/views/editor/_toolbox_default.html.haml @@ -272,11 +272,9 @@ -# すべての音を止める -#%block{:type => "#{category}_stop"} - -# 音量を()%にする %block{:type => "#{category}_set_volume"} = toolbox_number_value('VOLUME', 100) - -# 変数:ボリューム %block{:type => "#{category}_volume"} - category = 'pen'