Ticket #6396: 6396.patch

Users/bgibson/Documents/workspace/trunk/dijit/form/_Spinner.js

@@ -43 +43 @@
                         this._setStateClass();
                 },
 
-                _arrowPressed: function(/*Node*/ nodePressed, /*Number*/ direction){
+                _arrowPressed: function(/*Node*/ nodePressed, /*Number*/ direction, /*Number*/ increment){
                         if(this.disabled || this.readOnly){ return; }
                         this._arrowState(nodePressed, true);
-                        this.setValue(this.adjust(this.getValue(), direction*this.smallDelta), false);
+                        this.setValue(this.adjust(this.getValue(), direction*increment), false);
                         dijit.selectInputText(this.textbox, this.textbox.value.length);
                 },
 
@@ -57 +57 @@
                 },
 
                 _typematicCallback: function(/*Number*/ count, /*DOMNode*/ node, /*Event*/ evt){
-                        if(node == this.textbox){ node = (evt.charOrCode == dojo.keys.UP_ARROW) ? this.upArrowNode : this.downArrowNode; }
+                        var inc=this.smallDelta;
+                        k=dojo.keys;
+                        if(node == this.textbox){ 
+                                switch(evt.charOrCode){
+                                        case k.PAGE_UP:
+                                                node=this.upArrowNode;
+                                                inc = this.largeDelta;
+                                                break;
+                                        case k.PAGE_DOWN:
+                                                node=this.downArrowNode;
+                                                inc = this.largeDelta;
+                                                break;
+                                        case k.UP_ARROW:
+                                                node=this.upArrowNode;
+                                                break;
+                                        default: //k.DOWN_ARROW:
+                                                node=this.downArrowNode;
+                                }
+                        }                                               
                         if(count == -1){ this._arrowReleased(node); }
-                        else{ this._arrowPressed(node, (node == this.upArrowNode) ? 1 : -1); }
+                        else{ this._arrowPressed(node, (node == this.upArrowNode) ? 1 : -1, inc); }
                 },
 
                 _wheelTimer: null,
@@ -73 +91 @@
                                 var node = this[(scrollAmount > 0 ? "upArrowNode" : "downArrowNode" )];
                                 var dir = (scrollAmount > 0 ? 1 : -1);
                                 
-                                this._arrowPressed(node, dir);
+                                this._arrowPressed(node, dir, this.smallDelta);
 
                                 if(!this._wheelTimer){
                                         clearTimeout(this._wheelTimer);
@@ -90 +108 @@
                         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));
+                        this._connects.push(dijit.typematic.addListener(this.upArrowNode, this.textbox, {charOrCode:dojo.keys.PAGE_UP,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.PAGE_DOWN,ctrlKey:false,altKey:false,shiftKey:false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));
                         if(dojo.isIE){
                                 var _this = this;
                                 this.connect(this.domNode, "onresize",

Users/bgibson/Documents/workspace/trunk/dijit/form/NumberSpinner.js

@@ -8 +8 @@
 [dijit.form._Spinner, dijit.form.NumberTextBoxMixin],
 {
         // summary:
-        // extends NumberTextBox to add up/down arrows for incremental change to the value
+        // extends NumberTextBox to add up/down arrows and pageup/pagedown for incremental change to the value
 
         required: true,