Reset

janfaracik · Jul 12, 2022 · b710e4d · b710e4d
1 parent 3da7082
commit b710e4d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 59 deletions.
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
@@ -36,10 +36,10 @@ THE SOFTWARE.
       <st:include page="actions.jelly" />
       <t:actions actions="${it.transientActions}"/>
       <j:if test="${it.previousBuild!=null}">
-        <l:task contextMenu="false" href="${buildUrl.previousBuildUrl}" icon="icon-previous icon-md" title="${%Previous Build}" keyboardShortcut="J" />
+        <l:task contextMenu="false" href="${buildUrl.previousBuildUrl}" icon="icon-previous icon-md" title="${%Previous Build}" />
       </j:if>
       <j:if test="${it.nextBuild!=null}">
-        <l:task contextMenu="false" href="${buildUrl.nextBuildUrl}" icon="icon-next icon-md" title="${%Next Build}" keyboardShortcut="K" />
+        <l:task contextMenu="false" href="${buildUrl.nextBuildUrl}" icon="icon-next icon-md" title="${%Next Build}" />
       </j:if>
     </l:tasks>
   </l:side-panel>

diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
@@ -47,7 +47,7 @@ THE SOFTWARE.
       </j:choose>
       <l:task contextMenu="false" href="${url}/" icon="symbol-details" title="${%Status}"/>
       <l:task href="${url}/changes" icon="symbol-changes" title="${%Changes}"/>
-      <l:task icon="symbol-folder"  href="${url}/ws/" title="${%Workspace}" permission="${it.WORKSPACE}" keyboardShortcut="W">
+      <l:task icon="symbol-folder"  href="${url}/ws/" title="${%Workspace}" permission="${it.WORKSPACE}">
         <l:task confirmationMessage="${%wipe.out.confirm}" href="${url}/doWipeOutWorkspace" icon="symbol-trash" permission="${h.isWipeOutPermissionEnabled() ? it.WIPEOUT : it.BUILD}" post="true" requiresConfirmation="true" title="${%Wipe Out Workspace}"/>
       </l:task>
       <j:if test="${it.configurable}">

diff --git a/core/src/main/resources/lib/hudson/project/configurable.jelly b/core/src/main/resources/lib/hudson/project/configurable.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
     <j:if test="${it.buildable}">
         <j:set var="id" value="${h.generateId()}"/>
-        <l:task href="${url}/build?delay=0sec" icon="icon-clock icon-md" onclick="${it.parameterized?null:'return build_' + id + '(this)'}" permission="${it.BUILD}" post="${!it.parameterized}" title="${it.buildNowText}" keyboardShortcut="B" />
+        <l:task href="${url}/build?delay=0sec" icon="icon-clock icon-md" onclick="${it.parameterized?null:'return build_' + id + '(this)'}" permission="${it.BUILD}" post="${!it.parameterized}" title="${it.buildNowText}" />
         <script>
             function build_${id}(a) {
                 new Ajax.Request(a.href);
@@ -38,10 +38,10 @@ THE SOFTWARE.
     </j:if>
     <j:choose>
         <j:when test="${h.hasPermission(it,it.CONFIGURE)}">
-            <l:task href="${url}/configure" icon="symbol-settings" title="${%Configure}" keyboardShortcut="S"/>
+            <l:task href="${url}/configure" icon="symbol-settings" title="${%Configure}" />
         </j:when>
         <j:when test="${h.hasPermission(it,it.EXTENDED_READ)}">
-            <l:task href="${url}/configure" icon="symbol-settings" title="${%View Configuration}" keyboardShortcut="S"/>
+            <l:task href="${url}/configure" icon="symbol-settings" title="${%View Configuration}" />
         </j:when>
     </j:choose>
     <l:task confirmationMessage="${%delete.confirm(it.pronoun, it.displayName)}" href="${url}/doDelete" icon="icon-edit-delete icon-md" permission="${it.DELETE}" post="true" requiresConfirmation="true" title="${%delete(it.pronoun)}"/>

diff --git a/core/src/main/resources/lib/hudson/project/console-link.jelly b/core/src/main/resources/lib/hudson/project/console-link.jelly
@@ -28,11 +28,11 @@ THE SOFTWARE.
     <j:choose>
         <j:when test="${it.logFile.length() > 200000}">
             <!-- Show raw link directly so user need not click through live console page, though this is not so bad now as they would just see: Skipping nnn KB.. Full Log. -->
-            <l:task href="${buildUrl.baseUrl}/console" icon="icon-terminal icon-md" title="${%Console Output}" keyboardShortcut="C" />
+            <l:task href="${buildUrl.baseUrl}/console" icon="icon-terminal icon-md" title="${%Console Output}" />
             <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
         </j:when>
         <j:otherwise>
-            <l:task icon="images/svgs/terminal.svg" href="${buildUrl.baseUrl}/console" title="${%Console Output}" keyboardShortcut="C">
+            <l:task icon="images/svgs/terminal.svg" href="${buildUrl.baseUrl}/console" title="${%Console Output}">
                 <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
             </l:task>
         </j:otherwise>

diff --git a/core/src/main/resources/lib/layout/confirmationLink.jelly b/core/src/main/resources/lib/layout/confirmationLink.jelly
@@ -41,6 +41,6 @@ THE SOFTWARE.
             A CSS class to use to style the link.
         </st:attribute>
     </st:documentation>
-    <a href="#" class="${class} confirmation-link" data-post="${post}" data-url="${attrs.href}" data-message="${message}" data-keyboard-shortcut="${attrs.keyboardShortcut}" tooltip="${attrs.keyboardShortcut}"><d:invokeBody/></a>
+    <a href="#" class="${class} confirmation-link" data-post="${post}" data-url="${attrs.href}" data-message="${message}" tooltip="${attrs.keyboardShortcut}"><d:invokeBody/></a>
     <st:adjunct includes="lib.layout.confirmationLink.adjunct "/>
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/keyboardShortcut.jelly b/core/src/main/resources/lib/layout/keyboardShortcut.jelly
diff --git a/core/src/main/resources/lib/layout/task.jelly b/core/src/main/resources/lib/layout/task.jelly
@@ -171,17 +171,15 @@ THE SOFTWARE.
                     <l:icon src="${icon}" />
                   </span>
                   <span>${title}</span>
-                  <l:keyboardShortcut keys="${attrs.keyboardShortcut}" />
                 </l:confirmationLink>
               </j:when>
 
               <j:otherwise>
-                <a href="${href}" class="task-link ${isCurrent ? 'task-link--active' : ''}" onclick="${attrs.onclick ?: (post ? 'return postRequest_' + id + '(this)' : null)}" data-keyboard-shortcut="${attrs.keyboardShortcut}">
+                <a href="${href}" class="task-link ${isCurrent ? 'task-link--active' : ''}" onclick="${attrs.onclick ?: (post ? 'return postRequest_' + id + '(this)' : null)}">
                   <span class="task-icon-link">
                     <l:icon src="${icon}" />
                   </span>
                   <span class="task-link-text">${title}</span>
-                  <l:keyboardShortcut keys="${attrs.keyboardShortcut}" />
                 </a>
               </j:otherwise>
             </j:choose>