Changeset 13739

Timestamp:

05/15/08 07:45:16 (6 months ago)

Author:

doughays

Message:

Fixes #6747 #6176. Committing patch from dante to add safari mouse wheel event handling.

Location:

dijit/trunk/form

Files:

• Slider.js (modified) (3 diffs)
• _Spinner.js (modified) (2 diffs)

dijit/trunk/form/Slider.js

@@ -174 +174 @@
                 // summary
                 //      decrement slider by 1 unit
-                this._bumpValue(e.charOrCode == dojo.keys.PAGE_DOWN?-this.pageIncrement:-1);
+                this._bumpValue(e.charOrCode == dojo.keys.PAGE_DOWN ? -this.pageIncrement : -1);
         },
 
@@ -180 +180 @@
                 // summary
                 //      increment slider by 1 unit
-                this._bumpValue(e.charOrCode == dojo.keys.PAGE_UP?this.pageIncrement:1);
+                this._bumpValue(e.charOrCode == dojo.keys.PAGE_UP ? this.pageIncrement : 1);
         },
 
         _mouseWheeled: function(/*Event*/ evt){
+                // summary: Event handler for mousewheel where supported
                 dojo.stopEvent(evt);
-                var scrollAmount = 0;
-                if(typeof evt.wheelDelta == 'number'){ // IE
-                        scrollAmount = evt.wheelDelta;
-                }else if(typeof evt.detail == 'number'){ // Mozilla+Firefox
-                        scrollAmount = -evt.detail;
-                }
-                if(scrollAmount > 0){
-                        this.increment(evt);
-                }else if(scrollAmount < 0){
-                        this.decrement(evt);
-                }
+                // FIXME: this adds mouse wheel support for safari, though stopEvent doesn't prevent
+                // it from bleeding to window?!
+                var janky = !dojo.isMozilla;
+                var scroll = evt[(janky ? "wheelDelta" : "detail")] * (janky ? 1 : -1);
+                this[(scroll < 0 ? "decrement" : "increment")](evt);
         },
 
@@ -211 +206 @@
                         this.decrementButton.style.display="";
                 }
-                this.connect(this.domNode, dojo.isIE ? "onmousewheel" : 'DOMMouseScroll', "_mouseWheeled");
+                this.connect(this.domNode, !dojo.isMozilla ? "onmousewheel" : "DOMMouseScroll", "_mouseWheeled");
 
                 // define a custom constructor for a SliderMover that points back to me

dijit/trunk/form/_Spinner.js

@@ -65 +65 @@
                 _wheelTimer: null,
                 _mouseWheeled: function(/*Event*/ evt){
-
-                        dojo.stopEvent(evt);                    
-                        var scrollAmount = evt[(dojo.isIE ? "wheelDelta" : "detail")] * (dojo.isIE ? 1 : -1);
+                        // summary: Mouse wheel listener where supported
+                        dojo.stopEvent(evt);    
+                        // FIXME: Safari bubbles
+                        var janky = !dojo.isMozilla;            
+                        var scrollAmount = evt[(janky ? "wheelDelta" : "detail")] * (janky ? 1 : -1);
                         if(scrollAmount !== 0){
                                 var node = this[(scrollAmount > 0 ? "upArrowNode" : "downArrowNode" )];
@@ -86 +88 @@
 
                         // extra listeners
-                        this.connect(this.textbox, dojo.isIE ? "onmousewheel" : 'DOMMouseScroll', "_mouseWheeled");
+                        this.connect(this.domNode, !dojo.isMozilla ? "onmousewheel" : 'DOMMouseScroll', "_mouseWheeled");
                         this._connects.push(dijit.typematic.addListener(this.upArrowNode, this.textbox, {charOrCode:dojo.keys.UP_ARROW,ctrlKey:false,altKey:false,shiftKey:false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));
                         this._connects.push(dijit.typematic.addListener(this.downArrowNode, this.textbox, {charOrCode:dojo.keys.DOWN_ARROW,ctrlKey:false,altKey:false,shiftKey:false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));