[fusion-commits] r1512 - in sandbox/jx2: . lib widgets
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Wed Sep 10 07:46:10 EDT 2008
Author: pagameba
Date: 2008-09-10 07:46:10 -0400 (Wed, 10 Sep 2008)
New Revision: 1512
Removed:
sandbox/jx2/lib/ButtonBase.js
sandbox/jx2/lib/ButtonTool.js
sandbox/jx2/lib/ClickTool.js
sandbox/jx2/lib/MenuBase.js
Modified:
sandbox/jx2/build.xml
sandbox/jx2/lib/fusion.js
sandbox/jx2/widgets/Buffer.js
sandbox/jx2/widgets/BufferPanel.js
sandbox/jx2/widgets/CenterSelection.js
sandbox/jx2/widgets/ClearSelection.js
sandbox/jx2/widgets/ExtentHistory.js
sandbox/jx2/widgets/InvokeScript.js
sandbox/jx2/widgets/InvokeURL.js
sandbox/jx2/widgets/PanOnClick.js
sandbox/jx2/widgets/SaveMap.js
sandbox/jx2/widgets/Select.js
sandbox/jx2/widgets/SelectWithin.js
sandbox/jx2/widgets/ZoomOnClick.js
Log:
remove references to unnecessary files in the widgets (MenuBase, ButtonBase, ButtonTool and ClickTool), remove the files, and update build/dynamic loader.
Modified: sandbox/jx2/build.xml
===================================================================
--- sandbox/jx2/build.xml 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/build.xml 2008-09-10 11:46:10 UTC (rev 1512)
@@ -245,11 +245,7 @@
ApplicationDefinition.js
MGBroker.js
Widget.js
- ButtonBase.js
- MenuBase.js
- ButtonTool.js
CanvasTool.js
- ClickTool.js
RectTool.js
Search.js
Map.js"
Deleted: sandbox/jx2/lib/ButtonBase.js
===================================================================
--- sandbox/jx2/lib/ButtonBase.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/lib/ButtonBase.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -1,134 +0,0 @@
-/**
- * Fusion.Tool.ButtonBase
- *
- * $Id$
- *
- * Copyright (c) 2007, DM Solutions Group Inc.
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/********************************************
- * Class: Fusion.Tool.ButtonBase
- *
- * Utility base class for a button type widgets.
- *
- * Configurations for the buttons come from :
- * - html area : corresponds to the web layout command name
- * - width,height : default are 20,20. Classes should redifine teh
- * getButtonWidth and getButtonHeight to provide othe values
- * - imageurl : image that will be used when the button is active.
- * Default value is read from the web layout command imageurl parameter.
- * Classes can redifine getImageURL.
- * - imageurl : image that will be used when the button is active.
- * Default value is read from the web layout command disabledimageurl
- * parameter. Classes can redifine getDisabledImageURL.
- *
- * Clases inheriting should redefine the function activateTool which is
- * called when the button is clicked
- * **********************************************************************/
-
-
-Fusion.Tool.ButtonBase = OpenLayers.Class({
- execute: function(){},
- activate: function(){},
- deactivate: function(){},
-
- /**
- * constructor
- */
- initialize : function() {
- /* overload enable/disable. Normal inheritance should
- * work but because we use inheritFrom, it doesn't overload
- * Widget's enable/disable functions. We do it manually
- * here.
- */
- this.enable = Fusion.Tool.ButtonBase.prototype.enable;
- this.disable = Fusion.Tool.ButtonBase.prototype.disable;
-
- //console.log('Fusion.Tool.ButtonBase.initialize');
-
- this.button = new Jx.Button({
- image: this.widgetTag.imageUrl,
- imageClass: this.widgetTag.imageClass,
- tooltip: this.widgetTag.tooltip,
- label: this.widgetTag.label,
- onClick: OpenLayers.Function.bind(this.executeTool, this),
- onDown: OpenLayers.Function.bind(this.activateTool, this),
- onUp: OpenLayers.Function.bind(this.deactivateTool, this),
- toggle: this.isExclusive
- });
-
- if (this.domObj) {
- this.button.addTo(this.domObj);
- if (this.isExclusive && this.oMap) {
- this.oMap.buttonSet.add(this.button);
- }
- }
-
- if (!this.isEnabled()) {
- this.disable();
- }
- },
-
- executeTool: function() {
- if (this.isEnabled()) {
- this.execute();
- }
- },
-
- activateTool : function() {
- console.log('Fusion.Tool.ButtonBase.activateTool');
- if (this.isEnabled()) {
- this.activate();
- }
- //remove the focus on the button to prevent a problem in IE with some
- //buttons retaining their background colour when they shouldn't
- //this.button.domObj.blur();
-
-
- if (this.group) {
- for (var i=0; i<this.groups[this.group].length; i++) {
- if (this.groups[this.group][i] != this) {
- this.groups[this.group][i].deactivateTool();
- }
- }
- }
- return false;
- },
-
- deactivateTool: function() {
- this.deactivate();
- },
-
- enable: function() {
- //console.log('button base enable');
- Fusion.Widget.prototype.enable.apply(this,[]);
- if (this.button) {
- this.button.setEnabled(true);
- }
- },
-
- disable: function() {
- //console.log('button base disable');
- Fusion.Widget.prototype.disable.apply(this,[]);
- if (this.button) {
- this.button.setEnabled(false);
- }
- }
-});
Deleted: sandbox/jx2/lib/ButtonTool.js
===================================================================
--- sandbox/jx2/lib/ButtonTool.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/lib/ButtonTool.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -1,108 +0,0 @@
-/**
- * Fusion.Tool.Button
- *
- * $Id$
- *
- * Copyright (c) 2007, DM Solutions Group Inc.
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/********************************************
- * Class: Fusion.Tool.Button
- *
- * Utility base class for the actual buttons used by widgets.
- * **********************************************************************/
-
-Fusion.Tool.Button = OpenLayers.Class({
- bActive: null,
-
- initialize : function(domObj, widgetTag, isToggle) {
- //console.log('Fusion.Tool.Button.initialize');
- var json = widgetTag.extension;
- if (domObj) {
- var options = {
- image: widgetTag.imageUrl,
- imageClass: widgetTag.imageClass,
- tooltip: widgetTag.tooltip,
- label: widgetTag.label,
- onClick: OpenLayers.Function.bind(this.buttonClicked, this),
- toggle: isToggle
-
- };
- this._oButton = new Jx.Button(options);
- domObj.appendChild(this._oButton.domObj);
- }
- this.bActive = false;
- this.isEnabled = true;
-
- if (widgetTag.disabled) {
- this.disableTool();
- }
- },
-
- buttonClicked: function() {
-
- },
-
- observeEvent : function(sEvent, fnCB) {
- if (this._oButton) {
- OpenLayers.Event.observe(this._oButton.domObj, sEvent, fnCB);
- }
- },
-
- stopObserveEvent : function(sEvent, fnCB) {
- if (this._oButton) {
- OpenLayers.Event.stopObserving(this._oButton.domObj, sEvent, fnCB);
- }
- },
-
- enableTool : function() {
- if (this._oButton) {
- this._oButton.setEnabled(true);
- }
- },
-
- disableTool : function() {
- if (this._oButton) {
- this._oButton.setEnabled(false);
- }
- },
-
- activateTool : function() {
- //console.log('Fusion.Tool.Button.activateTool');
- this.bActive = true;
- if (!this._oButton) {
- return;
- }
- if (this._sImageURL != null && this._sImageURL.length > 0) {
- this._oButton.setImage(this._sImageURL);
- }
- },
-
- deactivateTool : function() {
- //console.log('Fusion.Tool.Button.deactivateTool');
- this.bActive = false;
- if (!this._oButton) {
- return;
- }
- },
-
- clickCB : function(e) { this.activateTool(); },
- isActive: function() {return this.bActive;}
-});
Deleted: sandbox/jx2/lib/ClickTool.js
===================================================================
--- sandbox/jx2/lib/ClickTool.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/lib/ClickTool.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -1,73 +0,0 @@
-/**
- * Fusion.Tool.Click
- *
- * $Id$
- *
- * Copyright (c) 2007, DM Solutions Group Inc.
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
- /****************************************************************************
- * Class: Fusion.Tool.Click
- *
- * Utility class to manage a click on the map (mouse up event).
- *
- * All classes using this should redefine the execute function
- * **********************************************************************/
-
-Fusion.Tool.Click = OpenLayers.Class({
- /**
- * constructor
- * @param oMap {Object} a map widget
- */
- initialize : function()
- {
- this.mouseUpCB = OpenLayers.Function.bindAsEventListener(this.mouseUp, this);
- },
-
- execute : function(x,y)
- {
- },
-
- activateClickTool : function()
- {
- //console.log('Fusion.Tool.Click.activateClickTool');
- if (this.oMap) {
- this.oMap.observeEvent('mouseup', this.mouseUpCB);
- }
- },
-
- deactivateClickTool : function()
- {
- //console.log('Fusion.Tool.Click.deactivateClickTool');
- if (this.oMap) {
- this.oMap.stopObserveEvent('mouseup', this.mouseUpCB);
- }
- },
-
-
- mouseUp : function(e)
- {
- //console.log('Fusion.Tool.Click.mouseUp');
- if (OpenLayers.Event.isLeftClick(e)) {
- var sPixPoint = this.oMap.getEventPosition(e);
- this.execute(sPixPoint.x, sPixPoint.y);
- }
- }
-});
Deleted: sandbox/jx2/lib/MenuBase.js
===================================================================
--- sandbox/jx2/lib/MenuBase.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/lib/MenuBase.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -1,61 +0,0 @@
-/**
- * Fusion.Tool.MenuBase
- *
- * $Id$
- *
- * Copyright (c) 2007, DM Solutions Group Inc.
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
- /****************************************************************************
- * Class: Fusion.Tool.MenuBase
- *
- * generic base class for implementing widgets that incorporate a menu
- * **********************************************************************/
-
-Fusion.Tool.MenuBase = OpenLayers.Class({
- /**
- * constructor
- */
- initialize : function() {
- //console.log('Fusion.Tool.MenuBase.initialize');
- var options = {
- image: this.widgetTag.imageUrl,
- imageClass: this.widgetTag.imageClass,
- tooltip: this.widgetTag.tooltip,
- label: this.widgetTag.label
- };
-
- if ( $(this.widgetTag.name) ) {
- this.oMenu = new Jx.Menu(options);
- $(this.widgetTag.name).appendChild(this.oMenu.domObj);
- } else {
- this.oMenu = new Jx.Menu.SubMenu(options);
- }
- },
-
- enable: function() {
- //TODO: figure out how to enable and disable menu widgets
- Fusion.Widget.prototype.enable.apply(this,[]);
- },
-
- disable: function() {
- Fusion.Widget.prototype.disable.apply(this,[]);
- }
-});
Modified: sandbox/jx2/lib/fusion.js
===================================================================
--- sandbox/jx2/lib/fusion.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/lib/fusion.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -247,7 +247,7 @@
//override this method since OL is loaded in the fusion file
OpenLayers._getScriptLocation = function() {
return Fusion.fusionURL + 'lib/OpenLayers/';
- }
+ };
}
this.initializeLocale();
@@ -1077,11 +1077,7 @@
'lib/ApplicationDefinition.js',
'lib/MGBroker.js',
'lib/Widget.js',
- 'lib/ButtonBase.js',
- 'lib/MenuBase.js',
- 'lib/ButtonTool.js',
'lib/CanvasTool.js',
- 'lib/ClickTool.js',
'lib/RectTool.js',
'lib/Map.js',
'lib/Search.js',
Modified: sandbox/jx2/widgets/Buffer.js
===================================================================
--- sandbox/jx2/widgets/Buffer.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/Buffer.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -158,7 +158,7 @@
enable: function() {
if (this.oMap && this.oMap.hasSelection()) {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this, []);
+ Fusion.Widget.prototype.enable.apply(this, []);
} else {
this.disable();
}
Modified: sandbox/jx2/widgets/BufferPanel.js
===================================================================
--- sandbox/jx2/widgets/BufferPanel.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/BufferPanel.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -71,7 +71,7 @@
if (this.action) {
this.action.setEnabled(true);
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
} else {
if (this.action) {
@@ -84,7 +84,7 @@
if (this.action) {
this.action.setEnabled(true);
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
}
},
Modified: sandbox/jx2/widgets/CenterSelection.js
===================================================================
--- sandbox/jx2/widgets/CenterSelection.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/CenterSelection.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -38,7 +38,7 @@
//console.log('CenterSelection.initialize');
Fusion.Widget.prototype.initialize.apply(this, [widgetTag, false]);
- Fusion.Tool.ButtonBase.prototype.initialize.apply(this, []);
+ Fusion.Widget.prototype.initialize.apply(this, []);
this.enable = Fusion.Widget.CenterSelection.prototype.enable;
this.getMap().registerForEvent(Fusion.Event.MAP_SELECTION_ON, OpenLayers.Function.bind(this.enable, this));
@@ -87,7 +87,7 @@
enable: function() {
if (this.oMap && this.oMap.hasSelection()) {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this, []);
+ Fusion.Widget.prototype.enable.apply(this, []);
} else {
this.disable();
}
Modified: sandbox/jx2/widgets/ClearSelection.js
===================================================================
--- sandbox/jx2/widgets/ClearSelection.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/ClearSelection.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -47,7 +47,7 @@
enable: function() {
if (this.oMap && this.oMap.hasSelection()) {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this, []);
+ Fusion.Widget.prototype.enable.apply(this, []);
} else {
this.disable();
}
Modified: sandbox/jx2/widgets/ExtentHistory.js
===================================================================
--- sandbox/jx2/widgets/ExtentHistory.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/ExtentHistory.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -102,15 +102,15 @@
historyChanged: function() {
if (this.sDirection == 'previous') {
if (this.aHistory['index'] > 0) {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
} else {
- Fusion.Tool.ButtonBase.prototype.disable.apply(this,[]);
+ Fusion.Widget.prototype.disable.apply(this,[]);
}
} else {
if (this.aHistory['index'] < (this.aHistory['history'].length - 1)) {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
} else {
- Fusion.Tool.ButtonBase.prototype.disable.apply(this,[]);
+ Fusion.Widget.prototype.disable.apply(this,[]);
}
}
},
Modified: sandbox/jx2/widgets/InvokeScript.js
===================================================================
--- sandbox/jx2/widgets/InvokeScript.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/InvokeScript.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -38,7 +38,7 @@
},
/**
- * called when the button is clicked by the Fusion.Tool.ButtonBase widget
+ * called when the button is clicked by the Fusion.Widget widget
*/
activate: function() {
eval(this.script);
Modified: sandbox/jx2/widgets/InvokeURL.js
===================================================================
--- sandbox/jx2/widgets/InvokeURL.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/InvokeURL.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -71,7 +71,7 @@
if (this.action) {
this.action.setEnabled(true);
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
} else {
if (this.action) {
@@ -84,7 +84,7 @@
if (this.action) {
this.action.setEnabled(true);
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
}
},
Modified: sandbox/jx2/widgets/PanOnClick.js
===================================================================
--- sandbox/jx2/widgets/PanOnClick.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/PanOnClick.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -68,7 +68,7 @@
},
/**
- * called when the button is clicked by the Fusion.Tool.ButtonBase widget
+ * called when the button is clicked by the Fusion.Widget widget
*/
activate: function() {
var extents = this.getMap().getCurrentExtents();
Modified: sandbox/jx2/widgets/SaveMap.js
===================================================================
--- sandbox/jx2/widgets/SaveMap.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/SaveMap.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -52,7 +52,6 @@
//for DWF, parse printLayouts and build menu
if (this.format == 'DWF' && json.PrintLayout.length) {
- Object.inheritFrom(this, Fusion.Tool.MenuBase.prototype, []);
var layouts = json.PrintLayout;
for (var i = 0; i < layouts.length; i++) {
@@ -102,7 +101,7 @@
this.oMenu.add(menuItem);
}
} else {
- Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+ Object.inheritFrom(this, Fusion.Widget.prototype, []);
if (json.Width && json.Width[0] != '') {
this.imageWidth = json.Width[0];
}
@@ -115,7 +114,7 @@
},
enable: function() {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this, []);
+ Fusion.Widget.prototype.enable.apply(this, []);
},
setLayout: function(data) {
@@ -135,7 +134,7 @@
},
/**
- * called when the button is clicked by the Fusion.Tool.ButtonBase widget
+ * called when the button is clicked by the Fusion.Widget widget
* prompts user to save the map.
*/
execute: function() {
Modified: sandbox/jx2/widgets/Select.js
===================================================================
--- sandbox/jx2/widgets/Select.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/Select.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -78,12 +78,12 @@
if (this.bActiveOnly) {
var layer = this.getMap().getActiveLayer();
if (layer && layer.selectable) {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this, []);
+ Fusion.Widget.prototype.enable.apply(this, []);
} else {
this.disable();
}
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
},
Modified: sandbox/jx2/widgets/SelectWithin.js
===================================================================
--- sandbox/jx2/widgets/SelectWithin.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/SelectWithin.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -67,7 +67,7 @@
if (this.action) {
this.action.setEnabled(true);
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
} else {
if (this.action) {
@@ -80,7 +80,7 @@
if (this.action) {
this.action.setEnabled(true);
} else {
- Fusion.Tool.ButtonBase.prototype.enable.apply(this,[]);
+ Fusion.Widget.prototype.enable.apply(this,[]);
}
}
},
Modified: sandbox/jx2/widgets/ZoomOnClick.js
===================================================================
--- sandbox/jx2/widgets/ZoomOnClick.js 2008-09-10 11:40:27 UTC (rev 1511)
+++ sandbox/jx2/widgets/ZoomOnClick.js 2008-09-10 11:46:10 UTC (rev 1512)
@@ -39,7 +39,7 @@
},
/**
- * called when the button is clicked by the Fusion.Tool.ButtonBase widget
+ * called when the button is clicked by the Fusion.Widget widget
*/
activate: function() {
var center = this.getMap().getCurrentCenter();
More information about the fusion-commits
mailing list