vendor/assets/javascripts/ace/ext-keybinding_menu.js in ace-rails-ap-4.1.5 vs vendor/assets/javascripts/ace/ext-keybinding_menu.js in ace-rails-ap-4.2

- old
+ new

@@ -20,22 +20,21 @@ background-color: rgba(255, 255, 255, 0.6);\ color: black;\ }\ .ace_optionsMenuEntry:hover {\ background-color: rgba(100, 100, 100, 0.1);\ --webkit-transition: all 0.5s;\ transition: all 0.3s\ }\ .ace_closeButton {\ background: rgba(245, 146, 146, 0.5);\ border: 1px solid #F48A8A;\ border-radius: 50%;\ padding: 7px;\ position: absolute;\ right: -8px;\ top: -8px;\ -z-index: 1000;\ +z-index: 100000;\ }\ .ace_closeButton{\ background: rgba(245, 146, 146, 0.9);\ }\ .ace_optionsMenuKey {\ @@ -43,10 +42,26 @@ font-weight: bold;\ }\ .ace_optionsMenuCommand {\ color: darkcyan;\ font-weight: normal;\ +}\ +.ace_optionsMenuEntry input, .ace_optionsMenuEntry button {\ +vertical-align: middle;\ +}\ +.ace_optionsMenuEntry button[ace_selected_button=true] {\ +background: #e7e7e7;\ +box-shadow: 1px 0px 2px 0px #adadad inset;\ +border-color: #adadad;\ +}\ +.ace_optionsMenuEntry button {\ +background: white;\ +border: 1px solid lightgray;\ +margin: 0px;\ +}\ +.ace_optionsMenuEntry button:hover{\ +background: #f0f0f0;\ }"; dom.importCssString(cssText); module.exports.overlayPage = function overlayPage(editor, contentElement, top, right, bottom, left) { top = top ? 'top: ' + top + ';' : ''; bottom = bottom ? 'bottom: ' + bottom + ';' : ''; @@ -113,11 +128,11 @@ var commands = ckb[i]; if (!Array.isArray(commands)) commands = [commands]; commands.forEach(function(command) { if (typeof command != "string") - command = command.name + command = command.name; if (commandMap[command]) { commandMap[command].key += "|" + key; } else { commandMap[command] = {key: key, command: command}; keybindings.push(commandMap[command]); @@ -161,10 +176,13 @@ editor.showKeyboardShortcuts(); } }]); }; -}); - (function() { - window.require(["ace/ext/keybinding_menu"], function() {}); +}); (function() { + window.require(["ace/ext/keybinding_menu"], function(m) { + if (typeof module == "object" && typeof exports == "object" && module) { + module.exports = m; + } + }); })(); \ No newline at end of file