Changeset 8799

Timestamp:

05/29/07 09:03:34 (20 months ago)

Author:

doughays

Message:

Fixes #3168. Proxy commit for haysmark.
Removed dijit.form_DropDownTextBox.Popup.

Location:

dijit/trunk/form

Files:

• AutoCompleter.js (modified) (3 diffs)
• DateTextbox.js (modified) (4 diffs)
• _DropDownTextBox.js (modified) (5 diffs)

dijit/trunk/form/AutoCompleter.js

@@ -443 +443 @@
 dojo.declare(
         "dijit.form._AutoCompleterMenu",
-        [dijit.base.FormElement, dijit.base.TemplatedWidget, dijit.form._DropDownTextBox.Popup],
+        [dijit.base.FormElement, dijit.base.TemplatedWidget],
 
 // Bill: 
@@ -475 +475 @@
                         // summary:
                         //      call all postCreates
-                        dijit.form._DropDownTextBox.Popup.prototype.postCreate.apply(this, arguments);
                         dijit.base.FormElement.prototype.postCreate.apply(this, arguments);
                 },
@@ -482 +481 @@
                         this.maxListLength=widget.maxListLength;
                         this.onValueChanged=dojo.hitch(widget, widget._selectOption);
-                        dijit.form._DropDownTextBox.Popup.prototype.open.apply(this, arguments);
+                        dijit.util.PopupManager.openAround(widget.textbox, this);
                 },
 
                 close:function(){
-                        dijit.form._DropDownTextBox.Popup.prototype.close.apply(this, arguments);
                         this._blurOptionNode();
                 },

dijit/trunk/form/DateTextbox.js

@@ -21 +21 @@
                 parse: dojo.date.locale.parse,
                 value: new Date(),
