UI-1657: Add new key selector to expose a default action, update CSS and remove unecessary markup and JS

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;

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),

views/strategy-menuLine.html

@@ -1,7 +1,21 @@
 <div class="menu-line {{#unless number}}editing{{/unless}}">
 	<div class="text">{{i18n.strategy.popup.pressKey}}</div>
-	<div class="number-text">{{number}}</div>
-	<input class="number-input" type="text" maxlength="2" value="{{number}}">
+	<select class="number-input span1">
+	{{#select number}}
+		<option value="default">Default action</option>
+		<option value="0">0</option>
+		<option value="1">1</option>
+		<option value="2">2</option>
+		<option value="3">3</option>
+		<option value="4">4</option>
+		<option value="5">5</option>
+		<option value="6">6</option>
+		<option value="7">7</option>
+		<option value="8">8</option>
+		<option value="9">9</option>
+		<option value="*">*</option>
+	{{/select}}
+	</select>
 	<div class="text">{{i18n.strategy.popup.for}}</div>
 	<div class="input-prepend target-input">
 		<span class="add-on"><i class="target-icon"></i></span>