A couple changes got rolled into r326 that weren't meant to: Rolling them back out.
git-svn-id: http://svn.openlayers.org/trunk/openlayers@327 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
// @require: OpenLayers/Control.js
|
// @require OpenLayers/Control.js
|
||||||
/**
|
/**
|
||||||
* @class
|
* @class
|
||||||
*/
|
*/
|
||||||
@@ -28,15 +28,14 @@ OpenLayers.Control.LayerSwitcher.prototype =
|
|||||||
/** @type String */
|
/** @type String */
|
||||||
nonActiveColor: "",
|
nonActiveColor: "",
|
||||||
|
|
||||||
mode: "radio",
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
initialize: function(options) {
|
initialize: function() {
|
||||||
|
OpenLayers.Control.prototype.initialize.apply(this, arguments);
|
||||||
this.activeColor = OpenLayers.Control.LayerSwitcher.ACTIVE_COLOR;
|
this.activeColor = OpenLayers.Control.LayerSwitcher.ACTIVE_COLOR;
|
||||||
this.nonActiveColor = OpenLayers.Control.LayerSwitcher.NONACTIVE_COLOR;
|
this.nonActiveColor = OpenLayers.Control.LayerSwitcher.NONACTIVE_COLOR;
|
||||||
OpenLayers.Control.prototype.initialize.apply(this, arguments);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -85,22 +84,10 @@ OpenLayers.Control.LayerSwitcher.prototype =
|
|||||||
singleClick: function(evt) {
|
singleClick: function(evt) {
|
||||||
var div = Event.element(evt);
|
var div = Event.element(evt);
|
||||||
var layer = div.layer;
|
var layer = div.layer;
|
||||||
if (this.mode == "checkbox") {
|
var visible = layer.getVisibility();
|
||||||
var visible = layer.getVisibility();
|
|
||||||
|
|
||||||
this.setTabActivation(div, !visible);
|
this.setTabActivation(div, !visible);
|
||||||
layer.setVisibility(!visible);
|
layer.setVisibility(!visible);
|
||||||
} else {
|
|
||||||
this.setTabActivation(div, true);
|
|
||||||
layer.setVisibility(true);
|
|
||||||
for( var i = 0; i < this.map.layers.length; i++) {
|
|
||||||
if (layer != this.map.layers[i]) {
|
|
||||||
this.setTabActivation($("LayerSwitcher_" + layer.name + "_Tab_p"), false);
|
|
||||||
layer.setVisibility(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Event.stop(evt);
|
Event.stop(evt);
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -128,7 +115,6 @@ OpenLayers.Control.LayerSwitcher.prototype =
|
|||||||
// Inner Label - for Rico Corners
|
// Inner Label - for Rico Corners
|
||||||
//
|
//
|
||||||
var backdropLabel = document.createElement('p');
|
var backdropLabel = document.createElement('p');
|
||||||
backdropLabelOuter.id = "LayerSwitcher_" + layer.name + "_Tab_p";
|
|
||||||
backdropLabel.innerHTML = layer.name;
|
backdropLabel.innerHTML = layer.name;
|
||||||
backdropLabel.style.marginTop = "0px";
|
backdropLabel.style.marginTop = "0px";
|
||||||
backdropLabel.style.marginBottom = "0px";
|
backdropLabel.style.marginBottom = "0px";
|
||||||
|
|||||||
@@ -59,11 +59,7 @@ OpenLayers.Events.prototype = {
|
|||||||
var listeners = this.listeners[type];
|
var listeners = this.listeners[type];
|
||||||
listeners.push( func.bindAsEventListener(obj) );
|
listeners.push( func.bindAsEventListener(obj) );
|
||||||
},
|
},
|
||||||
|
|
||||||
remove: function (type) {
|
|
||||||
this.listeners[type].pop();
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {event} evt
|
* @param {event} evt
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// @require: OpenLayers/Util.js
|
// @require OpenLayers/Util.js
|
||||||
/**
|
/**
|
||||||
* @class
|
* @class
|
||||||
*
|
*
|
||||||
@@ -98,7 +98,7 @@ OpenLayers.Map.prototype = {
|
|||||||
if (!this.controls) {
|
if (!this.controls) {
|
||||||
this.controls = [];
|
this.controls = [];
|
||||||
this.addControl(new OpenLayers.Control.MouseDefaults());
|
this.addControl(new OpenLayers.Control.MouseDefaults());
|
||||||
this.addControl(new OpenLayers.Control.PanZoomBar());
|
this.addControl(new OpenLayers.Control.PanZoom());
|
||||||
}
|
}
|
||||||
|
|
||||||
this.popups = new Array();
|
this.popups = new Array();
|
||||||
|
|||||||
Reference in New Issue
Block a user