instance.
*
diff --git a/lib/OpenLayers/Tween.js b/lib/OpenLayers/Tween.js
index 85718c0953..5c1bbc2071 100644
--- a/lib/OpenLayers/Tween.js
+++ b/lib/OpenLayers/Tween.js
@@ -179,6 +179,9 @@ OpenLayers.Easing.Linear = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeIn: function(t, b, c, d) {
return c*t/d + b;
@@ -192,6 +195,9 @@ OpenLayers.Easing.Linear = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeOut: function(t, b, c, d) {
return c*t/d + b;
@@ -205,6 +211,9 @@ OpenLayers.Easing.Linear = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeInOut: function(t, b, c, d) {
return c*t/d + b;
@@ -226,6 +235,9 @@ OpenLayers.Easing.Expo = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeIn: function(t, b, c, d) {
return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
@@ -239,6 +251,9 @@ OpenLayers.Easing.Expo = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeOut: function(t, b, c, d) {
return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
@@ -252,6 +267,9 @@ OpenLayers.Easing.Expo = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeInOut: function(t, b, c, d) {
if (t==0) return b;
@@ -276,6 +294,9 @@ OpenLayers.Easing.Quad = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeIn: function(t, b, c, d) {
return c*(t/=d)*t + b;
@@ -289,6 +310,9 @@ OpenLayers.Easing.Quad = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeOut: function(t, b, c, d) {
return -c *(t/=d)*(t-2) + b;
@@ -302,6 +326,9 @@ OpenLayers.Easing.Quad = {
* b - {Float} beginning position
* c - {Float} total change
* d - {Float} duration of the transition
+ *
+ * Returns:
+ * {Float}
*/
easeInOut: function(t, b, c, d) {
if ((t/=d/2) < 1) return c/2*t*t + b;
diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index 880e3435ab..94d7bab127 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -935,7 +935,7 @@ OpenLayers.Util.lastSeqID = 0;
* prefix (defaults to "id_") appended with the counter value.
*
* Parameters:
- * prefix {String} Optionsal string to prefix unique id. Default is "id_".
+ * prefix - {String} Optional string to prefix unique id. Default is "id_".
*
* Returns:
* {String} A unique id string, built on the passed in prefix.
@@ -1252,6 +1252,9 @@ OpenLayers.Util.pagePosition = function(forElement) {
* document.body or document.documentElement, depending on the document's
* compatibility mode (see
* http://code.google.com/p/doctype/wiki/ArticleClientViewportElement)
+ *
+ * Returns:
+ * {DOMElement}
*/
OpenLayers.Util.getViewportElement = function() {
var viewportElement = arguments.callee.viewportElement;
diff --git a/tests/Control/Zoom.html b/tests/Control/Zoom.html
new file mode 100644
index 0000000000..c27161dab8
--- /dev/null
+++ b/tests/Control/Zoom.html
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+ in
out
+
+
diff --git a/tests/list-tests.html b/tests/list-tests.html
index 92ebdec19a..7c4cb1d402 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -45,6 +45,7 @@
Control/WMTSGetFeatureInfo.html
Control/PanPanel.html
Control/SLDSelect.html
+ Control/Zoom.html
Events.html
Events/buttonclick.html
Extras.html
diff --git a/theme/default/style.css b/theme/default/style.css
index c695689ff7..f18e3209d5 100644
--- a/theme/default/style.css
+++ b/theme/default/style.css
@@ -429,6 +429,41 @@ span.olGoogleAttribution.hybrid a, span.olGoogleAttribution.satellite a {
background-position: -26px -24px;
}
+div.olControlZoom {
+ position: absolute;
+ top: 8px;
+ left: 8px;
+}
+div.olControlZoom a {
+ display: block;
+ margin: 1px;
+ padding: 0;
+ color: white;
+ font-size: 18px;
+ font-family: 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ text-decoration: none;
+ text-align: center;
+ height: 22px;
+ width:22px;
+ line-height: 19px;
+ background: #666666; /* fallback for IE - IE6 requires background shorthand*/
+ background: rgba(0, 0, 0, 0.3);
+ filter: alpha(opacity=60);
+}
+div.olControlZoom a:hover {
+ background: #444444; /* fallback for IE */
+ background: rgba(0, 0, 0, 0.5);
+ filter: alpha(opacity=80);
+}
+a.olControlZoomIn {
+ border-radius: 4px 4px 0 0;
+}
+a.olControlZoomOut {
+ border-radius: 0 0 4px 4px;
+}
+
+
/**
* Animations
*/