diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css index 85fcb6e..7568bd2 100644 --- a/submodules/strategy/strategy.css +++ b/submodules/strategy/strategy.css @@ -520,7 +520,7 @@ } #strategy_menu_popup { - width: 700px; + width: 760px; padding: 20px; } #strategy_menu_popup > div:not(:last-of-type) { @@ -528,10 +528,13 @@ } #strategy_menu_popup .menu-block > div { float: left; - width: 340px; +} +#strategy_menu_popup .menu-block .left { + width: 400px; } #strategy_menu_popup .menu-block .right { margin-left: 20px; + width: 340px; } #strategy_menu_popup .menu-block .title { color: #22a5ff; @@ -549,18 +552,6 @@ display: inline-block; vertical-align: middle; } -#strategy_menu_popup .menu-block .menu-line .number-input { - width: 18px; - text-align: center; -} -#strategy_menu_popup .menu-block .menu-line .number-text { - width: 32px; - text-align: center; - color: #22a5ff; - font-size: 18px; - font-weight: bold; - cursor: pointer; -} #strategy_menu_popup .menu-block .menu-line .target-input .add-on { width: 20px; } @@ -579,12 +570,6 @@ color: #ff1212 !important; text-shadow: 1px 1px 1px #999; } -#strategy_menu_popup .menu-block .menu-line.editing .number-text { - display: none; -} -#strategy_menu_popup .menu-block .menu-line:not(.editing) .number-input { - display: none; -} #strategy_menu_popup .menu-block .add-menu-line { margin-top: 10px; diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index b2896de..6119aa7 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -1605,24 +1605,24 @@ define(function(require){ } }); - container.on('click', '.number-text', function(e) { - var $this = $(this); - $this.parents('.menu-line').addClass('editing'); - $this.siblings('.number-input').focus(); - }); - - container.on('blur', '.number-input', function(e) { - var $this = $(this); - $this.parents('.menu-line').removeClass('editing'); - $this.siblings('.number-text').text($this.val() || "?"); - }); - - container.on('keyup', '.number-input', function(e) { - var $this = $(this); - if(!/^[0-9#*]*$/.test($this.val())) { - $this.val($this.val().replace(/[^0-9#*]/g, "")); - } - }); + // container.on('click', '.number-text', function(e) { + // var $this = $(this); + // $this.parents('.menu-line').addClass('editing'); + // $this.siblings('.number-input').focus(); + // }); + + // container.on('blur', '.number-input', function(e) { + // var $this = $(this); + // $this.parents('.menu-line').removeClass('editing'); + // $this.siblings('.number-text').text($this.val() || "?"); + // }); + + // container.on('keyup', '.number-input', function(e) { + // var $this = $(this); + // if(!/^[0-9#*]*$/.test($this.val())) { + // $this.val($this.val().replace(/[^0-9#*]/g, "")); + // } + // }); container.on('change', '.target-select', function(e) { var $this = $(this), diff --git a/views/strategy-menuLine.html b/views/strategy-menuLine.html index a5cff5e..97b7c2b 100644 --- a/views/strategy-menuLine.html +++ b/views/strategy-menuLine.html @@ -1,7 +1,21 @@