Ticket #6262: 6262.patch

form/_Spinner.js

@@ -95 +95 @@
                         this._connects.push(dijit.typematic.addListener(this.upArrowNode, this.textbox, {keyCode: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, {keyCode:dojo.keys.DOWN_ARROW,ctrlKey:false,altKey:false,shiftKey:false}, this, "_typematicCallback", this.timeoutChangeRate, this.defaultTimeout));
                         if(dojo.isIE){
-                                // When spinner is moved from hidden to visible, call _setStateClass to remind IE to render it. (#6123)
-                                var _this = this;
-                                this.connect(this.domNode, "onresize", 
-                                        function(){ setTimeout(dojo.hitch(_this,
-                                                function(){
-                                                        // cause the IE expressions to rerun
-                                                        this.upArrowNode.style.behavior = '';
-                                                        this.downArrowNode.style.behavior = '';
-                                                        // cause IE to rerender
-                                                        this._setStateClass();
-                                                }), 0);
-                                        }
-                                );
+                                this._IEbehaviors.push(this.upArrowNode);
+                                this._IEbehaviors.push(this.downArrowNode);
                         }
                 }
 });

form/ValidationTextBox.js

@@ -155 +155 @@
                         if(this.invalidMessage == "$_unset_$"){ this.invalidMessage = this.messages.invalidMessage; }
                         var p = this.regExpGen(this.constraints);
                         this.regExp = p;
+                },
+
+                postCreate: function(){
+                        this.inherited(arguments);
+                        if(dojo.isIE){
+                                // When moved from hidden to visible, call _setStateClass to remind IE to render it. (#6123)
+                                var _this = this;
+                                this._IEbehaviors = [this.textbox];
+                                this.connect(this.domNode, "onresize", 
+                                        function(){ setTimeout(dojo.hitch(_this,
+                                                function(){
+                                                        // cause the IE expressions to rerun
+                                                        for (i=0; i < this._IEbehaviors.length; i++){
+                                                                this._IEbehaviors[i].style.behavior='';
+                                                        }
+                                                        // cause IE to rerender
+                                                        this._setStateClass();
+                                                }), 0);
+                                        }
+                                );
+                        }
                 }
         }
 );

tests/form/test_Spinner.html

@@ -40 +40 @@
                 <br>
                 <br>
                 initial value=1000, delta=10, min=9 max=1550<br>
-                <label for="integerspinner2">Spinbox with custom styling (width=50%, 200% Courier font): </label>
+                <label for="integerspinner2">Spinbox with custom styling (width=25%, <span style="font-size:200%;font-family:Courier;">200% Courier font</span>): </label>
                 <input dojoType="dijit.form.NumberSpinner"
-                        style="font-size:200%;font-family:Courier;border:1px solid blue;width:50%;"
+                        style="font-size:200%;font-family:Courier;border:1px solid blue;width:50%;width:25%;"
                         value="1000"
                         smallDelta="10"
                         constraints="{min:9,max:1550,places:0}"

tests/form/test_validate.html

@@ -90 +90 @@
                                 <span class="noticeMessage"> NumberTextBox class, <b>tabIndex=1</b>, Attributes: {trim: true}, no initial value specified, tooltipPosition=[above, below]</span>
                         </div>
                         <div class="testExample">
+                                <span style="font-family:Courier;font-size:150%;">150% Courier:
                                 <input id="q03" type="text" name="age" tabIndex=1
                                         dojoType="dijit.form.NumberTextBox"
                                         promptMessage="(optional) Enter an age between 0 and 120"
@@ -98 +99 @@
                                         constraints="{places:0,min:0,max:120}"
                                         onChange="console.debug('onChange fired for widget id = ' + this.id + ' with value = ' + arguments[0]);"
                                         tooltipPosition="above, below"
-                                        />
+                                        /></span>
                         </div>
 
                         <div class="dojoTitlePaneLabel">

themes/dijit.css

@@ -43 +43 @@
         font-family: inherit; /* trigger pseudo font-family inheritance */
         behavior: expression( /* if the font-family = inherit, then get the parent's font-family */
                 function(self){
-                        var cs, e; 
                         try{
-                                if(self.currentStyle.fontFamily=='inherit'){
-                                        cs = self.parentNode.currentStyle || document.documentElement.currentStyle;
+                                if(self.currentStyle.fontFamily=='inherit' || self.fontFamily=='inherit'){
+                                        self.fontFamily = self.currentStyle.fontFamily;
+                                        var cs = self.parentNode.currentStyle || document.documentElement.currentStyle;
                                         self.style.fontFamily = cs.fontFamily;
                                 }
                                 self.style.behavior = null; /* #5562: prevent re-eval of css expression */
@@ -1483 +1483 @@
 .dj_ie .dijitSpinner .dijitInputLayoutContainer .dijitArrowButton {
         behavior: expression(
                 function(self){
-                        var e; 
                         try{
                                 var h = self.parentNode.offsetHeight/2;
                                 if(h > 1){