[fusion-commits] r1562 - trunk/lib

[svn_fusion at osgeo.org]

Author: pagameba
Date: 2008-09-29 13:02:49 -0400 (Mon, 29 Sep 2008)
New Revision: 1562

Modified:
   trunk/lib/ApplicationDefinition.js
   trunk/lib/Widget.js
Log:
Widgets not in toolbars or menus were not registering for the click events on button UI objects.  This is fixed by moving the event registration into the Widget's setUIObject method.

Modified: trunk/lib/ApplicationDefinition.js
===================================================================
--- trunk/lib/ApplicationDefinition.js	2008-09-26 19:43:29 UTC (rev 1561)
+++ trunk/lib/ApplicationDefinition.js	2008-09-29 17:02:49 UTC (rev 1562)
@@ -880,10 +880,7 @@
                                 label: widgetTag.label,
                                 image: widgetTag.imageUrl,
                                 imageClass: widgetTag.imageClass,
-                                toggle: widget.isExclusive,
-                                onClick: OpenLayers.Function.bind(widget.activate, widget),
-                                onUp: OpenLayers.Function.bind(widget.deactivate, widget),
-                                onDown: OpenLayers.Function.bind(widget.activate, widget)
+                                toggle: widget.isExclusive
                             }));                            
                             if (widget.isExclusive) {
                                 widget.getMap().buttonSet.add(widget.uiObj);
@@ -911,10 +908,7 @@
                             label: widgetTag.label,
                             image: widgetTag.imageUrl,
                             imageClass: widgetTag.imageClass,
-                            toggle: widget.isExclusive,
-                            onClick: OpenLayers.Function.bind(widget.activate, widget),
-                            onUp: OpenLayers.Function.bind(widget.deactivate, widget),
-                            onDown: OpenLayers.Function.bind(widget.activate, widget)
+                            toggle: widget.isExclusive
                         }));
                         container.add(widget.uiObj);
                         if (widget.uiObj.setEnabled) {

Modified: trunk/lib/Widget.js
===================================================================
--- trunk/lib/Widget.js	2008-09-26 19:43:29 UTC (rev 1561)
+++ trunk/lib/Widget.js	2008-09-29 17:02:49 UTC (rev 1562)
@@ -91,6 +91,9 @@
             uiObj.domA.addClass('jx' + uiObj.options.type + 'Active');
         }
         uiObj.addEvents({
+            'click': (function() {
+                this.activate();
+            }).bind(this),
             'up': (function() {
                 var instances = Fusion.Widget.uiInstances[this.type];
                 for (var i=0; i<instances.length; i++) {
@@ -98,6 +101,7 @@
                     instance.options.isActive = false;
                     instance.domA.removeClass('jx' + instance.options.type + 'Active');
                 }
+                this.deactivate();
             }).bind(this),
             'down': (function() {
                 var instances = Fusion.Widget.uiInstances[this.type];
@@ -106,6 +110,7 @@
                     instance.options.isActive = true;
                     instance.domA.addClass('jx' + instance.options.type + 'Active');                        
                 }
+                this.activate();
             }).bind(this)
         });
         this.uiObj = uiObj;