Fixed issue where link to Nomad wasn't working for collapse Button

(reference #53)
Moonshine-IDE · May 27, 2024 · 80bade2 · 80bade2
1 parent 8d9aca5
commit 80bade2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/...an.Portal_Royale/src/net/apacheRoyaleTemplatedApp/mediator/bookmarks/MediatorBookmarks.as b/...an.Portal_Royale/src/net/apacheRoyaleTemplatedApp/mediator/bookmarks/MediatorBookmarks.as
@@ -23,8 +23,7 @@ package mediator.bookmarks
     import view.applications.ConfigurationAppDetails;
     import view.bookmarks.Bookmark;
     import view.bookmarks.event.BookmarkEvent;
-    import org.apache.royale.net.navigateToURL;
-    import org.apache.royale.net.URLRequest;
+    import view.controls.LinkWithDescriptionAppButton;
 
     public class MediatorBookmarks extends Mediator implements IMediator
     {
@@ -183,21 +182,37 @@ package mediator.bookmarks
 			var listCount:int = view.bookmarksList.numElements - 1;
 			for (var i:int = listCount; i >= 0; i--)
 			{
-				var bookmarkItem:Object = view.bookmarksList.getElementAt(i);
-					bookmarkItem.removeEventListener(BookmarkEvent.EDIT_BOOKMARK, onModifyBookmark);
-					bookmarkItem.removeEventListener(BookmarkEvent.DELETE_BOOKMARK, onModifyBookmark);
-					bookmarkItem.removeEventListener("initComplete", onBookmarkInitComplete);
-
-				view.bookmarksList.removeElement(bookmarkItem);
+				var bookmarkView:Object = view.bookmarksList.getElementAt(i);
+					bookmarkView.removeEventListener(BookmarkEvent.EDIT_BOOKMARK, onModifyBookmark);
+					bookmarkView.removeEventListener(BookmarkEvent.DELETE_BOOKMARK, onModifyBookmark);
+					bookmarkView.removeEventListener("initComplete", onBookmarkInitComplete);
+				if (bookmarkView.bookmark.defaultAction == "nomad")
+				{
+					bookmarkView.linkWithDesc.removeEventListener("linkClick", onOpenInNomadLink);
+				}
+				bookmarkView.configurationDetails.openInNomad.removeEventListener(MouseEvent.CLICK, onOpenNomadWeb);
+
+				view.bookmarksList.removeElement(bookmarkView);
 			}
 		}
 
 		private function onBookmarkInitComplete(event:Event):void
 		{
 			var bookmarkView:Bookmark = event.currentTarget as Bookmark;
+			if (bookmarkView.bookmark.defaultAction == "nomad")
+			{
+				bookmarkView.linkWithDesc.addEventListener("linkClick", onOpenInNomadLink);
+			}
 			bookmarkView.configurationDetails.openInNomad.addEventListener(MouseEvent.CLICK, onOpenNomadWeb);
 		}
 
+		private function onOpenInNomadLink(event:Event):void
+		{
+			var link:LinkWithDescriptionAppButton = event.currentTarget as LinkWithDescriptionAppButton;
+
+			sendNotification(ApplicationConstants.COMMAND_LAUNCH_NOMAD_LINK, {name: link.appName, link: link.nomadURL});
+		}
+
 		private function onOpenNomadWeb(event:MouseEvent):void
 		{
 			event.preventDefault();

diff --git a/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/bookmarks/Bookmark.mxml b/Super.Human.Portal_Royale/src/net/apacheRoyaleTemplatedApp/view/bookmarks/Bookmark.mxml
@@ -90,7 +90,8 @@
 		<j:Label text="{bookmark.description}" multiline="true" className="bigFont" visible="{bookmark.description != null}"/>
 	</j:HGroup>
 	<j:VGroup includeIn="database" itemsVerticalAlign="itemsCenter" itemsHorizontalAlign="itemsLeft" gap="2">
-		<controls:LinkWithDescriptionAppButton showClick="onShowHideDbConfigClick(event)" linkLabel="{urlOpenDefault}" description="{bookmark.description}"/>
+		<controls:LinkWithDescriptionAppButton localId="linkWithDesc" showClick="onShowHideDbConfigClick(event)" linkLabel="{urlOpenDefault}" description="{bookmark.description}"
+											   appName="{bookmark.name}" nomadURL="{bookmark.nomadURL}"/>
 		<applications:ConfigurationAppDetails localId="configurationDetails" data="{bookmark}" server="{bookmark.server}"
 											 database="{bookmark.database}" viewName="{bookmark.view}" nomadOpenLink="{bookmark.nomadURL}"
 											 percentWidth="100" visible="false" editable="{editable}"