API tools faq
paste
Guest User

Untitled

a guest
Apr 25th, 2018
91
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.48 KB | None | 0 0
raw download clone embed print report
  1. Index: tests/visual/menu/default.html
  2. ===================================================================
  3. --- tests/visual/menu/default.html (revision 3488)
  4. +++ tests/visual/menu/default.html (working copy)
  5. @@ -21,33 +21,6 @@
  6. selected: function(event, ui) {
  7. $("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
  8. }
  9. - }).keydown(function(event) {
  10. - var menu = $(this).data("menu");
  11. - if (menu.widget().is(":hidden"))
  12. - return;
  13. - event.stopPropagation();
  14. - switch (event.keyCode) {
  15. - case $.ui.keyCode.PAGE_UP:
  16. - menu.previousPage();
  17. - event.preventDefault();
  18. - break;
  19. - case $.ui.keyCode.PAGE_DOWN:
  20. - menu.nextPage();
  21. - event.preventDefault();
  22. - break;
  23. - case $.ui.keyCode.UP:
  24. - menu.previous();
  25. - event.preventDefault();
  26. - break;
  27. - case $.ui.keyCode.DOWN:
  28. - menu.next();
  29. - event.preventDefault();
  30. - break;
  31. - case $.ui.keyCode.ENTER:
  32. - menu.select();
  33. - event.preventDefault();
  34. - break;
  35. - }
  36. });
  37.  
  38. });
  39. @@ -60,7 +33,7 @@
  40. </head>
  41. <body>
  42.  
  43. -<ul id="menu1" tabindex="0">
  44. +<ul id="menu1">
  45. <li><a href="#">Aberdeen</a></li>
  46. <li><a href="#">Ada</a></li>
  47. <li><a href="#">Adamsville</a></li>
  48. @@ -68,7 +41,7 @@
  49. <li><a href="#">Adelphi</a></li>
  50. </ul>
  51.  
  52. -<ul id="menu2" tabindex="0">
  53. +<ul id="menu2">
  54. <li><a href="#">Aberdeen</a></li>
  55. <li><a href="#">Ada</a></li>
  56. <li><a href="#">Adamsville</a></li>
  57. Index: tests/visual/menu/contextmenu.html
  58. ===================================================================
  59. --- tests/visual/menu/contextmenu.html (revision 3487)
  60. +++ tests/visual/menu/contextmenu.html (working copy)
  61. @@ -21,6 +21,10 @@
  62. var menus = $("#menu1, #menu2").menu({
  63. selected: function(event, ui) {
  64. $("#log").append("<div>Selected " + ui.item.text() + "</div>");
  65. + $(this).hide();
  66. + },
  67. + keyHandler: function(element) {
  68. + return element.prev();
  69. }
  70. }).hide();
  71.  
  72. @@ -42,23 +46,8 @@
  73. return;
  74. event.stopPropagation();
  75. switch (event.keyCode) {
  76. - case $.ui.keyCode.PAGE_UP:
  77. - menu.previousPage();
  78. - break;
  79. - case $.ui.keyCode.PAGE_DOWN:
  80. - menu.nextPage();
  81. - break;
  82. - case $.ui.keyCode.UP:
  83. - menu.previous();
  84. - break;
  85. - case $.ui.keyCode.DOWN:
  86. - menu.next();
  87. - event.preventDefault();
  88. - break;
  89. - case $.ui.keyCode.ENTER:
  90. case $.ui.keyCode.TAB:
  91. menu.select();
  92. - menu.widget().hide();
  93. event.preventDefault();
  94. break;
  95. case $.ui.keyCode.ESCAPE:
  96. @@ -74,7 +63,6 @@
  97. } else {
  98. character = prev + character;
  99. }
  100. -
  101. var match = menu.widget().children("li").filter(function() {
  102. return new RegExp("^" + character, "i").test($(this).text());
  103. });
  104. @@ -105,13 +93,12 @@
  105. <style>
  106. body { font-size:62.5%; }
  107. .ui-menu { width: 200px; position: absolute; }
  108. - #menu2 { height: 200px; }
  109. + #menu2 { height: 200px; overflow: auto; }
  110. </style>
  111. </head>
  112. <body>
  113.  
  114. <button id="1">Show context menu 1</button>
  115. -
  116. <ul id="menu1">
  117. <li><a href="#">Amsterdam</a></li>
  118. <li><a href="#">Anaheim</a></li>
  119. @@ -123,6 +110,12 @@
  120. <li><a href="#">Zurich</a></li>
  121. </ul>
  122.  
  123. +<div class="ui-widget" style="margin-top:2em; font-family:Arial">
  124. + Log:
  125. + <div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div>
  126. +</div>
  127. +
  128. +<button id="2">Show context menu 2</button>
  129. <ul id="menu2">
  130. <li><a href="#">Aberdeen</a></li>
  131. <li><a href="#">Ada</a></li>
  132. @@ -164,12 +157,5 @@
  133. <li><a href="#">Amesville</a></li>
  134. </ul>
  135.  
  136. -<div class="ui-widget" style="margin-top:2em; font-family:Arial">
  137. - Log:
  138. - <div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div>
  139. -</div>
  140. -
  141. -<button id="2">Show context menu 2</button>
  142. -
  143. </body>
  144. </html>
  145. Index: ui/jquery.ui.autocomplete.js
  146. ===================================================================
  147. --- ui/jquery.ui.autocomplete.js (revision 3487)
  148. +++ ui/jquery.ui.autocomplete.js (working copy)
  149. @@ -28,6 +28,7 @@
  150. .bind("keydown.autocomplete", function(event) {
  151. var keyCode = $.ui.keyCode;
  152. switch(event.keyCode) {
  153. + /*
  154. case keyCode.PAGE_UP:
  155. self.move("previousPage");
  156. break;
  157. @@ -43,6 +44,7 @@
  158. event.preventDefault();
  159. break;
  160. case keyCode.ENTER:
  161. + */
  162. case keyCode.TAB:
  163. if (!self.menu || !self.menu.active) {
  164. return;
  165. @@ -195,7 +197,8 @@
  166. self.previous = data.result;
  167. // TODO only trigger when focus was lost?
  168. self.element.focus();
  169. - }
  170. + },
  171. + keyHandler: this.element
  172. })
  173. .removeClass("ui-corner-all").addClass("ui-corner-bottom")
  174. .position({
  175. Index: ui/jquery.ui.menu.js
  176. ===================================================================
  177. --- ui/jquery.ui.menu.js (revision 3487)
  178. +++ ui/jquery.ui.menu.js (working copy)
  179. @@ -37,6 +37,34 @@
  180. .mouseenter(function() {
  181. self.activate($(this).parent());
  182. });
  183. +
  184. + var keyHandler = $.isFunction(this.options.keyHandler) ? this.options.keyHandler(this.element) : this.options.keyHandler;
  185. + if (!keyHandler) {
  186. + keyHandler = this.element;
  187. + this.element.attr("tabindex", 0)
  188. + }
  189. + $(keyHandler).keydown(function(event) {
  190. + var menu = self
  191. + if (menu.widget().is(":hidden"))
  192. + return;
  193. + switch (event.keyCode) {
  194. + case $.ui.keyCode.PAGE_UP:
  195. + menu.previousPage();
  196. + return false;
  197. + case $.ui.keyCode.PAGE_DOWN:
  198. + menu.nextPage();
  199. + return false;
  200. + case $.ui.keyCode.UP:
  201. + menu.previous();
  202. + return false;
  203. + case $.ui.keyCode.DOWN:
  204. + menu.next();
  205. + return false;
  206. + case $.ui.keyCode.ENTER:
  207. + menu.select();
  208. + return false;
  209. + }
  210. + });
  211. },
  212.  
  213. activate: function(item) {
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!