From 16a917a5a8ca4ded74b235a91ae8a750d435e059 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Sat, 13 Nov 2010 10:46:51 +0000 Subject: [PATCH] don't show tag editor when multiple items are selected --- net/systemeD/potlatch2/EditController.as | 7 +-- .../potlatch2/RelationEditorPanel.mxml | 2 +- net/systemeD/potlatch2/TagViewer.mxml | 57 +++++++++++-------- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/net/systemeD/potlatch2/EditController.as b/net/systemeD/potlatch2/EditController.as index 9e51c7b2..e27b05d9 100644 --- a/net/systemeD/potlatch2/EditController.as +++ b/net/systemeD/potlatch2/EditController.as @@ -57,11 +57,10 @@ package net.systemeD.potlatch2 { return _connection; } - public function updateSelectionUI():void { - var entity:Entity=state.firstSelected; - tagViewer.setEntity(entity); + public function updateSelectionUI():void { + tagViewer.setEntity(state.selection); toolbox.updateSelectionUI(); - } + } private function keyDownHandler(event:KeyboardEvent):void { keys[event.keyCode]=true; diff --git a/net/systemeD/potlatch2/RelationEditorPanel.mxml b/net/systemeD/potlatch2/RelationEditorPanel.mxml index 9c602f62..1f33cfee 100644 --- a/net/systemeD/potlatch2/RelationEditorPanel.mxml +++ b/net/systemeD/potlatch2/RelationEditorPanel.mxml @@ -24,7 +24,7 @@ public function checkRelation():void { if ( _relation != null ) - tagViewer.setEntity(_relation); + tagViewer.setEntity([_relation]); } ]]> diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml index 1a57bfe7..deabda71 100644 --- a/net/systemeD/potlatch2/TagViewer.mxml +++ b/net/systemeD/potlatch2/TagViewer.mxml @@ -120,6 +120,10 @@ enabled="{editorStack is SuperTabNavigator && stack.selectedIndex==0}" /> + + + +