-                _popupClass:"dijit._CalendarPopup",
+                _popupClass:"dijit._Calendar",
 
                 postMixInProperties: function(){
@@ -40 +40 @@
                         //      Sets the date on this textbox
 
-                        if(!this._popupWidget||this._popupWidget.parentWidget!=this){
+                        if(!this._popupWidget||!this._popupWidget.onValueSelected){
                                 dijit.form.DateTextbox.superclass.setValue.apply(this, arguments);
                         }else{
@@ -49 +49 @@
                 postCreate:function(){
                         dijit.form.DateTextbox.superclass.postCreate.apply(this, arguments);
-                        // #3000: set popupArgs here so Calendar gets the widget's lang, not the user's lang
-                        // TODO: move popup code inside here
-                        this._popupArgs={lang:this.lang};
+                        this._popupArgs={
+                                // #3000: set popupArgs here so Calendar gets the widget's lang, not the user's lang
+                                lang:this.lang,
+
+                                open:function(/*Widget*/ widget){
+                                        // summary:
+                                        //      opens the Calendar, and sets the onValueSelected for the Calendar
+
+                                        this.constraints=widget.constraints;
+                                        this.setValue(widget.getValue());
+                                        this.onValueSelected=dojo.hitch(widget, widget._calendarOnValueSelected);
+                                        dijit.util.PopupManager.openAround(widget.textbox, this);
+                                },
+
+                                isDisabledDate:function(/*Date*/ date){
+                                        // summary:
+                                        //      disables dates outside of the min/max of the DateTextbox
+                                        return(this.constraints!=null&&(dojo.date.compare(this.constraints.min,date)>0||dojo.date.compare(this.constraints.max,date)<0));
+                                }
+                        };
                         // convert the arrow image from using style.background-image to the .src property (a11y)
                         dijit.util.wai.imageBgToSrc(this.arrowImage);
@@ -63 +80 @@
         }
 );
-
-dojo.declare(
-        "dijit._CalendarPopup",
-        [dijit._Calendar, dijit.form._DropDownTextBox.Popup],
-        {
-                postCreate:function(){
-                        // summary:
-                        //      call all postCreates
-                        dijit._Calendar.prototype.postCreate.apply(this, arguments);
-                        dijit.form._DropDownTextBox.Popup.prototype.postCreate.apply(this, arguments);
-                },
-
-                open:function(/*Widget*/ widget){
-                        // summary:
-                        //      opens the menu, and sets the onValueSelected for the Calendar
-        
-                        dijit.form._DropDownTextBox.Popup.prototype.open.apply(this, arguments);
-                        this.constraints=widget.constraints;
-                        this.setValue(widget.getValue());
-                        this.onValueSelected=dojo.hitch(widget, widget._calendarOnValueSelected);
-                },
-
-                close:function(){
-                        dijit.form._DropDownTextBox.Popup.prototype.close.apply(this, arguments);
-                        this.constraints=null;
-                },
-
-                isDisabledDate:function(/*Date*/ date){
-                        // summary:
-                        //      disables dates outside of the min/max of the DateTextbox
-                        return(this.constraints!=null&&(dojo.date.compare(this.constraints.min,date)>0||dojo.date.compare(this.constraints.max,date)<0));
-                }
-        }
-);

dijit/trunk/form/_DropDownTextBox.js

@@ -57 +57 @@
                                 var node=document.createElement("div");
                                 document.body.appendChild(node);
+                                // If you leave display="", _DropDownTextBox will think that the popup is open.
+                                // _DropDownTextBox will call PopupManager.close() to close its last popup.
+                                // However, because this popup was never popped up, 
+                                // PopupManager has an empty popup stack and creates an error.
+                                // Setting display="none" prevents this bad call to PopupManager.close().
+                                with(node.style){
+                                        display="none";
+                                        position="absolute";
+                                        overflow="auto";
+                                }
                                 var popupProto=dojo.getObject(_this._popupClass, false);
                                 return new popupProto(_this._popupArgs, node);
@@ -86 +96 @@
                         this.focus();
                         this.makePopup();
-                        if(this._popupWidget.isShowingNow()){
+                        if(this.isShowingNow()){
                                 this._hideResultList();
                         }else{
@@ -96 +106 @@
 
                 _hideResultList: function(){
-                        if(this._popupWidget&&(!this._popupWidget.isShowingNow||this._popupWidget.isShowingNow())){
+                        if(this.isShowingNow()){
                                 dijit.util.PopupManager.close(true);
                                 this._arrowIdle();
@@ -205 +215 @@
                         // summary
                         //      test if the popup is visible
-                        return this._popupWidget&&this._popupWidget.isShowingNow();
+                        return this._popupWidget&&this._popupWidget.domNode.style.display!="none";
                 },
 
@@ -221 +231 @@
         }
 );
-
- dojo.declare(
-        "dijit.form._DropDownTextBox.Popup",
-        null,
-        {
-                // summary:
-                //      Mixin that provides basic open/close behavior for popup widgets
-
-                // parentWidget: Widget
-                //      Reference to parent widget
-                parentWidget:null,
-
-                postCreate:function(){
-                        // FIXME: create an external template so template style isn't displaced
-                        this.domNode.style.display="none";
-                        this.domNode.style.overflow="auto";
-                        this.domNode.style.position="absolute";
-                },
-
-                open:function(/*Widget*/ widget){
-                        // summary:
-                        //      opens the menu
-
-                        this.parentWidget=widget;
-                        setTimeout(dojo.hitch(this, function(){dijit.util.PopupManager.openAround(widget.textbox, this);}), 1);
-                },
-
-                isShowingNow:function(){
-                        return this.domNode.style.display!="none";
-                },
-
-                close: function(/*Boolean*/ force){
-                        // summary:
-                        //      closes the menu
-
-                        if(!this.isShowingNow()){
-                                return;
-                        }
-                        this.onValueChanged=function(){
-                                return;
-                        };
-                        this.parentWidget=null;
-                }
-        }
-);