Merge branch 'hotfix-1.0.9' into stable

pixl8 · Jul 18, 2024 · d0d36df · d0d36df
2 parents 1f18f09 + 12dc912
commit d0d36df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.0.9
+
+* Fix issue with empty keyboard shortcut key in top right buttons
+
 ## v1.0.8
 
 * [#5](https://github.com/pixl8/preside-ext-alt-admin-theme/issues/5) Ensure the active site is included in the cache key for the menu cache

diff --git a/views/admin/datamanager/_topRightButton.cfm b/views/admin/datamanager/_topRightButton.cfm
@@ -12,14 +12,14 @@
 
 <cfoutput>
 	<cfif !children.len()>
-		<a class="pull-right btn #btnClass# btn-sm inline<cfif prompt.len()> confirmation-prompt</cfif>" href="#link#" data-global-key="#globalKey#"<cfif prompt.len()> title="#HtmlEditFormat( prompt )#"</cfif><cfif target.len()> target="#target#"</cfif><cfif match.len()> data-confirmation-match="#match#"</cfif>>
+		<a class="pull-right btn #btnClass# btn-sm inline<cfif prompt.len()> confirmation-prompt</cfif>" href="#link#"<cfif not isEmptyString( globalKey )> data-global-key="#globalKey#"</cfif><cfif prompt.len()> title="#HtmlEditFormat( prompt )#"</cfif><cfif target.len()> target="#target#"</cfif><cfif match.len()> data-confirmation-match="#match#"</cfif>>
 			<cfif !isEmpty(iconClass)><i class="fa fa-fw #iconClass#"></i></cfif>
 			#title#
 		</a>
 	<cfelse>
 		<div class="btn-group<cfif Len( link )> primary-action-with-dropdown</cfif> pull-right">
 			<cfif Len( link )>
-				<a class="btn #btnClass# btn-sm inline<cfif prompt.len()> confirmation-prompt</cfif>" href="#link#" data-global-key="#globalKey#"<cfif prompt.len()> title="#HtmlEditFormat( prompt )#"</cfif><cfif target.len()> target="#target#"</cfif><cfif match.len()> data-confirmation-match="#match#"</cfif>>
+				<a class="btn #btnClass# btn-sm inline<cfif prompt.len()> confirmation-prompt</cfif>" href="#link#"<cfif not isEmptyString( globalKey )> data-global-key="#globalKey#"</cfif><cfif prompt.len()> title="#HtmlEditFormat( prompt )#"</cfif><cfif target.len()> target="#target#"</cfif><cfif match.len()> data-confirmation-match="#match#"</cfif>>
 					<cfif !isEmpty(iconClass)><i class="fa fa-fw #iconClass#"></i></cfif>
 					#title#
 				</a>