jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prettifies menu option labels

Browse source 
removes "set" adds space before uppercase letters.

focus handling

focus handling
This commit is contained in:
nightwing 2013-04-13 20:52:50 +04:00
commit fb9bc6d3f4
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ace/ext/menu_tools/overlay_page.js
View file

@ -68,7 +68,7 @@ define(function(require, exports, module) {
* @param {string|number} bottom absolute position value. * @param {string|number} bottom absolute position value.
* @param {string|number} left absolute position value. * @param {string|number} left absolute position value.
*/ */
module.exports.overlayPage = function overlayPage (contentElement, top, right, bottom, left) { module.exports.overlayPage = function overlayPage (editor, contentElement, top, right, bottom, left) {
top = (top) ? 'top: ' + top + ';' : ''; top = (top) ? 'top: ' + top + ';' : '';
bottom = (bottom) ? 'bottom: ' + bottom + ';' : ''; bottom = (bottom) ? 'bottom: ' + bottom + ';' : '';
right = (right) ? 'right: ' + right + ';' : ''; right = (right) ? 'right: ' + right + ';' : '';
@ -90,6 +90,7 @@ module.exports.overlayPage = function overlayPage (contentElement, top, right, b
'background-color: rgba(0, 0, 0, 0.2);'; 'background-color: rgba(0, 0, 0, 0.2);';
closer.addEventListener('click', function () { closer.addEventListener('click', function () {
closer.parentNode.removeChild(closer); closer.parentNode.removeChild(closer);
editor.focus();
closer = null; closer = null;
}); });
// click closer if esc key is pressed // click closer if esc key is pressed
@ -109,6 +110,7 @@ module.exports.overlayPage = function overlayPage (contentElement, top, right, b
contentContainer.appendChild(contentElement); contentContainer.appendChild(contentElement);
closer.appendChild(contentContainer); closer.appendChild(contentContainer);
document.body.appendChild(closer); document.body.appendChild(closer);
editor.blur();
}; };
}); });

2
lib/ace/ext/show_keyboard_shortcuts.js
View file

@ -75,7 +75,7 @@ define(function(require, exports, module) {
el.id = 'kbshortcutmenu'; el.id = 'kbshortcutmenu';
el.innerHTML = '<h1>Keyboard Shortcuts</h1>' + commands + '</div>'; el.innerHTML = '<h1>Keyboard Shortcuts</h1>' + commands + '</div>';
el.style.cssText = 'margin:0; padding:0;'; el.style.cssText = 'margin:0; padding:0;';
overlayPage(el, '0', '0', '0', null); overlayPage(editor, el, '0', '0', '0', null);
} }
}; };
}); });

11
lib/ace/ext/show_settings_menu.js
View file

@ -229,7 +229,14 @@ define(function(require, exports, module) {
div.setAttribute('class', 'menuEntry'); div.setAttribute('class', 'menuEntry');
div.setAttribute('style', 'clear: both;'); div.setAttribute('style', 'clear: both;');
div.appendChild(egen.createLabel(item, item)); div.appendChild(egen.createLabel(
item.replace(
/^set/, ''
).replace(
/([A-Z])/g, ' $1'
).trim(),
item
));
if(Array.isArray(val)) { if(Array.isArray(val)) {
el = egen.createSelection(item, val, clss); el = egen.createSelection(item, val, clss);
@ -366,7 +373,7 @@ define(function(require, exports, module) {
cleanupElementsList(); cleanupElementsList();
// dump the entries from the elements list and wrap them up in a div // dump the entries from the elements list and wrap them up in a div
// then put the div into the generic menu and show it. // then put the div into the generic menu and show it.
overlayPage(wrapElements(), '0', '0', '0'); overlayPage(editor, wrapElements(), '0', '0', '0');
} }
/** /**
* This builds the settings menu and selects * This builds the settings menu and selects