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

#823 New class style. Instead of OldStyle = Class.create(); OldStyle.prototype = Class.inherit(Parent, prototype), we now use NewStyle = OpenLayers.Class(Parent, prototype). New style classes allow for backwards compatibility [you can use OldStyle = Class.create(); Class.inherit(NewStyle, prototype)]. The Class.create and Class.inherit functions are deprecated. Backwards compatibility will be removed at 3.0. Thanks Erik for the careful review.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3767 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2007-07-16 20:25:11 +00:00
parent 9ebf950e3b
commit cc1b0269c9
101 changed files with 451 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers.js
View File

@@ -65,6 +65,7 @@
*/
if(!singleFile) {
var jsfiles = new Array(
"OpenLayers/Util.js",
"OpenLayers/BaseTypes.js",
"OpenLayers/BaseTypes/Class.js",
"OpenLayers/BaseTypes/Bounds.js",
@@ -72,7 +73,6 @@
"OpenLayers/BaseTypes/LonLat.js",
"OpenLayers/BaseTypes/Pixel.js",
"OpenLayers/BaseTypes/Size.js",
"OpenLayers/Util.js",
"OpenLayers/Console.js",
"Rico/Corner.js",
"Rico/Color.js",

20
lib/OpenLayers/Ajax.js
View File

@@ -258,23 +258,14 @@ OpenLayers.Ajax.Base.prototype = {
}
};
/**
* Class: OpenLayers.Ajax.Request
*
* Inherit:
* - <OpenLayers.Ajax.Base>
*/
OpenLayers.Ajax.Request = OpenLayers.Class.create();
/**
* Property: Events
* {Array(String)}
*/
OpenLayers.Ajax.Request.Events =
['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
OpenLayers.Ajax.Request.prototype =
OpenLayers.Class.inherit( OpenLayers.Ajax.Base, {
OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, {
/**
* Constructor: OpenLayers.Ajax.Request
@@ -487,6 +478,13 @@ OpenLayers.Ajax.Request.prototype =
});
/**
* Property: Events
* {Array(String)}
*/
OpenLayers.Ajax.Request.Events =
['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
/**
* Function: getElementsByTagNameNS
*

5
lib/OpenLayers/BaseTypes/Bounds.js
View File

@@ -7,8 +7,7 @@
* Instances of this class represent bounding boxes. Data stored as left,
* bottom, right, top floats
*/
OpenLayers.Bounds = OpenLayers.Class.create();
OpenLayers.Bounds.prototype = {
OpenLayers.Bounds = OpenLayers.Class({
/**
* Property: left
@@ -457,7 +456,7 @@ OpenLayers.Bounds.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Bounds"
};
});
/**
* APIFunction: fromString

144
lib/OpenLayers/BaseTypes/Class.js
View File

@@ -3,65 +3,93 @@
* for the full text of the license. */
/**
* Namespace: OpenLayers.Class
* Contains functions to create OpenLayers style classes.
* Constructor: OpenLayers.Class
* Base class used to construct all other classes. Includes support for
* multiple inheritance.
*
* This constructor is new in OpenLayers 2.5. At OpenLayers 3.0, the old
* syntax for creating classes and dealing with inheritance
* will be removed.
*
* To create a new OpenLayers-style class, use the following syntax:
* > var MyClass = OpenLayers.Class(prototype);
*
* To create a new OpenLayers-style class with multiple inheritance, use the
* following syntax:
* > var MyClass = OpenLayers.Class(Class1, Class2, prototype);
*
*/
OpenLayers.Class = {
isPrototype: function () {}, // magic anonymous value
/**
* APIFunction: create
* Create an OpenLayers style class
*
* Return:
* An OpenLayers class
*/
create: function() {
return function() {
if (arguments && arguments[0] != OpenLayers.Class.isPrototype)
this.initialize.apply(this, arguments);
OpenLayers.Class = function() {
var Class = function() {
/**
* This following condition can be removed at 3.0 - this is only for
* backwards compatibility while the Class.inherit method is still
* in use. So at 3.0, the following three lines would be replaced with
* simply:
* this.initialize.apply(this, arguments);
*/
if (arguments && arguments[0] != OpenLayers.Class.isPrototype) {
this.initialize.apply(this, arguments);
}
},
/**
* APIFunction: inherit
* Inherit from one or more OpenLayers style classes
*
* Parameters:
* class - One or more classes can be provided as arguments
*
* Return:
* An object prototype
*/
inherit: function () {
var superClass = arguments[0];
var proto = new superClass(OpenLayers.Class.isPrototype);
for (var i = 1; i < arguments.length; i++) {
if (typeof arguments[i] == "function") {
var mixin = arguments[i];
arguments[i] = new mixin(OpenLayers.Class.isPrototype);
}
OpenLayers.Util.extend(proto, arguments[i]);
// This is a hack for IE see
// http://trac.openlayers.org/attachment/ticket/552
//
// The problem is that ie doesnt recognize toString as a property
// so the util.extend() doesnt copy it over. we do it manually.
//
// to be revisited in 3.0
//
if((arguments[i].hasOwnProperty && arguments[i].hasOwnProperty('toString')) ||
(!arguments[i].hasOwnProperty && arguments[i].toString)) {
proto.toString = arguments[i].toString;
}
}
return proto;
}
};
var extended = new Object();
var parent;
for(var i=0; i<arguments.length; ++i) {
if(typeof arguments[i] == "function") {
// get the prototype of the superclass
parent = arguments[i].prototype;
} else {
// in this case we're extending with the prototype
parent = arguments[i];
}
OpenLayers.Util.extend(extended, parent);
}
Class.prototype = extended;
return Class;
}
/*
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, OpenLayers.Layer.HTTPRequest, {
some stuff
});
*/
/**
* Property: isPrototype
* *Deprecated*. This is no longer needed and will be removed at 3.0.
*/
OpenLayers.Class.isPrototype = function () {};
/**
* APIFunction: OpenLayers.create
* *Deprecated*. Old method to create an OpenLayers style class. Use the
* <OpenLayers.Class> constructor instead.
*
* Return:
* An OpenLayers class
*/
OpenLayers.Class.create = function() {
return function() {
if (arguments && arguments[0] != OpenLayers.Class.isPrototype)
this.initialize.apply(this, arguments);
}
}
/**
* APIFunction: inherit
* *Deprecated*. Old method to inherit from one or more OpenLayers style
* classes. Use the <OpenLayers.Class> constructor instead.
*
* Parameters:
* class - One or more classes can be provided as arguments
*
* Return:
* An object prototype
*/
OpenLayers.Class.inherit = function () {
var superClass = arguments[0];
var proto = new superClass(OpenLayers.Class.isPrototype);
for (var i = 1; i < arguments.length; i++) {
if (typeof arguments[i] == "function") {
var mixin = arguments[i];
arguments[i] = new mixin(OpenLayers.Class.isPrototype);
}
OpenLayers.Util.extend(proto, arguments[i]);
}
return proto;
}

5
lib/OpenLayers/BaseTypes/LonLat.js
View File

@@ -6,8 +6,7 @@
* Class: OpenLayers.LonLat
* This class represents a longitude and latitude pair
*/
OpenLayers.LonLat = OpenLayers.Class.create();
OpenLayers.LonLat.prototype = {
OpenLayers.LonLat = OpenLayers.Class({
/**
* APIProperty: lon
@@ -146,7 +145,7 @@ OpenLayers.LonLat.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.LonLat"
};
});
/**
* Function: fromString

5
lib/OpenLayers/BaseTypes/Pixel.js
View File

@@ -6,8 +6,7 @@
* Class: OpenLayers.Pixel
* This class represents a screen coordinate, in x and y coordinates
*/
OpenLayers.Pixel = OpenLayers.Class.create();
OpenLayers.Pixel.prototype = {
OpenLayers.Pixel = OpenLayers.Class({
/**
* APIProperty: x
@@ -119,4 +118,4 @@ OpenLayers.Pixel.prototype = {
/** @final @type str */
CLASS_NAME: "OpenLayers.Pixel"
};
});

5
lib/OpenLayers/BaseTypes/Size.js
View File

@@ -6,8 +6,7 @@
* Class: OpenLayers.Size
* Instances of this class represent a width/height pair
*/
OpenLayers.Size = OpenLayers.Class.create();
OpenLayers.Size.prototype = {
OpenLayers.Size = OpenLayers.Class({
/**
* APIProperty: w
@@ -83,4 +82,4 @@ OpenLayers.Size.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Size"
};
});

14
lib/OpenLayers/Control.js
View File

@@ -49,13 +49,7 @@
* > map.addControl(control);
*
*/
OpenLayers.Control = OpenLayers.Class.create();
OpenLayers.Control.TYPE_BUTTON = 1;
OpenLayers.Control.TYPE_TOGGLE = 2;
OpenLayers.Control.TYPE_TOOL = 3;
OpenLayers.Control.prototype = {
OpenLayers.Control = OpenLayers.Class({
/**
* Property: id
@@ -241,4 +235,8 @@ OpenLayers.Control.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Control"
};
});
OpenLayers.Control.TYPE_BUTTON = 1;
OpenLayers.Control.TYPE_TOGGLE = 2;
OpenLayers.Control.TYPE_TOOL = 3;

4
lib/OpenLayers/Control/ArgParser.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.ArgParser = OpenLayers.Class.create();
OpenLayers.Control.ArgParser.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
/**
* Parameter: center

4
lib/OpenLayers/Control/DragPan.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.DragPan = OpenLayers.Class.create();
OpenLayers.Control.DragPan.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.DragPan = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: type

4
lib/OpenLayers/Control/DrawFeature.js
View File

@@ -13,9 +13,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.DrawFeature = OpenLayers.Class.create();
OpenLayers.Control.DrawFeature.prototype =
OpenLayers.Class.inherit(OpenLayers.Control, {
OpenLayers.Control.DrawFeature = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: layer

5
lib/OpenLayers/Control/EditingToolbar.js
View File

@@ -10,9 +10,8 @@
* Class: OpenLayers.Control.EditingToolbar
*/
OpenLayers.Control.EditingToolbar = OpenLayers.Class.create();
OpenLayers.Control.EditingToolbar.prototype =
OpenLayers.Class.inherit( OpenLayers.Control.Panel, {
OpenLayers.Control.EditingToolbar = OpenLayers.Class(
OpenLayers.Control.Panel, {
/**
* Constructor: OpenLayers.Control.EditingToolbar

4
lib/OpenLayers/Control/KeyboardDefaults.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.KeyboardDefaults = OpenLayers.Class.create();
OpenLayers.Control.KeyboardDefaults.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.KeyboardDefaults = OpenLayers.Class(OpenLayers.Control, {
/**
* APIProperty: slideFactor

4
lib/OpenLayers/Control/LayerSwitcher.js
View File

@@ -10,9 +10,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.LayerSwitcher = OpenLayers.Class.create();
OpenLayers.Control.LayerSwitcher.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.LayerSwitcher = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: activeColor

4
lib/OpenLayers/Control/MouseDefaults.js
View File

@@ -10,9 +10,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.MouseDefaults = OpenLayers.Class.create();
OpenLayers.Control.MouseDefaults.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, {
/** WARNING WARNING WARNING!!!
This class is DEPRECATED in 2.4 and will be removed by 3.0.

4
lib/OpenLayers/Control/MousePosition.js
View File

@@ -8,9 +8,7 @@
*
* Class: OpenLayers.Control.MousePosition
*/
OpenLayers.Control.MousePosition = OpenLayers.Class.create();
OpenLayers.Control.MousePosition.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: element

9
lib/OpenLayers/Control/MouseToolbar.js
View File

@@ -11,11 +11,8 @@
* This class is DEPRECATED in 2.4 and will be removed by 3.0.
* If you need this functionality, use Control.NavToolbar instead!!!
*/
OpenLayers.Control.MouseToolbar = OpenLayers.Class.create();
OpenLayers.Control.MouseToolbar.X = 6;
OpenLayers.Control.MouseToolbar.Y = 300;
OpenLayers.Control.MouseToolbar.prototype =
OpenLayers.Class.inherit( OpenLayers.Control.MouseDefaults, {
OpenLayers.Control.MouseToolbar = OpenLayers.Class(
OpenLayers.Control.MouseDefaults, {
/**
* Property: mode
@@ -384,3 +381,5 @@ OpenLayers.Control.MouseToolbar.prototype =
}
});
OpenLayers.Control.MouseToolbar.X = 6;
OpenLayers.Control.MouseToolbar.Y = 300;

4
lib/OpenLayers/Control/NavToolbar.js
View File

@@ -9,9 +9,7 @@
*
* Class: OpenLayers.Control.NavToolbar
*/
OpenLayers.Control.NavToolbar = OpenLayers.Class.create();
OpenLayers.Control.NavToolbar.prototype =
OpenLayers.Class.inherit( OpenLayers.Control.Panel, {
OpenLayers.Control.NavToolbar = OpenLayers.Class(OpenLayers.Control.Panel, {
/**
* Constructor: OpenLayers.Control.NavToolbar

4
lib/OpenLayers/Control/Navigation.js
View File

@@ -19,9 +19,7 @@
* Inherits:
* - <OpenLayers.Control>
*/
OpenLayers.Control.Navigation = OpenLayers.Class.create();
OpenLayers.Control.Navigation.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.Navigation = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: dragPan

4
lib/OpenLayers/Control/OverviewMap.js
View File

@@ -15,9 +15,7 @@
* Inerits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.OverviewMap = OpenLayers.Class.create();
OpenLayers.Control.OverviewMap.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: id

9
lib/OpenLayers/Control/PanZoom.js
View File

@@ -11,11 +11,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.PanZoom = OpenLayers.Class.create();
OpenLayers.Control.PanZoom.X = 4;
OpenLayers.Control.PanZoom.Y = 4;
OpenLayers.Control.PanZoom.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.PanZoom = OpenLayers.Class(OpenLayers.Control, {
/**
* APIProperty: slideFactor
@@ -182,3 +178,6 @@ OpenLayers.Control.PanZoom.prototype =
/** @final @type String */
CLASS_NAME: "OpenLayers.Control.PanZoom"
});
OpenLayers.Control.PanZoom.X = 4;
OpenLayers.Control.PanZoom.Y = 4;

4
lib/OpenLayers/Control/PanZoomBar.js
View File

@@ -12,9 +12,7 @@
* - <OpenLayers.Control.PanZoom>
* - <OpenLayers.Control>
*/
OpenLayers.Control.PanZoomBar = OpenLayers.Class.create();
OpenLayers.Control.PanZoomBar.prototype =
OpenLayers.Class.inherit( OpenLayers.Control.PanZoom, {
OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
/**
* APIProperty: zoomStopWidth

4
lib/OpenLayers/Control/Panel.js
View File

@@ -10,9 +10,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.Panel = OpenLayers.Class.create();
OpenLayers.Control.Panel.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: controls
* Array({<OpenLayers.Control>})

4
lib/OpenLayers/Control/Permalink.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.Permalink = OpenLayers.Class.create();
OpenLayers.Control.Permalink.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: element

4
lib/OpenLayers/Control/Scale.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.Scale = OpenLayers.Class.create();
OpenLayers.Control.Scale.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.Scale = OpenLayers.Class(OpenLayers.Control, {
/**
* Parameter: element

4
lib/OpenLayers/Control/SelectFeature.js
View File

@@ -13,9 +13,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.SelectFeature = OpenLayers.Class.create();
OpenLayers.Control.SelectFeature.prototype =
OpenLayers.Class.inherit(OpenLayers.Control, {
OpenLayers.Control.SelectFeature = OpenLayers.Class(OpenLayers.Control, {
/**
* APIProperty: multiple

4
lib/OpenLayers/Control/ZoomBox.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.ZoomBox = OpenLayers.Class.create();
OpenLayers.Control.ZoomBox.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.ZoomBox = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: type
* {OpenLayers.Control.TYPE}

4
lib/OpenLayers/Control/ZoomToMaxExtent.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Control>
*/
OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class.create();
OpenLayers.Control.ZoomToMaxExtent.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
OpenLayers.Control.ZoomToMaxExtent = OpenLayers.Class(OpenLayers.Control, {
/**
* Property: type
* TYPE_BUTTON.

5
lib/OpenLayers/Events.js
View File

@@ -334,8 +334,7 @@ if (window.Event) {
/**
* Class: OpenLayers.Events
*/
OpenLayers.Events = OpenLayers.Class.create();
OpenLayers.Events.prototype = {
OpenLayers.Events = OpenLayers.Class({
/**
* Constant: BROWSER_EVENTS
@@ -666,4 +665,4 @@ OpenLayers.Events.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Events"
};
});

5
lib/OpenLayers/Feature.js
View File

@@ -11,8 +11,7 @@
* Features are combinations of geography and attributes. The OpenLayers.Feature
* class specifically combines a marker and a lonlat.
*/
OpenLayers.Feature = OpenLayers.Class.create();
OpenLayers.Feature.prototype= {
OpenLayers.Feature = OpenLayers.Class({
/**
* Property: events
@@ -203,4 +202,4 @@ OpenLayers.Feature.prototype= {
/** @final @type String */
CLASS_NAME: "OpenLayers.Feature"
};
});

4
lib/OpenLayers/Feature/Vector.js
View File

@@ -24,9 +24,7 @@ OpenLayers.State = {
* Inherits from:
* - <OpenLayers.Feature>
*/
OpenLayers.Feature.Vector = OpenLayers.Class.create();
OpenLayers.Feature.Vector.prototype =
OpenLayers.Class.inherit( OpenLayers.Feature, {
OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
/**
* Property: fid

4
lib/OpenLayers/Feature/WFS.js
View File

@@ -14,9 +14,7 @@
* Inherits from:
* - <OpenLayers.Feature>
*/
OpenLayers.Feature.WFS = OpenLayers.Class.create();
OpenLayers.Feature.WFS.prototype =
OpenLayers.Class.inherit( OpenLayers.Feature, {
OpenLayers.Feature.WFS = OpenLayers.Class(OpenLayers.Feature, {
/**
* Constructor: OpenLayers.Feature.WFS

5
lib/OpenLayers/Format.js
View File

@@ -9,8 +9,7 @@
* Base class for format reading/writing a variety of formats. Subclasses
* of OpenLayers.Format are expected to have read and write methods.
*/
OpenLayers.Format = OpenLayers.Class.create();
OpenLayers.Format.prototype = {
OpenLayers.Format = OpenLayers.Class({
/**
* Constructor: OpenLayers.Format
@@ -59,4 +58,4 @@ OpenLayers.Format.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Format"
};
});

4
lib/OpenLayers/Format/GML.js
View File

@@ -15,9 +15,7 @@
* Inherits from:
* - <OpenLayers.Format>
*/
OpenLayers.Format.GML = OpenLayers.Class.create();
OpenLayers.Format.GML.prototype =
OpenLayers.Class.inherit( OpenLayers.Format, {
OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format, {
/*
* APIProperty: featureNS

4
lib/OpenLayers/Format/GeoRSS.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Format>
*/
OpenLayers.Format.GeoRSS = OpenLayers.Class.create();
OpenLayers.Format.GeoRSS.prototype =
OpenLayers.Class.inherit( OpenLayers.Format, {
OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format, {
/**
* APIProperty: rssns

4
lib/OpenLayers/Format/KML.js
View File

@@ -15,9 +15,7 @@
* Inherits from:
* - <OpenLayers.Format>
*/
OpenLayers.Format.KML = OpenLayers.Class.create();
OpenLayers.Format.KML.prototype =
OpenLayers.Class.inherit( OpenLayers.Format, {
OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format, {
/**
* APIProperty: kmlns

4
lib/OpenLayers/Format/WFS.js
View File

@@ -8,9 +8,7 @@
* Class: OpenLayers.Format.WFS
* Read/Write WFS.
*/
OpenLayers.Format.WFS = OpenLayers.Class.create();
OpenLayers.Format.WFS.prototype =
OpenLayers.Class.inherit( OpenLayers.Format.GML, {
OpenLayers.Format.WFS = OpenLayers.Class(OpenLayers.Format.GML, {
/**
* Property: layer

4
lib/OpenLayers/Format/WKT.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Format>
*/
OpenLayers.Format.WKT = OpenLayers.Class.create();
OpenLayers.Format.WKT.prototype =
OpenLayers.Class.inherit(OpenLayers.Format, {
OpenLayers.Format.WKT = OpenLayers.Class(OpenLayers.Format, {
/**
* Constructor: OpenLayers.Format.WKT

5
lib/OpenLayers/Geometry.js
View File

@@ -11,8 +11,7 @@
* this class with the <OpenLayers.Geometry> constructor. This is a base class,
* typical geometry types are described by subclasses of this class.
*/
OpenLayers.Geometry = OpenLayers.Class.create();
OpenLayers.Geometry.prototype = {
OpenLayers.Geometry = OpenLayers.Class({
/**
* Property: id
@@ -189,4 +188,4 @@ OpenLayers.Geometry.prototype = {
/** @final @type String*/
CLASS_NAME: "OpenLayers.Geometry"
};
});

4
lib/OpenLayers/Geometry/Collection.js
View File

@@ -22,9 +22,7 @@
* Inerhits from:
* - <OpenLayers.Geometry>
*/
OpenLayers.Geometry.Collection = OpenLayers.Class.create();
OpenLayers.Geometry.Collection.prototype =
OpenLayers.Class.inherit( OpenLayers.Geometry, {
OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
/**
* APIProperty: components

4
lib/OpenLayers/Geometry/Curve.js
View File

@@ -13,9 +13,7 @@
* Inherits:
* - <OpenLayers.Geometry.MultiPoint>
*/
OpenLayers.Geometry.Curve = OpenLayers.Class.create();
OpenLayers.Geometry.Curve.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.MultiPoint, {
OpenLayers.Geometry.Curve = OpenLayers.Class(OpenLayers.Geometry.MultiPoint, {
/**
* Property: componentTypes

4
lib/OpenLayers/Geometry/LineString.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Geometry.Curve>
*/
OpenLayers.Geometry.LineString = OpenLayers.Class.create();
OpenLayers.Geometry.LineString.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.Curve, {
OpenLayers.Geometry.LineString = OpenLayers.Class(OpenLayers.Geometry.Curve, {
/**
* Constructor: OpenLayers.Geometry.LineString

5
lib/OpenLayers/Geometry/LinearRing.js
View File

@@ -17,9 +17,8 @@
* Inherits:
* - <OpenLayers.Geometry.LineString>
*/
OpenLayers.Geometry.LinearRing = OpenLayers.Class.create();
OpenLayers.Geometry.LinearRing.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.LineString, {
OpenLayers.Geometry.LinearRing = OpenLayers.Class(
OpenLayers.Geometry.LineString, {
/**
* Property: componentTypes

5
lib/OpenLayers/Geometry/MultiLineString.js
View File

@@ -13,9 +13,8 @@
* - <OpenLayers.Geometry.Collection>
* - <OpenLayers.Geometry>
*/
OpenLayers.Geometry.MultiLineString = OpenLayers.Class.create();
OpenLayers.Geometry.MultiLineString.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
OpenLayers.Geometry.MultiLineString = OpenLayers.Class(
OpenLayers.Geometry.Collection, {
/**
* Property: componentTypes

5
lib/OpenLayers/Geometry/MultiPoint.js
View File

@@ -13,9 +13,8 @@
* - <OpenLayers.Geometry.Collection>
* - <OpenLayers.Geometry>
*/
OpenLayers.Geometry.MultiPoint = OpenLayers.Class.create();
OpenLayers.Geometry.MultiPoint.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
OpenLayers.Geometry.MultiPoint = OpenLayers.Class(
OpenLayers.Geometry.Collection, {
/**
* Property: componentTypes

5
lib/OpenLayers/Geometry/MultiPolygon.js
View File

@@ -13,9 +13,8 @@
* Inherits from:
* - <OpenLayers.Geometry.Collection>
*/
OpenLayers.Geometry.MultiPolygon = OpenLayers.Class.create();
OpenLayers.Geometry.MultiPolygon.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
OpenLayers.Geometry.MultiPolygon = OpenLayers.Class(
OpenLayers.Geometry.Collection, {
/**
* Property: componentTypes

4
lib/OpenLayers/Geometry/Point.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Geometry>
*/
OpenLayers.Geometry.Point = OpenLayers.Class.create();
OpenLayers.Geometry.Point.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry, {
OpenLayers.Geometry.Point = OpenLayers.Class(OpenLayers.Geometry, {
/**
* APIProperty: x

5
lib/OpenLayers/Geometry/Polygon.js
View File

@@ -12,9 +12,8 @@
* - <OpenLayers.Geometry.Collection>
* - <OpenLayers.Geometry>
*/
OpenLayers.Geometry.Polygon = OpenLayers.Class.create();
OpenLayers.Geometry.Polygon.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
OpenLayers.Geometry.Polygon = OpenLayers.Class(
OpenLayers.Geometry.Collection, {
/**
* Property: componentTypes

4
lib/OpenLayers/Geometry/Rectangle.js
View File

@@ -14,9 +14,7 @@
* - <OpenLayers.Geometry>
*/
OpenLayers.Geometry.Rectangle = OpenLayers.Class.create();
OpenLayers.Geometry.Rectangle.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry, {
OpenLayers.Geometry.Rectangle = OpenLayers.Class(OpenLayers.Geometry, {
/**
* Property: x

4
lib/OpenLayers/Geometry/Surface.js
View File

@@ -7,9 +7,7 @@
*
* Class: OpenLayers.Geometry.Surface
*/
OpenLayers.Geometry.Surface = OpenLayers.Class.create();
OpenLayers.Geometry.Surface.prototype =
OpenLayers.Class.inherit(OpenLayers.Geometry, {
OpenLayers.Geometry.Surface = OpenLayers.Class(OpenLayers.Geometry, {
/**
* Constructor: OpenLayers.Geometry.Surface

54
lib/OpenLayers/Handler.js
View File

@@ -26,33 +26,8 @@
* themselves may make temporary changes, but in general are expected to
* return the application in the same state that they found it.
*/
OpenLayers.Handler = OpenLayers.Class.create();
OpenLayers.Handler = OpenLayers.Class({
/**
* Constant: OpenLayers.Handler.MOD_NONE
* If set as the <keyMask>, <checkModifiers> returns false if any key is down.
*/
OpenLayers.Handler.MOD_NONE = 0;
/**
* Constant: OpenLayers.Handler.MOD_SHIFT
* If set as the <keyMask>, <checkModifiers> returns false if Shift is down.
*/
OpenLayers.Handler.MOD_SHIFT = 1;
/**
* Constant: OpenLayers.Handler.MOD_CTRL
* If set as the <keyMask>, <checkModifiers> returns false if Ctrl is down.
*/
OpenLayers.Handler.MOD_CTRL = 2;
/**
* Constant: OpenLayers.Handler.MOD_ALT
* If set as the <keyMask>, <checkModifiers> returns false if Alt is down.
*/
OpenLayers.Handler.MOD_ALT = 4;
OpenLayers.Handler.prototype = {
/**
* Property: id
* {String}
@@ -245,4 +220,29 @@ OpenLayers.Handler.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Handler"
};
});
/**
* Constant: OpenLayers.Handler.MOD_NONE
* If set as the <keyMask>, <checkModifiers> returns false if any key is down.
*/
OpenLayers.Handler.MOD_NONE = 0;
/**
* Constant: OpenLayers.Handler.MOD_SHIFT
* If set as the <keyMask>, <checkModifiers> returns false if Shift is down.
*/
OpenLayers.Handler.MOD_SHIFT = 1;
/**
* Constant: OpenLayers.Handler.MOD_CTRL
* If set as the <keyMask>, <checkModifiers> returns false if Ctrl is down.
*/
OpenLayers.Handler.MOD_CTRL = 2;
/**
* Constant: OpenLayers.Handler.MOD_ALT
* If set as the <keyMask>, <checkModifiers> returns false if Alt is down.
*/
OpenLayers.Handler.MOD_ALT = 4;

4
lib/OpenLayers/Handler/Box.js
View File

@@ -13,8 +13,8 @@
* Inherits from:
* - <OpenLayers.Handler>
*/
OpenLayers.Handler.Box = OpenLayers.Class.create();
OpenLayers.Handler.Box.prototype = OpenLayers.Class.inherit( OpenLayers.Handler, {
OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, {
/**
* Property: dragHandler
* {<OpenLayers.Handler.Drag>}

4
lib/OpenLayers/Handler/Drag.js
View File

@@ -23,9 +23,7 @@
* Inherits from:
* - <OpenLayers.Handler>
*/
OpenLayers.Handler.Drag = OpenLayers.Class.create();
OpenLayers.Handler.Drag.prototype =
OpenLayers.Class.inherit( OpenLayers.Handler, {
OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
/**
* Property: started

4
lib/OpenLayers/Handler/Feature.js
View File

@@ -11,9 +11,7 @@
* Callbacks will be called for over, move, out, up, and down (corresponding
* to the equivalent mouse events).
*/
OpenLayers.Handler.Feature = OpenLayers.Class.create();
OpenLayers.Handler.Feature.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler, {
OpenLayers.Handler.Feature = OpenLayers.Class(OpenLayers.Handler, {
/**
* Property: layerIndex

3
lib/OpenLayers/Handler/Keyboard.js
View File

@@ -11,8 +11,7 @@
* Inherits from:
* - <OpenLayers.Handler>
*/
OpenLayers.Handler.Keyboard = OpenLayers.Class.create();
OpenLayers.Handler.Keyboard.prototype = OpenLayers.Class.inherit( OpenLayers.Handler, {
OpenLayers.Handler.Keyboard = OpenLayers.Class(OpenLayers.Handler, {
/* http://www.quirksmode.org/js/keys.html explains key x-browser
key handling quirks in pretty nice detail */

3
lib/OpenLayers/Handler/MouseWheel.js
View File

@@ -11,8 +11,7 @@
* Inherits from:
* - <OpenLayers.Handler>
*/
OpenLayers.Handler.MouseWheel = OpenLayers.Class.create();
OpenLayers.Handler.MouseWheel.prototype = OpenLayers.Class.inherit( OpenLayers.Handler, {
OpenLayers.Handler.MouseWheel = OpenLayers.Class(OpenLayers.Handler, {
/**
* Property: wheelListener
* {function}

4
lib/OpenLayers/Handler/Path.js
View File

@@ -15,9 +15,7 @@
* Inherits from:
* - <OpenLayers.Handler.Point>
*/
OpenLayers.Handler.Path = OpenLayers.Class.create();
OpenLayers.Handler.Path.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler.Point, {
OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
/**
* Property: line

4
lib/OpenLayers/Handler/Point.js
View File

@@ -16,9 +16,7 @@
* Inherits from:
* - <OpenLayers.Handler>
*/
OpenLayers.Handler.Point = OpenLayers.Class.create();
OpenLayers.Handler.Point.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler, {
OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, {
/**
* Property: point

4
lib/OpenLayers/Handler/Polygon.js
View File

@@ -15,9 +15,7 @@
* - <OpenLayers.Handler.Path>
* - <OpenLayers.Handler>
*/
OpenLayers.Handler.Polygon = OpenLayers.Class.create();
OpenLayers.Handler.Polygon.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler.Path, {
OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, {
/**
* Parameter: polygon

5
lib/OpenLayers/Icon.js
View File

@@ -15,8 +15,7 @@
* the desired offset.
*
*/
OpenLayers.Icon = OpenLayers.Class.create();
OpenLayers.Icon.prototype = {
OpenLayers.Icon = OpenLayers.Class({
/**
* Property: url
@@ -182,4 +181,4 @@ OpenLayers.Icon.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Icon"
};
});

5
lib/OpenLayers/Layer.js
View File

@@ -8,8 +8,7 @@
*
* Class: OpenLayers.Layer
*/
OpenLayers.Layer = OpenLayers.Class.create();
OpenLayers.Layer.prototype = {
OpenLayers.Layer = OpenLayers.Class({
/**
* APIProperty: id
@@ -860,4 +859,4 @@ OpenLayers.Layer.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Layer"
};
});

4
lib/OpenLayers/Layer/Boxes.js
View File

@@ -13,9 +13,7 @@
* Inherits from:
* - <OpenLayers.Layer.Markers>
*/
OpenLayers.Layer.Boxes = OpenLayers.Class.create();
OpenLayers.Layer.Boxes.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Markers, {
OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
/**
* Constructor: OpenLayers.Layer.Boxes

4
lib/OpenLayers/Layer/EventPane.js
View File

@@ -14,9 +14,7 @@
* Inherits from:
* - <OpenLayers.Layer>
*/
OpenLayers.Layer.EventPane = OpenLayers.Class.create();
OpenLayers.Layer.EventPane.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer, {
OpenLayers.Layer.EventPane = OpenLayers.Class(OpenLayers.Layer, {
/**
* Property: isBaseLayer

5
lib/OpenLayers/Layer/FixedZoomLevels.js
View File

@@ -45,8 +45,7 @@
* API that you might be working from.
*
*/
OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class.create();
OpenLayers.Layer.FixedZoomLevels.prototype = {
OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class({
/********************************************************/
/* */
@@ -249,5 +248,5 @@ OpenLayers.Layer.FixedZoomLevels.prototype = {
/** @final @type String */
CLASS_NAME: "FixedZoomLevels.js"
};
});

4
lib/OpenLayers/Layer/GML.js
View File

@@ -13,9 +13,7 @@
* Inherits from:
* - <OpenLayers.Layer.Vector>
*/
OpenLayers.Layer.GML = OpenLayers.Class.create();
OpenLayers.Layer.GML.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Vector, {
OpenLayers.Layer.GML = OpenLayers.Class(OpenLayers.Layer.Vector, {
/**
* Property: loaded

4
lib/OpenLayers/Layer/GeoRSS.js
View File

@@ -14,9 +14,7 @@
* - <OpenLayers.Layer.Markers>
* - <OpenLayers.Layer>
*/
OpenLayers.Layer.GeoRSS = OpenLayers.Class.create();
OpenLayers.Layer.GeoRSS.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Markers, {
OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
/**
* Property: location

6
lib/OpenLayers/Layer/Google.js
View File

@@ -13,10 +13,8 @@
* - <OpenLayers.Layer.EventPane>
* - <OpenLayers.Layer.FixedZoomLevels>
*/
OpenLayers.Layer.Google = OpenLayers.Class.create();
OpenLayers.Layer.Google.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.EventPane,
OpenLayers.Layer.FixedZoomLevels, {
OpenLayers.Layer.Google = OpenLayers.Class(OpenLayers.Layer.EventPane,
OpenLayers.Layer.FixedZoomLevels, {
/**
* Constant: MIN_ZOOM_LEVEL

4
lib/OpenLayers/Layer/Grid.js
View File

@@ -13,9 +13,7 @@
* Inherits from:
* - <OpenLayers.Layer.HTTPRequest>
*/
OpenLayers.Layer.Grid = OpenLayers.Class.create();
OpenLayers.Layer.Grid.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.HTTPRequest, {
OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
/**
* APIProperty: tileSize

4
lib/OpenLayers/Layer/HTTPRequest.js
View File

@@ -11,9 +11,7 @@
* Inherits:
* - OpenLayers.Layer
*/
OpenLayers.Layer.HTTPRequest = OpenLayers.Class.create();
OpenLayers.Layer.HTTPRequest.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer, {
OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
/**
* Constant: URL_HASH_FACTOR

4
lib/OpenLayers/Layer/Image.js
View File

@@ -11,9 +11,7 @@
* accessible image as a map layer. Create a new image layer with the
* <OpenLayers.Layer.Image> constructor. Inherits from <OpenLayers.Layer>.
*/
OpenLayers.Layer.Image = OpenLayers.Class.create();
OpenLayers.Layer.Image.prototype =
OpenLayers.Class.inherit(OpenLayers.Layer, {
OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
/**
* Property: isBaseLayer

4
lib/OpenLayers/Layer/KaMap.js
View File

@@ -11,9 +11,7 @@
* Inherits:
* - <OpenLayers.Layer.Grid>
*/
OpenLayers.Layer.KaMap = OpenLayers.Class.create();
OpenLayers.Layer.KaMap.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
OpenLayers.Layer.KaMap = OpenLayers.Class(OpenLayers.Layer.Grid, {
/**
* APIProperty: isBaseLayer

4
lib/OpenLayers/Layer/MapServer.js
View File

@@ -12,9 +12,7 @@
* Inherits from:
* - <OpenLayers.Layer.Grid>
*/
OpenLayers.Layer.MapServer = OpenLayers.Class.create();
OpenLayers.Layer.MapServer.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
/**
* Constant: DEFAULT_PARAMS

5
lib/OpenLayers/Layer/MapServer/Untiled.js
View File

@@ -11,9 +11,8 @@
* Inherits from:
* - <OpenLayers.Layer.HTTPRequest>
*/
OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class.create();
OpenLayers.Layer.MapServer.Untiled.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.HTTPRequest, {
OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class(
OpenLayers.Layer.HTTPRequest, {
/**
* Constant: default_params

4
lib/OpenLayers/Layer/Markers.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Layer>
*/
OpenLayers.Layer.Markers = OpenLayers.Class.create();
OpenLayers.Layer.Markers.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer, {
OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
/**
* APIProperty: isBaseLayer

6
lib/OpenLayers/Layer/MultiMap.js
View File

@@ -12,10 +12,8 @@
* - <OpenLayers.Layers.EventPane>
* - <OpenLayers.Layers.FixedZoomLevels>
*/
OpenLayers.Layer.MultiMap = OpenLayers.Class.create();
OpenLayers.Layer.MultiMap.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.EventPane,
OpenLayers.Layer.FixedZoomLevels, {
OpenLayers.Layer.MultiMap = OpenLayers.Class(
OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
/**
* Constant: MIN_ZOOM_LEVEL

4
lib/OpenLayers/Layer/TMS.js
View File

@@ -11,9 +11,7 @@
* Inherits:
* - <OpenLayers.Layer.Grid>
*/
OpenLayers.Layer.TMS = OpenLayers.Class.create();
OpenLayers.Layer.TMS.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
/**
* APIProperty: reproject

4
lib/OpenLayers/Layer/Text.js
View File

@@ -12,9 +12,7 @@
* Inherits from;
* - <OpenLayers.Layer.Markers>
*/
OpenLayers.Layer.Text = OpenLayers.Class.create();
OpenLayers.Layer.Text.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Markers, {
OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
/**
* APIProperty: location

4
lib/OpenLayers/Layer/TileCache.js
View File

@@ -14,9 +14,7 @@
* Inherits from:
* - <OpenLayers.Layer.Grid>
*/
OpenLayers.Layer.TileCache = OpenLayers.Class.create();
OpenLayers.Layer.TileCache.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
OpenLayers.Layer.TileCache = OpenLayers.Class(OpenLayers.Layer.Grid, {
/**
* APIProperty: reproject

4
lib/OpenLayers/Layer/Vector.js
View File

@@ -15,9 +15,7 @@
* Inherits from:
* - <OpenLayers.Layer>
*/
OpenLayers.Layer.Vector = OpenLayers.Class.create();
OpenLayers.Layer.Vector.prototype =
OpenLayers.Class.inherit(OpenLayers.Layer, {
OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
/**
* APIProperty: isBaseLayer

6
lib/OpenLayers/Layer/VirtualEarth.js
View File

@@ -13,10 +13,8 @@
* - <OpenLayers.Layer.EventPane>
* - <OpenLayers.Layer.FixedZoomLevels>
*/
OpenLayers.Layer.VirtualEarth = OpenLayers.Class.create();
OpenLayers.Layer.VirtualEarth.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.EventPane,
OpenLayers.Layer.FixedZoomLevels, {
OpenLayers.Layer.VirtualEarth = OpenLayers.Class(
OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
/**
* Constant: MIN_ZOOM_LEVEL

6
lib/OpenLayers/Layer/WFS.js
View File

@@ -13,10 +13,8 @@
* - <OpenLayers.Layer.Vector>
* - <OpenLayers.Layer.Markers>
*/
OpenLayers.Layer.WFS = OpenLayers.Class.create();
OpenLayers.Layer.WFS.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Vector,
OpenLayers.Layer.Markers, {
OpenLayers.Layer.WFS = OpenLayers.Class(
OpenLayers.Layer.Vector, OpenLayers.Layer.Markers, {
/**
* APIProperty: isBaseLayer

4
lib/OpenLayers/Layer/WMS.js
View File

@@ -15,9 +15,7 @@
* Inherits from:
* - <OpenLayers.Layer.Grid>
*/
OpenLayers.Layer.WMS = OpenLayers.Class.create();
OpenLayers.Layer.WMS.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
OpenLayers.Layer.WMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
/**
* Constant: DEFAULT_PARAMS

4
lib/OpenLayers/Layer/WMS/Untiled.js
View File

@@ -13,9 +13,7 @@
* Inherits from:
* - <OpenLayers.Layer.WMS>
*/
OpenLayers.Layer.WMS.Untiled = OpenLayers.Class.create();
OpenLayers.Layer.WMS.Untiled.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.WMS, {
OpenLayers.Layer.WMS.Untiled = OpenLayers.Class(OpenLayers.Layer.WMS, {
/**
* APIProperty: singleTile

4
lib/OpenLayers/Layer/WorldWind.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Layer.Grid>
*/
OpenLayers.Layer.WorldWind = OpenLayers.Class.create();
OpenLayers.Layer.WorldWind.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
OpenLayers.Layer.WorldWind = OpenLayers.Class(OpenLayers.Layer.Grid, {
DEFAULT_PARAMS: {
},

6
lib/OpenLayers/Layer/Yahoo.js
View File

@@ -13,10 +13,8 @@
* - <OpenLayers.Layer.EventPane>
* - <OpenLayers.Layer.FixedZoomLevels>v
*/
OpenLayers.Layer.Yahoo = OpenLayers.Class.create();
OpenLayers.Layer.Yahoo.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.EventPane,
OpenLayers.Layer.FixedZoomLevels, {
OpenLayers.Layer.Yahoo = OpenLayers.Class(
OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {
/**
* Constant: MIN_ZOOM_LEVEL

26
lib/OpenLayers/Map.js
View File

@@ -15,18 +15,7 @@
* it's necessary to add controls (<OpenLayers.Control>) and
* layers (<OpenLayers.Layer>) to the map.
*/
OpenLayers.Map = OpenLayers.Class.create();
/**
* Constant: TILE_WIDTH
* {Integer} 256 Default tile width (unless otherwise specified)
*/
OpenLayers.Map.TILE_WIDTH = 256;
/**
* Constant: TILE_HEIGHT
* {Integer} 256 Default tile height (unless otherwise specified)
*/
OpenLayers.Map.TILE_HEIGHT = 256;
OpenLayers.Map.prototype = {
OpenLayers.Map = OpenLayers.Class({
/**
* Constant: Z_INDEX_BASE
@@ -1625,4 +1614,15 @@ OpenLayers.Map.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Map"
};
});
/**
* Constant: TILE_WIDTH
* {Integer} 256 Default tile width (unless otherwise specified)
*/
OpenLayers.Map.TILE_WIDTH = 256;
/**
* Constant: TILE_HEIGHT
* {Integer} 256 Default tile height (unless otherwise specified)
*/
OpenLayers.Map.TILE_HEIGHT = 256;

5
lib/OpenLayers/Marker.js
View File

@@ -26,8 +26,7 @@
*
* (end)
*/
OpenLayers.Marker = OpenLayers.Class.create();
OpenLayers.Marker.prototype = {
OpenLayers.Marker = OpenLayers.Class({
/**
* Property: icon
@@ -171,7 +170,7 @@ OpenLayers.Marker.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Marker"
};
});
/**

4
lib/OpenLayers/Marker/Box.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Marker>
*/
OpenLayers.Marker.Box = OpenLayers.Class.create();
OpenLayers.Marker.Box.prototype =
OpenLayers.Class.inherit( OpenLayers.Marker, {
OpenLayers.Marker.Box = OpenLayers.Class(OpenLayers.Marker, {
/**
* Property: bounds

18
lib/OpenLayers/Popup.js
View File

@@ -23,15 +23,7 @@
* map.addPopup(popup);
* (end)
*/
OpenLayers.Popup = OpenLayers.Class.create();
OpenLayers.Popup.WIDTH = 200;
OpenLayers.Popup.HEIGHT = 200;
OpenLayers.Popup.COLOR = "white";
OpenLayers.Popup.OPACITY = 1;
OpenLayers.Popup.BORDER = "0px";
OpenLayers.Popup.prototype = {
OpenLayers.Popup = OpenLayers.Class({
/**
* Property: events
@@ -494,4 +486,10 @@ OpenLayers.Popup.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Popup"
};
});
OpenLayers.Popup.WIDTH = 200;
OpenLayers.Popup.HEIGHT = 200;
OpenLayers.Popup.COLOR = "white";
OpenLayers.Popup.OPACITY = 1;
OpenLayers.Popup.BORDER = "0px";

4
lib/OpenLayers/Popup/Anchored.js
View File

@@ -11,9 +11,7 @@
* Inherits from:
* - <OpenLayers.Popup>
*/
OpenLayers.Popup.Anchored = OpenLayers.Class.create();
OpenLayers.Popup.Anchored.prototype =
OpenLayers.Class.inherit( OpenLayers.Popup, {
OpenLayers.Popup.Anchored = OpenLayers.Class(OpenLayers.Popup, {
/**
* Parameter: relativePosition

18
lib/OpenLayers/Popup/AnchoredBubble.js
View File

@@ -11,16 +11,7 @@
* Inherits from:
* - <OpenLayers.Popup.Anchored>
*/
OpenLayers.Popup.AnchoredBubble = OpenLayers.Class.create();
/**
* Constant: CORNER_SIZE
* {Integer} 5. Border space for the RICO corners
*/
OpenLayers.Popup.AnchoredBubble.CORNER_SIZE = 5;
OpenLayers.Popup.AnchoredBubble.prototype =
OpenLayers.Class.inherit( OpenLayers.Popup.Anchored, {
OpenLayers.Popup.AnchoredBubble = OpenLayers.Class(OpenLayers.Popup.Anchored, {
/**
* Property: rounded
@@ -193,3 +184,10 @@ OpenLayers.Popup.AnchoredBubble.prototype =
/** @final @type String */
CLASS_NAME: "OpenLayers.Popup.AnchoredBubble"
});
/**
* Constant: CORNER_SIZE
* {Integer} 5. Border space for the RICO corners
*/
OpenLayers.Popup.AnchoredBubble.CORNER_SIZE = 5;

7
lib/OpenLayers/Renderer.js
View File

@@ -19,9 +19,8 @@
* cacheing system.
*
*/
OpenLayers.Renderer = OpenLayers.Class.create();
OpenLayers.Renderer.prototype =
{
OpenLayers.Renderer = OpenLayers.Class({
/**
* Property: container
* {DOMElement}
@@ -210,4 +209,4 @@ OpenLayers.Renderer.prototype =
/** @final @type String */
CLASS_NAME: "OpenLayers.Renderer"
};
});

4
lib/OpenLayers/Renderer/Elements.js
View File

@@ -19,9 +19,7 @@
* Inherits:
* - <OpenLayers.Renderer>
*/
OpenLayers.Renderer.Elements = OpenLayers.Class.create();
OpenLayers.Renderer.Elements.prototype =
OpenLayers.Class.inherit(OpenLayers.Renderer, {
OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
/**
* Property: rendererRoot

4
lib/OpenLayers/Renderer/SVG.js
View File

@@ -10,9 +10,7 @@
* Inherits:
* - <OpenLayers.Renderer.Elements>
*/
OpenLayers.Renderer.SVG = OpenLayers.Class.create();
OpenLayers.Renderer.SVG.prototype =
OpenLayers.Class.inherit(OpenLayers.Renderer.Elements, {
OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
/**
* Property: xmlns

4
lib/OpenLayers/Renderer/VML.js
View File

@@ -16,9 +16,7 @@
* Inherits from:
* - <OpenLayers.Renderer.Elements>
*/
OpenLayers.Renderer.VML = OpenLayers.Class.create();
OpenLayers.Renderer.VML.prototype =
OpenLayers.Class.inherit(OpenLayers.Renderer.Elements, {
OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
/**
* Property: xmlns

5
lib/OpenLayers/Tile.js
View File

@@ -17,8 +17,7 @@
* TBD 3.0 - remove reference to url in above paragraph
*
*/
OpenLayers.Tile = OpenLayers.Class.create();
OpenLayers.Tile.prototype = {
OpenLayers.Tile = OpenLayers.Class({
/**
* Constant: EVENT_TYPES
@@ -230,4 +229,4 @@ OpenLayers.Tile.prototype = {
/** @final @type String */
CLASS_NAME: "OpenLayers.Tile"
};
});

4
lib/OpenLayers/Tile/Image.js
View File

@@ -14,9 +14,7 @@
* Inherits from:
* - <OpenLayers.Tile>
*/
OpenLayers.Tile.Image = OpenLayers.Class.create();
OpenLayers.Tile.Image.prototype =
OpenLayers.Class.inherit( OpenLayers.Tile, {
OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, {
/**
* Property: url

4
lib/OpenLayers/Tile/WFS.js
View File

@@ -14,9 +14,7 @@
* Inherits from:
* - <OpenLayers.Tile>
*/
OpenLayers.Tile.WFS = OpenLayers.Class.create();
OpenLayers.Tile.WFS.prototype =
OpenLayers.Class.inherit( OpenLayers.Tile, {
OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, {
/**
* Property: features

6
lib/Rico/Color.js
View File

@@ -1,6 +1,4 @@
OpenLayers.Rico.Color = OpenLayers.Class.create();
OpenLayers.Rico.Color.prototype = {
OpenLayers.Rico.Color = OpenLayers.Class({
initialize: function(red, green, blue) {
this.rgb = { r: red, g : green, b : blue };
@@ -87,7 +85,7 @@ OpenLayers.Rico.Color.prototype = {
return this.asHex();
}
};
});
OpenLayers.Rico.Color.createFromHex = function(hexCode) {
if(hexCode.length==4) {

164
tests/BaseTypes/test_Class.html
View File

@@ -2,8 +2,171 @@
<head>
<script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"><!--
// remove this next line at 3.0
var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
function test_Class(t) {
t.plan(1);
var MyClass = OpenLayers.Class({
initialize: function () {
t.ok(false, "initialize should not be called");
}
});
t.ok(true,
"defining a class does not call the constructor for the class");
}
function test_Class_constructor(t) {
t.plan(7);
var MyClass = OpenLayers.Class({
prop: null,
classProp: {'bad': 'practice'},
initialize: function(a1, a2) {
this.prop = "instance property";
t.ok(true,
"initialize is called when a new instance is created");
t.eq(a1, arg1,
"initialize is called with the proper first argument");
t.eq(a2, arg2,
"initialize is called with the proper second argument");
},
CLASS_NAME: "MyClass"
});
var arg1 = "anArg";
var arg2 = {"another": "arg"};
var myObj = new MyClass(arg1, arg2);
t.eq(MyClass.prop, null,
"creating a new instance doesn't modify the class");
t.eq(myObj.prop, "instance property",
"the new instance is assigned a property in the constructor");
t.eq(myObj["CLASS_NAME"], "MyClass",
"the new object is an instance of MyClass");
// allow for modification of class properties
MyClass.prototype.classProp.bad = "good";
t.eq(myObj.classProp.bad, "good",
"modifying a class property modifies properties of the instance");
}
function test_Class_inheritance(t) {
t.plan(4);
var BaseClass = OpenLayers.Class({
prop: "base",
initialize: function() {
t.ok(false,
"base class constructor is not called during inheritance");
},
toString: function() {
return "toString inherited";
},
CLASS_NAME: "BaseClass"
});
var ChildClass = OpenLayers.Class(BaseClass, {
initialize: function() {
t.ok(true,
"child class constructor is called in creating an instance");
},
CLASS_NAME: "ChildClass"
});
var child = new ChildClass();
t.eq(child.prop, "base",
"instance of child inherits properties from base");
t.eq(child.toString(), "toString inherited",
"instance of child inherits toString method from base");
t.eq(child["CLASS_NAME"],
"ChildClass",
"new object is an instance of the child class");
}
function test_Class_multiple_inheritance(t) {
t.plan(7);
var BaseClass1 = OpenLayers.Class({
override: "base1",
prop: "base1",
variable: null,
initialize: function() {
t.ok(true,
"only called when an instance of this class is created");
},
CLASS_NAME: "BaseClass1"
});
var BaseClass2 = OpenLayers.Class({
override: "base2",
initialize: function() {
t.ok(false,
"base class constructor is not called during inheritance");
},
CLASS_NAME: "BaseClass1"
});
var ChildClass = OpenLayers.Class(BaseClass1, BaseClass2, {
initialize: function(arg) {
if(this.prop == "base1") {
this.variable = "child";
}
t.ok(true,
"only child class constructor is called on initialization");
},
CLASS_NAME: "ChildClass"
});
var arg = "child";
var child = new ChildClass(arg);
t.eq(child.variable, arg,
"inheritance works before construction");
t.eq(child.prop, "base1",
"properties are inherited with multiple classes")
t.eq(child.override, "base2",
"properties are inherited in the expected order");
t.eq(child["CLASS_NAME"],
"ChildClass",
"object is an instance of child class");
var base1 = new BaseClass1();
t.eq(base1.override, "base1",
"inheritance doesn't mess with parents");
}
// Remove this at 3.0
function test_Class_backwards(t) {
t.plan(4);
// test that a new style class supports old style inheritance
var NewClass = OpenLayers.Class({
newProp: "new",
initialize: function() {
t.ok(false, "the base class is never instantiated");
},
toString: function() {
return "new style";
}
});
var OldClass = OpenLayers.Class.create();
OldClass.prototype = OpenLayers.Class.inherit(NewClass, {
oldProp: "old",
initialize: function() {
t.ok(true, "only the child class constructor is called");
}
});
var oldObj = new OldClass();
t.eq(oldObj.oldProp, "old",
"old style classes can still be instantiated");
t.eq(oldObj.newProp, "new",
"old style inheritance of properties works with new style base");
t.eq(oldObj.toString(), "new style",
"toString inheritance works with backwards style");
}
// Remove this at 3.0
function test_01_Class_create (t) {
t.plan( 3 );
var cls = OpenLayers.Class.create();
@@ -25,6 +188,7 @@
t.ok(true, "this test doesn't work in IE");
}
// Remove this at 3.0
function test_02_Class_inherit (t) {
t.plan( 20 );
var A = OpenLayers.Class.create();

Some files were not shown because too many files have changed in this diff Show More