diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js index 672ebdde97..0399d2c1fa 100644 --- a/lib/OpenLayers.js +++ b/lib/OpenLayers.js @@ -132,7 +132,7 @@ jsFiles = [ "OpenLayers/BaseTypes/Class.js", "OpenLayers/Util.js", - "OpenLayers/Vendor.js", + "OpenLayers/Util/vendorPrefix.js", "OpenLayers/Animation.js", "OpenLayers/BaseTypes.js", "OpenLayers/BaseTypes/Bounds.js", diff --git a/lib/OpenLayers/Animation.js b/lib/OpenLayers/Animation.js index 4a4ccc5637..3507652252 100644 --- a/lib/OpenLayers/Animation.js +++ b/lib/OpenLayers/Animation.js @@ -5,7 +5,7 @@ * full text of the license. * * @requires OpenLayers/SingleFile.js - * @requires OpenLayers/Vendor.js + * @requires OpenLayers/Util/vendorPrefix.js */ /** @@ -20,7 +20,7 @@ OpenLayers.Animation = (function(window) { * Property: isNative * {Boolean} true if a native requestAnimationFrame function is available */ - var requestAnimationFrame = OpenLayers.Vendor.jsPrefix(window, "requestAnimationFrame"); + var requestAnimationFrame = OpenLayers.Util.vendorPrefix.jsPrefix(window, "requestAnimationFrame"); var isNative = !!(requestAnimationFrame); /** diff --git a/lib/OpenLayers/Control/PinchZoom.js b/lib/OpenLayers/Control/PinchZoom.js index 44492d404d..d42cfd15ba 100644 --- a/lib/OpenLayers/Control/PinchZoom.js +++ b/lib/OpenLayers/Control/PinchZoom.js @@ -4,6 +4,7 @@ * full text of the license. */ /** + * @requires OpenLayers/Util/vendorPrefix.js * @requires OpenLayers/Handler/Pinch.js */ @@ -162,7 +163,7 @@ OpenLayers.Control.PinchZoom = OpenLayers.Class(OpenLayers.Control, { */ applyTransform: function(transform) { var style = this.map.layerContainerDiv.style; - var transformProperty = OpenLayers.Vendor.stylePrefix("transform"); + var transformProperty = OpenLayers.Util.vendorPrefix.stylePrefix("transform"); if (transformProperty) { style[transformProperty] = transform; } diff --git a/lib/OpenLayers/Vendor.js b/lib/OpenLayers/Util/vendorPrefix.js similarity index 96% rename from lib/OpenLayers/Vendor.js rename to lib/OpenLayers/Util/vendorPrefix.js index b0e271009c..2bb760725d 100644 --- a/lib/OpenLayers/Vendor.js +++ b/lib/OpenLayers/Util/vendorPrefix.js @@ -6,12 +6,13 @@ * * @requires OpenLayers/SingleFile.js */ - + +OpenLayers.Util = OpenLayers.Util || {}; /** - * Namespace: OpenLayers.Vendor + * Namespace: OpenLayers.Util.vendorPrefix * A collection of utility functions to detect vendor prefixed features */ -OpenLayers.Vendor = (function() { +OpenLayers.Util.vendorPrefix = (function() { "use strict"; var VENDOR_PREFIXES = ["", "O", "ms", "Moz", "Webkit"], diff --git a/tests/Animation.html b/tests/Animation.html index b07308d3e0..c24ae49363 100644 --- a/tests/Animation.html +++ b/tests/Animation.html @@ -6,7 +6,7 @@ // dependencies for tests var OpenLayers = [ - "OpenLayers/Vendor.js", + "OpenLayers/Util/vendorPrefix.js", "OpenLayers/Animation.js" ]; diff --git a/tests/Vendor.html b/tests/Util/vendorPrefix.html similarity index 77% rename from tests/Vendor.html rename to tests/Util/vendorPrefix.html index 1e7b205d00..7978a8a3fa 100644 --- a/tests/Vendor.html +++ b/tests/Util/vendorPrefix.html @@ -1,16 +1,16 @@ - Vendor.js Tests + vendorPrefix.js Tests - +