Changeset 7530

Timestamp:

07/16/08 17:02:20 (5 months ago)

Author:

architect

Message:

Controls and panels are working more in harmony

Files:

• sandbox/architect/scripts/controlConfig.js (modified) (16 diffs)
• sandbox/architect/scripts/layerConfig.js (modified) (1 diff)
• sandbox/architect/scripts/panelConfig.js (modified) (11 diffs)

sandbox/architect/scripts/controlConfig.js

@@ -1 +1 @@
-/*
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-Attribution
-Button
@@ -26 +37 @@
-
-
-
+
+
-    var properties = [];
-        var functions = [];
@@ -40 +52 @@
-        console.log(functions)  
-    */
-
-/*=======================
-|  createBaseLayerConfig
@@ -90 +101 @@
-
-/*=======================
-Layer
+Control
-=========================*/
-function addDelEditOptionsToControlListItem(ID){
-    /*edit function*/
-    $('tb1Control' + ID).innerHTML += "<div id='tbControlOptionContainer'>"
-
-
+onclick='editControlOption(" + ID + ");'
+ onclick='deleteControlOption(" + ID + ");' 
-                +" </div>";
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    var curDelete = 'tb1Control' + ID + 'Delete';
-    var curListItem = "tb1Control" + ID;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -139 +146 @@
-/*add the current layer id to the map.layer object*/
-    eval("var curControl = {'id':'" + ID + "'};");
-
+
+
-
-    map.controls[ID].CLASS_NAME = 'OpenLayers.Control.' + tb1SelectedControl.value  
@@ -160 +168 @@
-        //controlListelement, id, name, isControlNew
-        changeControl(tb1SelectedControl, ID, tb1SelectedControl.value, true);
-
+
+
+
-        /*set the Delete div's name to newMode, which means don't delete toolbox 2's content if the layer delete button has been pressed*/
-        $('controlListItems').set('title', 'newMode');
@@ -193 +203 @@
-        
-        
-    console.log(controlTitle);
-    eval("loadControl" + controlTitle + "();"); //Call the loadLayerConfig function;
-//pass in the ID and false (don't get values from openlayers)
@@ -213 +222 @@
-|called when the save button is pressed
-|
-layer
+control
-|isControlNew is either "new" or "edit" - new, if the new layer button has been clicked; edit, if a layer is going to be modified
-=========================*/
@@ -225 +234 @@
-        
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    /*loop through options, get by class listValueUpdated and valueUpdated
-    saved all the changed class options*/
@@ -258 +256 @@
-    map.controls[ID].CLASS_NAME = 'OpenLayers.Control.' + $('tb2ControlListDropdown').value 
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /*Clear the layer editing options*/
-    //add the empty html to the toolbox
@@ -277 +322 @@
-    $('tb1Control' + ID).set('title','Control - ' + map.controls[ID].title);
-    
+    
-    if(isControlNew == true){
-    /*If a new layer is being added, do not clear the HTML when the delete button is pressed*/      
@@ -287 +333 @@
-    
-    /*Update the height*/
-layerToggle.show();
+controlToggle.show()
-}
-
@@ -328 +374 @@
-                tempNode.value = '';
-                /*Get the map name value*/
-                /*Check the DEFAULT_PARAMS and everything else*/
-                if (OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS != null){
-                    if(OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name] != null)
-                        tempNode.value = OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name];
-                }
-                if(OpenLayers.Control[curDropDownVal].prototype[tempNode.name] != null){
-                    tempNode.value = OpenLayers.Control[curDropDownVal].prototype[tempNode.name];
@@ -342 +383 @@
-                //By default, set the value to 0.  Override the value is necessary
-                tempNode.selectedIndex = 0; 
-                if (OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS != null || OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS != undefined){
-                    if(OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name] != null){
-                        var olVal = OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name];
-                        /*check for True / False lists*/
-                        if(tempNode.options[0].value == "True" || tempNode.options[0].value == "False"){
-                            if( Boolean(tempNode.options[0].name) == olVal)
-                                tempNode.selectedIndex = 0;
-                            if( Boolean(tempNode.options[1].name) == olVal)
-                                tempNode.selectedIndex = 1;
-                        }
-                        /*check for Jpg / Gif / Png, and other type of lists*/
-                        else{
-                            if(tempNode.options[0].value == olVal)
-                                    tempNode.selectedIndex = 0;
-                            if(tempNode.options[1].value == olVal)
-                                    tempNode.selectedIndex = 1;
-                            if(tempNode.options[2]){
-                                if(tempNode.options[2].value == olVal)
-                                    tempNode.selectedIndex = 2;
-                            }
-                            if(tempNode.options[3]){
-                                if(tempNode.options[3].value == olVal)
-                                    tempNode.selectedIndex = 3;
-                            }
-                        }
-                    }
-                }
-                if(OpenLayers.Control[curDropDownVal].prototype[tempNode.name] != null){
-                    var olVal = OpenLayers.Control[curDropDownVal].prototype[tempNode.name];
@@ -409 +423 @@
-                tempNode.value = '';
-                /*Get the map name value*/
-                /*Check the DEFAULT_PARAMS and everything else*/
-                if (OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS != null){
-                    if(OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name] != null)
-                        tempNode.value = OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name];
-                }
-                if(OpenLayers.Control[curDropDownVal].prototype[tempNode.name] != null){
-                    tempNode.value = OpenLayers.Control[curDropDownVal].prototype[tempNode.name];
@@ -425 +434 @@
-                //By default, set the value to 0.  Override the value is necessary
-                tempNode.selectedIndex = 0; 
-                if (OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS != null || OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS != undefined){
-                    if(OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name] != null){
-                        var olVal = OpenLayers.Control[curDropDownVal].prototype.DEFAULT_PARAMS[tempNode.name];
-                        /*check for True / False lists*/
-                        if(tempNode.options[0].value == "True" || tempNode.options[0].value == "False"){
-                            if( Boolean(tempNode.options[0].name) == olVal)
-                                tempNode.selectedIndex = 0;
-                            if( Boolean(tempNode.options[1].name) == olVal)
-                                tempNode.selectedIndex = 1;
-                        }
-                        /*check for Jpg / Gif / Png, and other type of lists*/
-                        else{
-                            if(tempNode.options[0].value == olVal)
-                                    tempNode.selectedIndex = 0;
-                            if(tempNode.options[1].value == olVal)
-                                    tempNode.selectedIndex = 1;
-                            if(tempNode.options[2]){
-                                if(tempNode.options[2].value == olVal)
-                                    tempNode.selectedIndex = 2;
-                            }
-                            if(tempNode.options[3]){
-                                if(tempNode.options[3].value == olVal)
-                                    tempNode.selectedIndex = 3;
-                            }
-                        }
-                    }
-                }
-                if(OpenLayers.Control[curDropDownVal].prototype[tempNode.name] != null){
-                    var olVal = OpenLayers.Control[curDropDownVal].prototype[tempNode.name];

sandbox/architect/scripts/layerConfig.js

@@ -117 +117 @@
-/*add the current layer id to the map.layer object*/
-    eval("var curLayer = {'id':'" + ID + "'};");
-
+
+
-
-    map.layers[ID].name = tb1formName.value

sandbox/architect/scripts/panelConfig.js

@@ +1 @@
+/*
+
+TO DO 
+Reattach events
+
+*/
+
+
+
-var panelsLength = 0;
-var numActivePanels = 0;
@@ -44 +53 @@
-    if(numActivePanels < 1){    
-        /*id, title, value, text*/
-0'
+' + panelsLength
-        return panelList;   
-    }
@@ -78 +87 @@
-/*add the current layer id to the map.layer object*/
-    eval("var curPanel = {'id':'" + ID + "'};");
-
+
+
-
-    panels.panels[ID].CLASS_NAME = 'OpenLayers.Control.Panel'
@@ -95 +105 @@
-    /*Populate ToolBox 2's layer options with the layer selected in ToolBox 1's layer list dropdown - call changeLayer and pass in the controlList from toolbox1*/
-        //name, id
-
+.value
-        
-        /*set the Delete div's name to newMode, which means don't delete toolbox 2's content if the layer delete button has been pressed*/
@@ -109 +119 @@
-|sets up a new layer in the global map object and populates toolbox 2 with empty input boxes
-=========================*/
-
+, isNew
-    
-    $('tb2blcCommon').innerHTML += "<br /> Display Panel In Map " +  createSelectList('layoutPanelConfigInMap', 'div', '', getTrueMenu());
-    
-    $('tb2blcCommon').innerHTML += "<br /> Allow Selection " +  createSelectList('layoutPanelConfigAllowSelection', 'allowSelection', '', getFalseMenu());
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-|
-|called when the save button is pressed
@@ -127 +139 @@
-|ID is the id of the current layer - an integer - an integer
-|isPanelNew is either "new" or "edit" - new, if the new layer button has been clicked; edit, if a layer is going to be modified
-
-
+
+
+
-        
-    /*if no isPanelNew is defined, assume it is a new layer*/
- 
+
-        isPanelNew = true;
-        
-
+
+
+
+
-    //Get the value of the text input.
-    if (panelName == ''){
-panelsLength
+ID
-    }
-    /*The code here will execute if the input is empty.
@@ -143 +159 @@
-    Set the title of the LI to the current layersLength value*/ 
-    if(isPanelNew == true){
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    +"              </div>"
-panelsLength
-<ol
+ID
+   <ol id='panel" + ID + "ListItems'
-                    +"              </ol>"
-                    +"              </div>"
-                    +"          </div>";
-                /*Create the delete text and edit button*/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /*loop through options, get by class listValueUpdated and valueUpdated
-    saved all the changed class options*/
@@ -168 +214 @@
-        panels.panels[ID][list] = val //Add the properties to the current map layer
-    }
-    
-    /*Update the name and layer type*/
-    panels.panels[ID].title = panelName
@@ -180 +225 @@
-    /*Highlist the layer in the layer list that was saved*/
-    $('tb1Panel' + ID + 'Container').highlight('#bcb8ad');
-panelsLength
+ID
-    
-    if(isPanelNew == true){
@@ -199 +244 @@
-
-    /*Update the height*/
-
-
+
+
+
-/*Because we use innerHTML, do not attach events to the divs - instead, use onclick to fire these events*/
-
+Option
-    var curEdit = "tb1PanelEditDiv" + ID;           
-    $('tb1Panel' + ID + 'Header').highlight('#bcb8ad');
-
+
+
-}
-function panelDelete(ID){   
@@ -212 +259 @@
-    $('tb1Panel' + ID + 'Container').dispose(); //Remove the current LI element
-    panels.panels[ID] = null; // empty the current layer object
-layer
+control
-    numActivePanels--;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+