glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add keyboard shortcut labels

Browse source
This commit is contained in:
Devin Howard 2016-08-07 15:03:10 +08:00
parent 5d66c72941
commit 5e9e443729
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/src/Metamaps.Backbone.js
View file

@ -699,17 +699,13 @@ Metamaps.Backbone.init = function () {
// attach collection event listeners // attach collection event listeners
self.attachCollectionEvents = function () { self.attachCollectionEvents = function () {
Metamaps.Topics.on('add remove', function (topic) { Metamaps.Topics.on('add remove', function (topic) {
if (Metamaps.Active.Map) { Metamaps.Map.InfoBox.updateNumbers()
Metamaps.Map.InfoBox.updateNumbers()
}
Metamaps.Filter.checkMetacodes() Metamaps.Filter.checkMetacodes()
Metamaps.Filter.checkMappers() Metamaps.Filter.checkMappers()
}) })
Metamaps.Synapses.on('add remove', function (synapse) { Metamaps.Synapses.on('add remove', function (synapse) {
if (Metamaps.Active.Map) { Metamaps.Map.InfoBox.updateNumbers()
Metamaps.Map.InfoBox.updateNumbers()
}
Metamaps.Filter.checkSynapses() Metamaps.Filter.checkSynapses()
Metamaps.Filter.checkMappers() Metamaps.Filter.checkMappers()
}) })

4
app/assets/javascripts/src/Metamaps.JIT.js
View file

@ -1316,7 +1316,7 @@ Metamaps.JIT = {
if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete<div class="rc-keyboard">Ctrl+D</div></li>' if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete<div class="rc-keyboard">Ctrl+D</div></li>'
if (Metamaps.Active.Topic) { if (Metamaps.Active.Topic) {
menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic</li>' menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic<div class="rc-keyboard">Ctrl+U</div></li>'
} }
menustring += '<li class="rc-popout"><div class="rc-icon"></div>Open in new tab</li>' menustring += '<li class="rc-popout"><div class="rc-icon"></div>Open in new tab</li>'
if (Metamaps.Active.Mapper) { if (Metamaps.Active.Mapper) {
@ -1341,7 +1341,7 @@ Metamaps.JIT = {
// set up the get sibling menu as a "lazy load" // set up the get sibling menu as a "lazy load"
// only fill in the submenu when they hover over the get siblings list item // only fill in the submenu when they hover over the get siblings list item
var siblingMenu = '<ul id="fetchSiblingList"> \ var siblingMenu = '<ul id="fetchSiblingList"> \
<li class="fetchAll">All</li> \ <li class="fetchAll">All<div class="rc-keyboard">Ctrl+Y</div></li> \
<li id="loadingSiblings"></li> \ <li id="loadingSiblings"></li> \
</ul>' </ul>'
menustring += '<li class="rc-siblings"><div class="rc-icon"></div>Get siblings' + siblingMenu + '<div class="expandLi"></div></li>' menustring += '<li class="rc-siblings"><div class="rc-icon"></div>Get siblings' + siblingMenu + '<div class="expandLi"></div></li>'

2
app/assets/javascripts/src/Metamaps.Map.js
View file

@ -673,6 +673,8 @@ Metamaps.Map.InfoBox = {
return string return string
}, },
updateNumbers: function () { updateNumbers: function () {
if (!Metamaps.Active.Map) return
var self = Metamaps.Map.InfoBox var self = Metamaps.Map.InfoBox
var mapper = Metamaps.Active.Mapper var mapper = Metamaps.Active.Mapper
var relevantPeople = Metamaps.Active.Map.get('permission') === 'commons' ? Metamaps.Mappers : Metamaps.Collaborators var relevantPeople = Metamaps.Active.Map.get('permission') === 'commons' ? Metamaps.Mappers : Metamaps.Collaborators

3
app/assets/stylesheets/application.css.erb
View file

@ -1249,8 +1249,9 @@ h3.filterBox {
.rightclickmenu .rc-metacode > ul > li, .rightclickmenu .rc-metacode > ul > li,
.rightclickmenu .rc-siblings > ul > li { .rightclickmenu .rc-siblings > ul > li {
padding: 6px 24px 6px 8px; padding: 6px 24px 6px 8px;
width: auto;
white-space: nowrap; white-space: nowrap;
width: auto;
min-width: 5em;
} }
.rightclickmenu .rc-metacode ul ul, .rightclickmenu .rc-metacode ul ul,
.rightclickmenu .rc-siblings ul ul { .rightclickmenu .rc-siblings ul ul {