Merge branch 'master' of https://github.com/openlayers/openlayers into no-$
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full list of contributors). Published under the 2-clause BSD license.
|
||||
* See license.txt in the OpenLayers distribution or repository for the
|
||||
* full text of the license. */
|
||||
|
||||
/**
|
||||
@@ -71,7 +71,7 @@ OpenLayers.Util.isElement = function(o) {
|
||||
* {Boolean} true if the object is an array.
|
||||
*/
|
||||
OpenLayers.Util.isArray = function(a) {
|
||||
return (Object.prototype.toString.call(a) === '[object Array]');
|
||||
return (Object.prototype.toString.call(a) === '[object Array]');
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -105,7 +105,7 @@ OpenLayers.Util.removeItem = function(array, item) {
|
||||
* obj - {*}
|
||||
*
|
||||
* Returns:
|
||||
* {Integer} The index at, which the first object was found in the array.
|
||||
* {Integer} The index at which the first object was found in the array.
|
||||
* If not found, returns -1.
|
||||
*/
|
||||
OpenLayers.Util.indexOf = function(array, obj) {
|
||||
@@ -552,14 +552,6 @@ OpenLayers.Util.urlAppend = function(url, paramStr) {
|
||||
return newUrl;
|
||||
};
|
||||
|
||||
/**
|
||||
* APIProperty: ImgPath
|
||||
* {String} Set this to the path where control images are stored.
|
||||
* If set to '' OpenLayers will use script location + "img/"
|
||||
* Default is ''.
|
||||
*/
|
||||
OpenLayers.ImgPath = '';
|
||||
|
||||
/**
|
||||
* Function: getImagesLocation
|
||||
*
|
||||
@@ -928,7 +920,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.
|
||||
@@ -1245,6 +1237,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;
|
||||
|
||||
Reference in New Issue
Block a user