[fusion-commits] r1364 - sandbox/olcore/widgets

[svn_fusion at osgeo.org]

Author: pdeschamps
Date: 2008-04-08 10:58:32 -0400 (Tue, 08 Apr 2008)
New Revision: 1364

Modified:
   sandbox/olcore/widgets/About.js
   sandbox/olcore/widgets/ActivityIndicator.js
   sandbox/olcore/widgets/Buffer.js
   sandbox/olcore/widgets/BufferPanel.js
Log:
removed prototype on class adde OL


Modified: sandbox/olcore/widgets/About.js
===================================================================
--- sandbox/olcore/widgets/About.js	2008-04-07 19:42:06 UTC (rev 1363)
+++ sandbox/olcore/widgets/About.js	2008-04-08 14:58:32 UTC (rev 1364)
@@ -31,9 +31,9 @@
 *
 * **********************************************************************/
 
-Fusion.Widget.About = Class.create();
-Fusion.Widget.About.prototype = 
-{
+//Fusion.Widget.About = Class.create();
+//Fusion.Widget.About.prototype =
+Fusion.Widget.About = OpenLayers.Class(Fusion.Widget, Fusion.Tool.ButtonBase, {
     _nWidth : 500,
     _nHeight : 400,
     _sDefaultUrl : '/mapguide/mapadmin/about.php',  //TBD we need a Fusion specific About page
@@ -48,8 +48,10 @@
  */
     initialize : function(widgetTag) {
         //console.log('About.initialize');
-        Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
-        Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+        //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;
         this._sAboutUrl = (json.AboutURL) ? 
                 json.AboutURL[0] : this._sDefaultUrl;
@@ -70,4 +72,4 @@
       sFeatures += ',height=' + this._nHeight;
       window.open(this._sAboutUrl, 'AboutPopup', sFeatures);
     }
-};
+});

Modified: sandbox/olcore/widgets/ActivityIndicator.js
===================================================================
--- sandbox/olcore/widgets/ActivityIndicator.js	2008-04-07 19:42:06 UTC (rev 1363)
+++ sandbox/olcore/widgets/ActivityIndicator.js	2008-04-08 14:58:32 UTC (rev 1364)
@@ -33,11 +33,13 @@
  *
  * **************************************************************************/
 
-Fusion.Widget.ActivityIndicator = Class.create();
-Fusion.Widget.ActivityIndicator.prototype =  {
+//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]);
+        //Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
+        Fusion.Widget.prototype.initialize.apply(this, [widgetTag, true]);
         this.element = this.domObj;
         var json = widgetTag.extension;
         if (json.ElementId) {
@@ -54,4 +56,4 @@
     busyChanged: function() {
         this.element.style.visibility = this.getMap().isBusy() ? 'visible' : 'hidden';
     }
-};
+});

Modified: sandbox/olcore/widgets/Buffer.js
===================================================================
--- sandbox/olcore/widgets/Buffer.js	2008-04-07 19:42:06 UTC (rev 1363)
+++ sandbox/olcore/widgets/Buffer.js	2008-04-08 14:58:32 UTC (rev 1364)
@@ -34,9 +34,10 @@
  *
  * **************************************************************************/
 
- 
-Fusion.Widget.Buffer = Class.create();
-Fusion.Widget.Buffer.prototype = {
+//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,
     layerNameInput: null,
     bufferDistance: null,
@@ -49,8 +50,10 @@
     fillColorInput: null,
     initialize: function(widgetTag) {
         //console.log('Buffer.initialize');
-        Object.inheritFrom(this, Fusion.Widget.prototype, [widgetTag, true]);
-        Object.inheritFrom(this, Fusion.Tool.ButtonBase.prototype, []);
+        //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;
         
@@ -225,4 +228,4 @@
         aMaps[0].reloadMap();
         aMaps[0].drawMap();
     }
-};
+});

Modified: sandbox/olcore/widgets/BufferPanel.js
===================================================================
--- sandbox/olcore/widgets/BufferPanel.js	2008-04-07 19:42:06 UTC (rev 1363)
+++ sandbox/olcore/widgets/BufferPanel.js	2008-04-08 14:58:32 UTC (rev 1364)
@@ -35,14 +35,17 @@
  * there, otherwise it will open a new window with that name.
  * **********************************************************************/
 
-Fusion.Widget.BufferPanel = Class.create();
-Fusion.Widget.BufferPanel.prototype = {
+//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, []);
+        //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, []);
 
         var json = widgetTag.extension;
         this.sTarget = json.Target ? json.Target[0] : "BufferPanelWindow";
@@ -130,4 +133,4 @@
             }
         }
     }
-};
+});