ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved OpenLayers.Vendor to OpenLayers.Util.vendorPrefix

Browse Source
This commit is contained in:
Gregers Gram Rygg
2012-06-27 13:28:43 +02:00
parent 36451db928
commit 7f32342ec3
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers.js
+1 -1
View File
@@ -132,7 +132,7 @@
jsFiles = [ jsFiles = [
"OpenLayers/BaseTypes/Class.js", "OpenLayers/BaseTypes/Class.js",
"OpenLayers/Util.js", "OpenLayers/Util.js",
"OpenLayers/Vendor.js", "OpenLayers/Util/vendorPrefix.js",
"OpenLayers/Animation.js", "OpenLayers/Animation.js",
"OpenLayers/BaseTypes.js", "OpenLayers/BaseTypes.js",
"OpenLayers/BaseTypes/Bounds.js", "OpenLayers/BaseTypes/Bounds.js",
lib/OpenLayers/Animation.js
+2 -2
View File
@@ -5,7 +5,7 @@
* full text of the license. * full text of the license.
* *
* @requires OpenLayers/SingleFile.js * @requires OpenLayers/SingleFile.js
* @requires OpenLayers/Vendor.js * @requires OpenLayers/Util/vendorPrefix.js
*/ */
/** /**
@@ -20,7 +20,7 @@ OpenLayers.Animation = (function(window) {
* Property: isNative * Property: isNative
* {Boolean} true if a native requestAnimationFrame function is available * {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); var isNative = !!(requestAnimationFrame);
/** /**
lib/OpenLayers/Control/PinchZoom.js
+2 -1
View File
@@ -4,6 +4,7 @@
* full text of the license. */ * full text of the license. */
/** /**
* @requires OpenLayers/Util/vendorPrefix.js
* @requires OpenLayers/Handler/Pinch.js * @requires OpenLayers/Handler/Pinch.js
*/ */
@@ -162,7 +163,7 @@ OpenLayers.Control.PinchZoom = OpenLayers.Class(OpenLayers.Control, {
*/ */
applyTransform: function(transform) { applyTransform: function(transform) {
var style = this.map.layerContainerDiv.style; var style = this.map.layerContainerDiv.style;
var transformProperty = OpenLayers.Vendor.stylePrefix("transform"); var transformProperty = OpenLayers.Util.vendorPrefix.stylePrefix("transform");
if (transformProperty) { if (transformProperty) {
style[transformProperty] = transform; style[transformProperty] = transform;
} }
lib/OpenLayers/Vendor.js → lib/OpenLayers/Util/vendorPrefix.js
+3 -2
View File
@@ -7,11 +7,12 @@
* @requires OpenLayers/SingleFile.js * @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 * A collection of utility functions to detect vendor prefixed features
*/ */
OpenLayers.Vendor = (function() { OpenLayers.Util.vendorPrefix = (function() {
"use strict"; "use strict";
var VENDOR_PREFIXES = ["", "O", "ms", "Moz", "Webkit"], var VENDOR_PREFIXES = ["", "O", "ms", "Moz", "Webkit"],
tests/Animation.html
+1 -1
View File
@@ -6,7 +6,7 @@
// dependencies for tests // dependencies for tests
var OpenLayers = [ var OpenLayers = [
"OpenLayers/Vendor.js", "OpenLayers/Util/vendorPrefix.js",
"OpenLayers/Animation.js" "OpenLayers/Animation.js"
]; ];
tests/Vendor.html → tests/Util/vendorPrefix.html
+12 -12
View File
@@ -1,16 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Vendor.js Tests</title> <title>vendorPrefix.js Tests</title>
<script> <script>
// dependencies for tests // dependencies for tests
var OpenLayers = [ var OpenLayers = [
"OpenLayers/Vendor.js" "OpenLayers/Util/vendorPrefix.js"
]; ];
</script> </script>
<script src="OLLoader.js"></script> <script src="../OLLoader.js"></script>
<script> <script>
@@ -36,7 +36,7 @@
};*/ };*/
function clearCache(type) { function clearCache(type) {
var cache = OpenLayers.Vendor[type.replace("style", "js") + "Cache"]; var cache = OpenLayers.Util.vendorPrefix[type.replace("style", "js") + "Cache"];
for (var key in cache) { for (var key in cache) {
delete cache[key]; delete cache[key];
} }
@@ -51,8 +51,8 @@
if (o.prop != null) { if (o.prop != null) {
fakeStyle[o.prop] = o.val; fakeStyle[o.prop] = o.val;
} }
OpenLayers.Vendor._mockStyle(fakeStyle); OpenLayers.Util.vendorPrefix._mockStyle(fakeStyle);
prefixedProp = OpenLayers.Vendor[method](standardProp); prefixedProp = OpenLayers.Util.vendorPrefix[method](standardProp);
} catch(e) { } catch(e) {
err = e; err = e;
} }
@@ -98,22 +98,22 @@
// test vendor prefix on object // test vendor prefix on object
clearCache("js"); clearCache("js");
t.eq( OpenLayers.Vendor.jsPrefix( {}, "unsupported" ), null, "Standard object property - unsupported"); t.eq( OpenLayers.Util.vendorPrefix.jsPrefix( {}, "unsupported" ), null, "Standard object property - unsupported");
clearCache("js"); clearCache("js");
t.eq( OpenLayers.Vendor.jsPrefix( { "test": true }, "test" ), "test", "Standard object property"); t.eq( OpenLayers.Util.vendorPrefix.jsPrefix( { "test": true }, "test" ), "test", "Standard object property");
clearCache("js"); clearCache("js");
t.eq( OpenLayers.Vendor.jsPrefix( { "oTest": true }, "test" ), "oTest", "Standard object property"); t.eq( OpenLayers.Util.vendorPrefix.jsPrefix( { "oTest": true }, "test" ), "oTest", "Standard object property");
clearCache("js"); clearCache("js");
t.eq( OpenLayers.Vendor.jsPrefix( { "msTest": true }, "test" ), "msTest", "Standard object property"); t.eq( OpenLayers.Util.vendorPrefix.jsPrefix( { "msTest": true }, "test" ), "msTest", "Standard object property");
clearCache("js"); clearCache("js");
t.eq( OpenLayers.Vendor.jsPrefix( { "mozTest": true }, "test" ), "mozTest", "Standard object property"); t.eq( OpenLayers.Util.vendorPrefix.jsPrefix( { "mozTest": true }, "test" ), "mozTest", "Standard object property");
clearCache("js"); clearCache("js");
t.eq( OpenLayers.Vendor.jsPrefix( { "webkitTest": true }, "test" ), "webkitTest", "Standard object property"); t.eq( OpenLayers.Util.vendorPrefix.jsPrefix( { "webkitTest": true }, "test" ), "webkitTest", "Standard object property");
// unwrap document.createElement // unwrap document.createElement
//document.createElement = orgCreateElement; //document.createElement = orgCreateElement;
tests/list-tests.html
+1 -1
View File
@@ -231,7 +231,7 @@
<li>Tween.html</li> <li>Tween.html</li>
<li>Kinetic.html</li> <li>Kinetic.html</li>
<li>Util.html</li> <li>Util.html</li>
<li>Vendor.html</li> <li>Util/vendorPrefix.html</li>
<li>deprecated/Ajax.html</li> <li>deprecated/Ajax.html</li>
<li>deprecated/Util.html</li> <li>deprecated/Util.html</li>
<li>deprecated/BaseTypes/Class.html</li> <li>deprecated/BaseTypes/Class.html</li>