don't show tag editor when multiple items are selected

diff --git a/net/systemeD/potlatch2/EditController.as b/net/systemeD/potlatch2/EditController.as
index 9e51c7b2313ebcb903138af7236702b4e8eb7173..e27b05d968c2398d8c22155d080c9e03c9668b42 100644 (file)
--- a/net/systemeD/potlatch2/EditController.as
+++ b/net/systemeD/potlatch2/EditController.as
@@ -57,11 +57,10 @@ package net.systemeD.potlatch2 {
             return _connection;
         }
         
             return _connection;
         }
         

-        public function updateSelectionUI():void {
-                       var entity:Entity=state.firstSelected;
-            tagViewer.setEntity(entity);
+               public function updateSelectionUI():void {
+                       tagViewer.setEntity(state.selection);

                        toolbox.updateSelectionUI();
                        toolbox.updateSelectionUI();

-        }
+               }

         
         private function keyDownHandler(event:KeyboardEvent):void {
                        keys[event.keyCode]=true;
         
         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 9c602f621cfe8740c125972f998520664a8fed26..1f33cfee92b2f41e887d0912be69aa7d70597a4b 100644 (file)
--- a/net/systemeD/potlatch2/RelationEditorPanel.mxml
+++ b/net/systemeD/potlatch2/RelationEditorPanel.mxml
@@ -24,7 +24,7 @@
 
         public function checkRelation():void {
             if ( _relation != null )
 
         public function checkRelation():void {
             if ( _relation != null )

-                tagViewer.setEntity(_relation);
+                tagViewer.setEntity([_relation]);

         }
     ]]></mx:Script>    
 </mx:TitleWindow>
         }
     ]]></mx:Script>    
 </mx:TitleWindow>

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index 1a57bfe719aa9a45ad6c7838a9eae60e23228824..deabda71b07868bdf4c7957c4ef63f4778ab6e74 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -120,6 +120,10 @@
                        enabled="{editorStack is SuperTabNavigator && stack.selectedIndex==0}" />
          </mx:HBox>
   </mx:VBox>
                        enabled="{editorStack is SuperTabNavigator &amp;&amp; stack.selectedIndex==0}" />
          </mx:HBox>
   </mx:VBox>

+
+  <mx:VBox id="multiplePanel" width="100%" height="100%" horizontalScrollPolicy="off" styleName="dndPanelVbox">
+    <mx:Text id="multiplePanelText" text="You have selected multiple items." width="100%" styleName="helpInfo" />
+  </mx:VBox>

 </mx:ViewStack>
 
   <mx:Script><![CDATA[
 </mx:ViewStack>
 
   <mx:Script><![CDATA[


@@ -150,29 +154,36 @@
       private var tw:CategorySelector = null;
       private var feature:Feature = null;
 
       private var tw:CategorySelector = null;
       private var feature:Feature = null;
 

-      public function setEntity(entity:Entity):void {
-          UIComponent.suspendBackgroundProcessing();
-          if ( selectedEntity != entity ) {
-              if ( selectedEntity != null )
-                  selectedEntity.removeEventListener(Connection.TAG_CHANGED, tagChanged);
-              selectedEntity = entity;
-              if ( selectedEntity != null )
-                  selectedEntity.addEventListener(Connection.TAG_CHANGED, tagChanged);
-          }
-
-          if ( advancedID != null )
-              setupAdvanced(entity);
-          if (entity is Relation) {
-              stack.addChild(membersVBox);
-          }
-          refreshFeatureIcon(); 
-          if (selectedEntity == null) {
-            sidebar.selectedChild = dndPanel;
-          } else {
-            initialiseEditors();
-            sidebar.selectedChild = tagsPanel;
-          }
-          UIComponent.resumeBackgroundProcessing();
+         public function setEntity(entities:Array):void {
+               UIComponent.suspendBackgroundProcessing();
+               
+               var firstSelected:Entity=null;
+               if (entities.length==1) { firstSelected=entities[0]; }
+               
+               if (selectedEntity!=firstSelected && selectedEntity!=null) {
+                       selectedEntity.removeEventListener(Connection.TAG_CHANGED, tagChanged);
+               }
+               
+               if (entities.length==0) {
+                       // Nothing selected, so show drag-and-drop panel
+                       sidebar.selectedChild = dndPanel;
+               
+               } else if (entities.length==1) {
+                       // Single entity selected, so show tag panel
+                       selectedEntity=firstSelected;
+                       if (selectedEntity!=null) { selectedEntity.addEventListener(Connection.TAG_CHANGED, tagChanged); }
+                       if (advancedID!=null) { setupAdvanced(firstSelected); }
+                       if (firstSelected is Relation) { stack.addChild(membersVBox); }
+                       refreshFeatureIcon(); 
+                       initialiseEditors();
+                       sidebar.selectedChild = tagsPanel;
+               
+               } else {
+                       // Multiple selection, so for now show a largely blank panel/
+                       // ** TODO - proper multiple selection tagging
+                       sidebar.selectedChild = multiplePanel;
+               }
+               UIComponent.resumeBackgroundProcessing();

       }
 
       private function refreshFeatureIcon():void {
       }
 
       private function refreshFeatureIcon():void {