Changeset 7539

Timestamp:

07/17/08 12:10:32 (1 month ago)

Author:

architect

Message:

Updated control / panel integration

Files:

• sandbox/architect/scripts/controlConfig.js (modified) (3 diffs)
• sandbox/architect/scripts/panelConfig.js (modified) (5 diffs)

sandbox/architect/scripts/controlConfig.js

@@ -1 @@
-/*
-
-TO DO 
-Reattach events
-
-enable control switching between panels
-
-*/
-
-
-
-
-/*
-Controls - 
@@ -302 +290 @@
-    }   
-    else {
+        /*Remove the control*/
+        var curListItem = "tb1Control" + ID;
+        $(curListItem).dispose(); //Remove the current LI element
+        
+        var li = new Element('li', {id: 'tb1Control'+ID, title:'Control ' + valName,'class':'drag'}); //onclick=\"editLayer('" + ID + "')\"
+
+        if ($('tb1ControlListPanelDropdown') != null || $('tb1ControlListPanelDropdown') != undefined){
+            //Call GetPanels to repopulate the drop down list.  If this isn't done, then the default panel id will not change, which will cause a problem if a panel was deleted and the control hasn't been changed (i.e. the panel list has not been refreshed)
+            $('tb1NewControlSelects').innerHTML = createSelectList('tb1ControlListPanelDropdown', 'Control Picklist', '', getPanels()); 
+            //Check to see if the selected panel exists
+            if ($('tb1Panel' + panelID + 'Container') == null || $('tb1Panel' + panelID + 'Container') == undefined){
+                savePanelConfig(panelID, true, true);
+            }
+            $('panel' + panelID + 'ListItems').adopt(li);
+        }
+        else{
+            //Add the <li> to the control config list
+            $('controlListItems').adopt(li);
+            
+        }
+        //We have to add the list item to our Sortable object so it's sortable.
+        sort.addItems(li);
+        //We put the new order inside of the data div. Function defined in sortable.js
+        showNewOrder(); 
-        
-    }
@@ -362 +374 @@
-            isControlNew = false;
-    }
+    
+    /*if($('tb2ControlListPanelDropdown') != null || $('tb2ControlListPanelDropdown') != undefined){
+        if (isControlNew == false){
+            $('tb2ControlListPanelDropdown').options[$('tb2ControlListPanelDropdown').selectedIndex].id = map.controls[ID].panelID; 
+        }
+    }   */
+    
-    /*pull values from OpenLayers*/
-    if(isControlNew == true){

sandbox/architect/scripts/panelConfig.js

@@ -53 +53 @@
-    if(numActivePanels < 1){    
-        /*id, title, value, text*/
-'Default Panel'
+panelsLength
-        return panelList;   
-    }
@@ -61 +61 @@
-            /*id, title, value, text*/
-            if(panels.panels[i] != null){
-title
+id
-            }
-        }
@@ -165 +165 @@
-        var divPanelHeader = new Element('div', {id:'tb1Panel' + ID + 'Header', class:'tb1PanelHeader'});
-            var divPanelHeaderTitle = new Element('div', {id:'tb1Panel' + ID + 'HeaderTitle'});
-
+, text:'Edit'
-            var divPanelDelete = new Element('div', {id:'tb1PanelDeleteDiv' + ID, class:'tb1PanelDeleteDiv'});  
-        var divListArea = new Element('div', {id:'tb1Panel' + ID + 'ListArea', class:'tb1PanelListArea'});
@@ -243 +243 @@
-    }
-
+    /*ATTACH EVENTS*/
+    $('tb1PanelEditDiv' + ID).addEvent('click', function(e) {
+        panelEditOption(ID);
+    });
+    $('tb1PanelDeleteDiv' + ID).innerHTML = "<img id='tb1Control2Delete' alt='Delete control' src='images/close.png'/>";
+    $('tb1PanelDeleteDiv' + ID).addEvent('click', function(e) {
+        panelDelete(ID);
+    });
+
-    /*Update the height*/
-    controlToggle.show();
@@ -262 +271 @@
-    numActivePanels--;
-    $('tb1NewControlSelects').innerHTML = createSelectList('tb1ControlListPanelDropdown', 'Control Picklist', '', getPanels());
+    $('toolBox2Content').innerHTML = getEmptyToolBox2HTML("none", "Panel"); 
-}
-