github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-24 00:06:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show actual binding if user clicks a binding item

Browse Source
This commit is contained in:
Siteshwar Vashisht 2013-10-27 18:51:50 +05:30
parent be55d2c57f
commit 9e424ed921
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/tools/web_config/js/filters.js
View File

@ -25,7 +25,7 @@ filters.filter("filterBinding", function() {
for(i=0; i<bindings.length; ++i) {
binding = bindings[i];
if (binding.command.indexOf(query) != -1 || binding.binding.toLowerCase().indexOf(query.toLowerCase()) != -1) {
if (binding.command.indexOf(query) != -1 || binding.readable_binding.toLowerCase().indexOf(query.toLowerCase()) != -1) {
result.push(binding);
}
}

3
share/tools/web_config/partials/bindings.html
View File

@ -6,7 +6,8 @@
<tbody>
<tr class="data_table_row" ng-repeat="binding in bindings | filterBinding:query">
<td ng-class="{ data_table_cell: true, no_overflow: !binding._is_selected }" style="text-align: right; padding-right: 30px;" ng-click="binding._is_selected = !binding._is_selected">{{ binding.command }}</td>
<td class="data_table_cell no_overflow" style="text-align: left; padding-right: 30px;">{{ binding.binding }}</td>
<!-- Some bindings are listed multiple times for e.g. function backward-char is bound to \e\[D as well as key left. Users may want to know why some bindings are listed twice, so the actual binding is shown in next line on a click -->
<td ng-class="{ data_table_cell: true, no_overflow: !binding._is_selected }" style="text-align: left; padding-right: 30px;" ng-click="binding._is_selected = !binding._is_selected">{{ binding.readable_binding }} <div ng-show="binding._is_selected"> {{ binding.binding }} </div> </td>
</tr>
</tbody>
</table>

9
share/tools/web_config/webconfig.py
View File

@ -253,13 +253,14 @@ class FishVar:
class FishBinding:
"""A class that represents keyboard binding """
def __init__(self, command, binding, description=None):
def __init__(self, command, binding, readable_binding, description=None):
self.command = command
self.binding = binding
self.readable_binding = readable_binding
self.description = description
def get_json_obj(self):
return {"command" : self.command, "binding": self.binding, "description": self.description }
return {"command" : self.command, "binding": self.binding, "readable_binding": self.readable_binding, "description": self.description }
def get_readable_binding(command):
return command
@ -535,10 +536,10 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
if comps[1] == '-k':
key_name, command = comps[2].split(' ', 2)
binding_parser.set_buffer(key_name, True)
fish_binding = FishBinding(command=command, binding=binding_parser.get_readable_binding())
fish_binding = FishBinding(command=command, binding=key_name, readable_binding=binding_parser.get_readable_binding())
else:
binding_parser.set_buffer(comps[1])
fish_binding = FishBinding(command=comps[2], binding=binding_parser.get_readable_binding())
fish_binding = FishBinding(command=comps[2], binding=comps[1], readable_binding=binding_parser.get_readable_binding())
bindings.append(fish_binding)