[fusion-commits] r1371 - sandbox/olcore/widgets
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Thu Apr 10 14:07:22 EDT 2008
Author: pdeschamps
Date: 2008-04-10 14:07:21 -0400 (Thu, 10 Apr 2008)
New Revision: 1371
Modified:
sandbox/olcore/widgets/About.js
sandbox/olcore/widgets/ActivityIndicator.js
sandbox/olcore/widgets/Buffer.js
sandbox/olcore/widgets/BufferPanel.js
sandbox/olcore/widgets/CenterSelection.js
sandbox/olcore/widgets/ClearSelection.js
sandbox/olcore/widgets/ColorPicker.js
sandbox/olcore/widgets/CursorPosition.js
sandbox/olcore/widgets/EditableScale.js
sandbox/olcore/widgets/ExtentHistory.js
sandbox/olcore/widgets/InitialMapView.js
sandbox/olcore/widgets/InvokeScript.js
sandbox/olcore/widgets/InvokeURL.js
sandbox/olcore/widgets/LayerManager.js
sandbox/olcore/widgets/Legend.js
sandbox/olcore/widgets/LinkToView.js
sandbox/olcore/widgets/MapMenu.js
sandbox/olcore/widgets/Maptip.js
sandbox/olcore/widgets/Measure.js
sandbox/olcore/widgets/Navigator.js
sandbox/olcore/widgets/OverviewMap.js
sandbox/olcore/widgets/Pan.js
sandbox/olcore/widgets/PanOnClick.js
sandbox/olcore/widgets/PanQuery.js
sandbox/olcore/widgets/Print.js
sandbox/olcore/widgets/RefreshMap.js
sandbox/olcore/widgets/SaveMap.js
sandbox/olcore/widgets/Scalebar.js
sandbox/olcore/widgets/Search.js
sandbox/olcore/widgets/Select.js
sandbox/olcore/widgets/SelectPolygon.js
sandbox/olcore/widgets/SelectRadius.js
sandbox/olcore/widgets/SelectRadiusValue.js
sandbox/olcore/widgets/SelectWithin.js
sandbox/olcore/widgets/SelectionInfo.js
sandbox/olcore/widgets/SelectionPanel.js
sandbox/olcore/widgets/TaskPane.js
sandbox/olcore/widgets/ViewOptions.js
sandbox/olcore/widgets/ViewSize.js
sandbox/olcore/widgets/Zoom.js
sandbox/olcore/widgets/ZoomOnClick.js
sandbox/olcore/widgets/ZoomToSelection.js
Log:
removed comments from prior linkages Object.inheritFrom()
Modified: sandbox/olcore/widgets/About.js
===================================================================
--- sandbox/olcore/widgets/About.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/About.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -31,8 +31,6 @@
*
* **********************************************************************/
-//Fusion.Widget.About = Class.create();
-//Fusion.Widget.About.prototype =
Fusion.Widget.About = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
_nWidth : 500,
_nHeight : 400,
@@ -48,8 +46,7 @@
*/
initialize : function(widgetTag) {
//console.log('About.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/ActivityIndicator.js
===================================================================
--- sandbox/olcore/widgets/ActivityIndicator.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ActivityIndicator.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -33,12 +33,11 @@
*
* **************************************************************************/
-//Fusion.Widget.ActivityIndicator = Class.create();
-//Fusion.Widget.ActivityIndicator.prototype = {
+
Fusion.Widget.ActivityIndicator = OpenLayers.Class(Fusion.Widget, {
element: null,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
this.element = this.domObj;
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/Buffer.js
===================================================================
--- sandbox/olcore/widgets/Buffer.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Buffer.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -34,8 +34,6 @@
*
* **************************************************************************/
-//Fusion.Widget.Buffer = Class.create();
-//Fusion.Widget.Buffer = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
Fusion.Widget.Buffer = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
layerName: null,
@@ -50,8 +48,7 @@
fillColorInput: null,
initialize: function(widgetTag) {
//console.log('Buffer.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/BufferPanel.js
===================================================================
--- sandbox/olcore/widgets/BufferPanel.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/BufferPanel.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -35,15 +35,12 @@
* there, otherwise it will open a new window with that name.
* **********************************************************************/
-//Fusion.Widget.BufferPanel = Class.create();
-//Fusion.Widget.BufferPanel.prototype = {
Fusion.Widget.BufferPanel = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
sFeatures : 'menubar=no,location=no,resizable=no,status=no',
initialize : function(widgetTag) {
//console.log('BufferPanel.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/CenterSelection.js
===================================================================
--- sandbox/olcore/widgets/CenterSelection.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/CenterSelection.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -32,14 +32,10 @@
* **********************************************************************/
-
-//Fusion.Widget.CenterSelection = Class.create();
-//Fusion.Widget.CenterSelection.prototype = {
Fusion.Widget.CenterSelection = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
initialize : function(widgetTag) {
//console.log('CenterSelection.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
this.enable = Fusion.Widget.CenterSelection.prototype.enable;
Modified: sandbox/olcore/widgets/ClearSelection.js
===================================================================
--- sandbox/olcore/widgets/ClearSelection.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ClearSelection.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,14 +29,11 @@
* Clears the current selection, if any.
* **********************************************************************/
-//Fusion.Widget.ClearSelection = Class.create();
-//Fusion.Widget.ClearSelection.prototype = {
Fusion.Widget.ClearSelection = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
initialize : function(widgetTag) {
//console.log('ClearSelection.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/ColorPicker.js
===================================================================
--- sandbox/olcore/widgets/ColorPicker.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ColorPicker.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -31,9 +31,6 @@
*
* **********************************************************************/
-
-//Fusion.Widget.ColorPicker = Class.create();
-//Fusion.Widget.ColorPicker.prototype =
Fusion.Widget.ColorPicker = OpenLayers.Class(Fusion.Widget, {
{
/* HTML input element that is used to store both the initial
@@ -50,8 +47,7 @@
colorButton: null,
- initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
+ initialize : function(widgetTag) {
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
var json = widgetTag.extension;
if (json.ColorInputId) {
Modified: sandbox/olcore/widgets/CursorPosition.js
===================================================================
--- sandbox/olcore/widgets/CursorPosition.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/CursorPosition.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -54,8 +54,6 @@
* x: {x}<br/>y: {y}
* **********************************************************************/
-//Fusion.Widget.CursorPosition = Class.create();
-//Fusion.Widget.CursorPosition.prototype = {
Fusion.Widget.CursorPosition = OpenLayers.Class(Fusion.Widget, {
defaultTemplate: 'x: {x}, y: {y}',
domSpan: null,
@@ -65,7 +63,6 @@
initialize : function(widgetTag) {
//console.log('CursorPosition.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Modified: sandbox/olcore/widgets/EditableScale.js
===================================================================
--- sandbox/olcore/widgets/EditableScale.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/EditableScale.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,13 +30,10 @@
*
* **********************************************************************/
-//Fusion.Widget.EditableScale = Class.create();
-//Fusion.Widget.EditableScale.prototype = {
Fusion.Widget.EditableScale = OpenLayers.Class(Fusion.Widget, {
precision: 4,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/ExtentHistory.js
===================================================================
--- sandbox/olcore/widgets/ExtentHistory.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ExtentHistory.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -32,16 +32,13 @@
Fusion.Event.HISTORY_CHANGED = Fusion.Event.lastEventId++;
-//Fusion.Widget.ExtentHistory = Class.create();
-//Fusion.Widget.ExtentHistory.prototype = {
Fusion.Widget.ExtentHistory = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
events: [],
aHistory: [],
sDirection: null,
EPS: 0.00000001, //percentage difference allowed in bounds values for test for equal
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/InitialMapView.js
===================================================================
--- sandbox/olcore/widgets/InitialMapView.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/InitialMapView.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,13 +30,11 @@
*
* **********************************************************************/
-//Fusion.Widget.InitialMapView = Class.create();
-//Fusion.Widget.InitialMapView.prototype = {
+
Fusion.Widget.InitialMapView = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
initialize : function(widgetTag) {
//console.log('InitialMapView.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
},
Modified: sandbox/olcore/widgets/InvokeScript.js
===================================================================
--- sandbox/olcore/widgets/InvokeScript.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/InvokeScript.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,13 +29,10 @@
* Executes an arbitrary piece of JavaScript code
* **********************************************************************/
-//Fusion.Widget.InvokeScript = Class.create();
-//Fusion.Widget.InvokeScript.prototype = {
Fusion.Widget.InvokeScript = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
sScript: null,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/InvokeURL.js
===================================================================
--- sandbox/olcore/widgets/InvokeURL.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/InvokeURL.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -35,15 +35,12 @@
*
* **********************************************************************/
-//Fusion.Widget.InvokeURL = Class.create();
-//Fusion.Widget.InvokeURL.prototype = {
Fusion.Widget.InvokeURL = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
sFeatures : 'menubar=no,location=no,resizable=no,status=no',
initialize : function(widgetTag) {
//console.log('InvokeURL.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/LayerManager.js
===================================================================
--- sandbox/olcore/widgets/LayerManager.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/LayerManager.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -50,14 +50,12 @@
*
* **********************************************************************/
-//Fusion.Widget.LayerManager = Class.create();
-//Fusion.Widget.LayerManager.prototype = {
Fusion.Widget.LayerManager = OpenLayers.Class(Fusion.Widget, {
currentNode: null,
bIsDrawn: false,
initialize : function(widgetTag) {
//console.log('LayerManager.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/Legend.js
===================================================================
--- sandbox/olcore/widgets/Legend.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Legend.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -50,8 +50,6 @@
*
* **********************************************************************/
-//Fusion.Widget.Legend = Class.create();
-//Fusion.Widget.Legend.prototype = {
Fusion.Widget.Legend = OpenLayers.Class(Fusion.Widget, {
currentNode: null,
bIsDrawn: false,
@@ -67,7 +65,6 @@
this.bIncludeVisToggle = true;
//console.log('Legend.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/LinkToView.js
===================================================================
--- sandbox/olcore/widgets/LinkToView.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/LinkToView.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,12 +29,11 @@
* A widget that displays a link to the currently displayedd map view.
* **********************************************************************/
-//Fusion.Widget.LinkToView = Class.create();
-//Fusion.Widget.LinkToView.prototype = {
+
Fusion.Widget.LinkToView = OpenLayers.Class(Fusion.Widget, {
initialize : function(widgetTag) {
//console.log('LinkToView.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/MapMenu.js
===================================================================
--- sandbox/olcore/widgets/MapMenu.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/MapMenu.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,9 +30,6 @@
* application. The list of maps is configured in the ApplicationDefinition.
* **********************************************************************/
-
-//Fusion.Widget.MapMenu = Class.create();
-//Fusion.Widget.MapMenu.prototype =
Fusion.Widget.MapMenu = OpenLayers.Class(Fusion.Widget, Fusion.Tool.MenuBase,
{
domObj: null,
@@ -42,8 +39,7 @@
initialize : function(widgetTag)
{
//console.log('MapMenu.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.MenuBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.MenuBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/Maptip.js
===================================================================
--- sandbox/olcore/widgets/Maptip.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Maptip.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -47,8 +47,7 @@
*
* **********************************************************************/
-//Fusion.Widget.Maptip = Class.create();
-//Fusion.Widget.Maptip.prototype =
+
Fusion.Widget.Maptip = OpenLayers.Class(Fusion.Widget,
{
oCurrentPosition: null,
@@ -62,7 +61,7 @@
initialize : function(widgetTag)
{
//console.log('Maptip.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/Measure.js
===================================================================
--- sandbox/olcore/widgets/Measure.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Measure.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -39,8 +39,6 @@
Fusion.Event.MEASURE_CLEAR = Fusion.Event.lastEventId++;
Fusion.Event.MEASURE_COMPLETE = Fusion.Event.lastEventId++;
-//Fusion.Widget.Measure = Class.create();
-//Fusion.Widget.Measure.prototype = {
Fusion.Widget.Measure = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, Fusion.Tool.Canvas,
{
isDigitizing: false,
@@ -80,9 +78,7 @@
areaStyle: null,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
- //Object.inheritFrom(this, Fusion.Tool.Canvas.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Fusion.Tool.Canvas.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/Navigator.js
===================================================================
--- sandbox/olcore/widgets/Navigator.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Navigator.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,15 +29,13 @@
* A widget that immplements an in-map navigation control with zoom and pan.
* **********************************************************************/
-//Fusion.Widget.Navigator = Class.create();
-//Fusion.Widget.Navigator.prototype = {
Fusion.Widget.Navigator = OpenLayers.Class(Fusion.Widget,
{
bInternalChange: false,
zoomFactor: 2,
panAmount: 50,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
var m = document.createElement('map');
m.name = 'Navigator_ImageMap';
Modified: sandbox/olcore/widgets/OverviewMap.js
===================================================================
--- sandbox/olcore/widgets/OverviewMap.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/OverviewMap.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,8 +30,6 @@
* primary map.
* **********************************************************************/
-//Fusion.Widget.OverviewMap = Class.create();
-//Fusion.Widget.OverviewMap.prototype = {
Fusion.Widget.OverviewMap = OpenLayers.Class(Fusion.Widget,
{
oSize: null,
@@ -41,7 +39,7 @@
initialize : function(widgetTag) {
//console.log('OverviewMap.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/Pan.js
===================================================================
--- sandbox/olcore/widgets/Pan.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Pan.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,14 +29,11 @@
* A widget that allows for naviagtion by panning
* **********************************************************************/
-//Fusion.Widget.Pan = Class.create();
-//Fusion.Widget.Pan.prototype = {
Fusion.Widget.Pan = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
initialize : function(widgetTag) {
//console.log('Pan.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/PanOnClick.js
===================================================================
--- sandbox/olcore/widgets/PanOnClick.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/PanOnClick.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,8 +30,7 @@
*
* **********************************************************************/
-//Fusion.Widget.PanOnClick = Class.create();
-//Fusion.Widget.PanOnClick.prototype =
+
Fusion.Widget.Pan = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, Fusion.Tool.ButtonBase,
{
fPercent: null,
@@ -40,8 +39,7 @@
initialize : function(widgetTag)
{
//console.log('FitToWindow.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/PanQuery.js
===================================================================
--- sandbox/olcore/widgets/PanQuery.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/PanQuery.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -33,8 +33,6 @@
Fusion.require('widgets/Pan.js');
-//Fusion.Widget.PanQuery = Class.create();
-//Fusion.Widget.PanQuery.prototype = {
Fusion.Widget.PanQuery = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, Fusion.Widget.Pan,
{
selectionType: 'INTERSECTS',
@@ -42,9 +40,7 @@
bActiveOnly: false,
initialize : function(widgetTag) {
//console.log('PanQuery.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
- //Object.inheritFrom(this, Fusion.Widget.Pan.prototype, [widgetTag]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Fusion.Widget.Pan.prototype.initialize.apply(this, [widgetTag]);
Modified: sandbox/olcore/widgets/Print.js
===================================================================
--- sandbox/olcore/widgets/Print.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Print.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,13 +30,10 @@
*
* **********************************************************************/
-//Fusion.Widget.Print = Class.create();
-//Fusion.Widget.Print.prototype = {
Fusion.Widget.Print = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/RefreshMap.js
===================================================================
--- sandbox/olcore/widgets/RefreshMap.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/RefreshMap.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,14 +30,12 @@
*
* **********************************************************************/
-//Fusion.Widget.RefreshMap = Class.create();
-//Fusion.Widget.RefreshMap.prototype = {
+
Fusion.Widget.RefreshMap = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
initialize : function(widgetTag) {
//console.log('RefreshMap.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
},
Modified: sandbox/olcore/widgets/SaveMap.js
===================================================================
--- sandbox/olcore/widgets/SaveMap.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SaveMap.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -38,16 +38,13 @@
* </Extension>
* **********************************************************************/
-//Fusion.Widget.SaveMap = Class.create();
-//Fusion.Widget.SaveMap.prototype = {
Fusion.Widget.SaveMap = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
iframe : null,
printLayout : null,
printScale : null,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/Scalebar.js
===================================================================
--- sandbox/olcore/widgets/Scalebar.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Scalebar.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -37,8 +37,6 @@
Fusion.require('widgets/scalebar/scalebartool.js');
}
-//Fusion.Widget.Scalebar = Class.create();
-//Fusion.Widget.Scalebar.prototype = {
Fusion.Widget.Scalebar = OpenLayers.Class(Fusion.Widget,
{
style: 'thin',
@@ -52,7 +50,7 @@
singleLine: false,
initialize : function(widgetTag) {
//console.log('Scalebar.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/Search.js
===================================================================
--- sandbox/olcore/widgets/Search.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Search.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -33,16 +33,13 @@
* (http://mapserver.commenspace.org/tools/scalebar/
* **********************************************************************/
-//Fusion.Widget.Search = Class.create();
-//Fusion.Widget.Search.prototype = {
Fusion.Widget.Search = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
sFeatures : 'menubar=no,location=no,status=no,scrollbars=yes',
initialize : function(widgetTag) {
//console.log('Search.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/Select.js
===================================================================
--- sandbox/olcore/widgets/Select.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Select.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,8 +30,7 @@
*
* **********************************************************************/
-//Fusion.Widget.Select = Class.create();
-//Fusion.Widget.Select.prototype = {
+
Fusion.Widget.Select = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
selectionType: 'INTERSECTS',
@@ -41,12 +40,10 @@
initialize : function(widgetTag) {
//console.log('Select.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
-
- //Object.inheritFrom(this, Fusion.Tool.Rectangle.prototype, []);
+
this.asCursor = ['auto'];
this.enable = Fusion.Widget.Select.prototype.enable;
Modified: sandbox/olcore/widgets/SelectPolygon.js
===================================================================
--- sandbox/olcore/widgets/SelectPolygon.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SelectPolygon.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,17 +30,14 @@
*
* **********************************************************************/
-//Fusion.Widget.SelectPolygon = Class.create();
-//Fusion.Widget.SelectPolygon.prototype = {
+
Fusion.Widget.SelectPolygon = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, Fusion.Tool.ButtonBase, Fusion.Tool.Canvas,
{
selectionType: 'INTERSECTS',
nTolerance : 3, //default pixel tolernace for a point click
initialize : function(widgetTag) {
//console.log('Select.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
- //Object.inheritFrom(this, Fusion.Tool.Canvas.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Fusion.Tool.Canvas.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/SelectRadius.js
===================================================================
--- sandbox/olcore/widgets/SelectRadius.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SelectRadius.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,8 +30,7 @@
*
* **********************************************************************/
-//Fusion.Widget.SelectRadius = Class.create();
-//Fusion.Widget.SelectRadius.prototype = {
+
Fusion.Widget.SelectRadius = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, Fusion.Tool.Canvas,
{
selectionType: 'INTERSECTS',
@@ -39,9 +38,7 @@
defaultRadius: 20,
initialize : function(widgetTag) {
//console.log('Select.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
- //Object.inheritFrom(this, Fusion.Tool.Canvas.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Fusion.Tool.Canvas.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/SelectRadiusValue.js
===================================================================
--- sandbox/olcore/widgets/SelectRadiusValue.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SelectRadiusValue.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -31,9 +31,6 @@
*
* **********************************************************************/
-//Fusion.Widget.SelectRadiusValue = Class.create();
-//Fusion.Widget.SelectRadiusValue.prototype = {
-
Fusion.Widget.SelectRadiusValue = OpenLayers.Class(Fusion.Widget,
{
radiusWidgetName: null,
@@ -41,7 +38,7 @@
className: '',
domLabel: null,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
/* parse widget properties */
Modified: sandbox/olcore/widgets/SelectWithin.js
===================================================================
--- sandbox/olcore/widgets/SelectWithin.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SelectWithin.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,16 +30,14 @@
*
* **********************************************************************/
-//Fusion.Widget.SelectWithin = Class.create();
-//Fusion.Widget.SelectWithin.prototype = {
+
Fusion.Widget.SelectWithin = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
sFeatures : 'menubar=no,location=no,resizable=no,status=no',
initialize : function(widgetTag) {
//console.log('SelectWithin.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/SelectionInfo.js
===================================================================
--- sandbox/olcore/widgets/SelectionInfo.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SelectionInfo.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -43,8 +43,6 @@
* & is &
* **********************************************************************/
-//Fusion.Widget.SelectionInfo = Class.create();
-//Fusion.Widget.SelectionInfo.prototype = {
Fusion.Widget.SelectionInfo = OpenLayers.Class(Fusion.Widget,
{
defaultTemplate: 'selectionInfo',
@@ -52,7 +50,7 @@
initialize : function(widgetTag) {
//console.log('SelectionInfo.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
var json = widgetTag.extension;
Modified: sandbox/olcore/widgets/SelectionPanel.js
===================================================================
--- sandbox/olcore/widgets/SelectionPanel.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/SelectionPanel.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,13 +30,12 @@
*
* **********************************************************************/
-//Fusion.Widget.SelectionPanel = Class.create();
-//Fusion.Widget.SelectionPanel.prototype = {
+
Fusion.Widget.SelectionPanel = OpenLayers.Class(Fusion.Widget,
{
initialize : function(widgetTag) {
//console.log('SelectionPanel.initialize');
- // Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
this.defPrevTaskIcon = 'images/icon_back.gif';
Modified: sandbox/olcore/widgets/TaskPane.js
===================================================================
--- sandbox/olcore/widgets/TaskPane.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/TaskPane.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,8 +29,7 @@
* A utility widget that holds output from other widgets.
****************************************************************************/
-//Fusion.Widget.TaskPane = Class.create();
-//Fusion.Widget.TaskPane.prototype =
+
Fusion.Widget.TaskPane = OpenLayers.Class(Fusion.Widget,
{
aExecutedTasks: null, //array of URLs for tasks execcuted in the TaskPane
@@ -43,7 +42,7 @@
initialize : function(widgetTag)
{
//console.log('TaskPane.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
this.aExecutedTasks = [];
Modified: sandbox/olcore/widgets/ViewOptions.js
===================================================================
--- sandbox/olcore/widgets/ViewOptions.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ViewOptions.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,8 +29,6 @@
* A widget to allow selection of the display units for various widgets
****************************************************************************/
-//Fusion.Widget.ViewOptions = Class.create();
-//Fusion.Widget.ViewOptions.prototype =
Fusion.Widget.ViewOptions = OpenLayers.Class(Fusion.Widget, Fusion.Tool.MenuBase,
{
displayUnits: false,
@@ -42,8 +40,7 @@
initialize : function(widgetTag) {
//console.log('ViewOptions.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.MenuBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.MenuBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/ViewSize.js
===================================================================
--- sandbox/olcore/widgets/ViewSize.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ViewSize.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -29,8 +29,7 @@
* Display the size of the current view in user-definable units
****************************************************************************/
-//Fusion.Widget.ViewSize = Class.create();
-//Fusion.Widget.ViewSize.prototype = {
+
Fusion.Widget.ViewSize = OpenLayers.Class(Fusion.Widget,
{
defaultTemplate: 'x: {x}, y: {y}',
@@ -40,7 +39,6 @@
units: Fusion.UNKNOWN,
initialize : function(widgetTag) {
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
this.emptyText = this.domObj.innerHTML;
Modified: sandbox/olcore/widgets/Zoom.js
===================================================================
--- sandbox/olcore/widgets/Zoom.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/Zoom.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,8 +30,7 @@
*
* **********************************************************************/
-//Fusion.Widget.Zoom = Class.create();
-//Fusion.Widget.Zoom.prototype =
+
Fusion.Widget.Zoom = OpenLayers.Class(Fusion.Widget,
{
nTolerance : 5,
@@ -41,8 +40,7 @@
initialize : function(widgetTag)
{
//console.log('Zoom.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/ZoomOnClick.js
===================================================================
--- sandbox/olcore/widgets/ZoomOnClick.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ZoomOnClick.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,16 +30,14 @@
*
* **********************************************************************/
-//Fusion.Widget.ZoomOnClick = Class.create();
-//Fusion.Widget.ZoomOnClick.prototype =
+
Fusion.Widget.ZoomOnClick = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
nFactor: 4,
initialize : function(widgetTag)
{
//console.log('ZoomOnClick.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
Modified: sandbox/olcore/widgets/ZoomToSelection.js
===================================================================
--- sandbox/olcore/widgets/ZoomToSelection.js 2008-04-10 17:24:30 UTC (rev 1370)
+++ sandbox/olcore/widgets/ZoomToSelection.js 2008-04-10 18:07:21 UTC (rev 1371)
@@ -30,14 +30,11 @@
*
* **********************************************************************/
-//Fusion.Widget.ZoomToSelection = Class.create();
-//Fusion.Widget.ZoomToSelection.prototype = {
Fusion.Widget.ZoomToSelection = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase,
{
initialize : function(widgetTag) {
//console.log('ZoomToSelection.initialize');
- //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, false]);
- //Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
More information about the fusion-commits
mailing list